Commit Graph

14 Commits

Author SHA1 Message Date
钱涛 b6f8e857d2 1、档案导入初始化修复
2、核算档案
3、取消入职、离职日期作为核算人员的筛选条件
2022-07-28 15:42:25 +08:00
钱涛 8e69159900 薪资档案代码合并 2022-07-21 10:51:38 +08:00
钱涛 b90953873c 薪资档案代码合并 2022-07-21 09:48:40 +08:00
钱涛 77ca4c2848 Merge branch 'develop' into feature/personIn2taxAgent
# Conflicts:
#	src/com/engine/salary/service/SalaryArchiveService.java
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
#	src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
2022-07-21 09:43:02 +08:00
钱涛 a721898d3d 薪资档案增加起始发薪和最后发薪 2022-07-18 18:08:59 +08:00
liuliang 758a78996d 导入薪酬档案对接流程功能 2022-07-13 18:59:30 +08:00
钱涛 758e64e6bc 档案导入 2022-06-01 20:46:51 +08:00
钱涛 99b5c36864 暂存 2022-05-31 16:41:11 +08:00
钱涛 c537b7d944 补充列 2022-04-19 15:13:08 +08:00
钱涛 163963d463 fix bug 2022-03-31 18:41:41 +08:00
钱涛 a8732708a8 薪资档案导入 2022-03-31 15:41:55 +08:00
钱涛 5c550365f1 薪资档案 2022-03-29 17:10:59 +08:00
钱涛 ba707878fc 薪资档案 2022-03-28 20:04:27 +08:00
钱涛 5ae4eb5fc8 项目id 2022-03-28 16:36:40 +08:00