 钱涛
|
0045a0dd59
|
福利的重新核算功能异常
|
2022-09-21 11:12:05 +08:00 |
sy
|
b06eae55d8
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-21 10:47:49 +08:00 |
|
sy
|
78d1bf0554
|
薪酬系统-福利台账导入数据允许出现负数
|
2022-09-21 10:47:07 +08:00 |
|
钱涛
|
c08a660fa0
|
调薪异常
|
2022-09-20 19:07:56 +08:00 |
Harryxzy
|
550eec9198
|
Merge branch 'origin/fix/oracle_accountingArchive_xzy' into develop
|
2022-09-20 18:03:31 +08:00 |
|
Harryxzy
|
5c80188165
|
xzy-fix-oracle数据库中薪资核算归档时报错
|
2022-09-20 18:03:07 +08:00 |
|
钱涛
|
90c18ec201
|
定薪
|
2022-09-20 18:02:45 +08:00 |
|
钱涛
|
22b03f8f7e
|
调薪
|
2022-09-20 17:38:21 +08:00 |
|
sy
|
a2b936ba23
|
Merge branch 'feature/checkImport' into develop
|
2022-09-20 16:56:59 +08:00 |
|
sy
|
16d141980d
|
薪酬系统-人员匹配方式枚举类
|
2022-09-20 16:56:40 +08:00 |
|
sy
|
d64b73290a
|
薪酬系统-薪资档案调薪导入，关闭部分调整数据前后一致校验
|
2022-09-20 16:54:42 +08:00 |
|
sy
|
b8a87d2fd8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-09-20 16:37:21 +08:00 |
|
sy
|
546e976543
|
薪酬系统-福利台账-补缴导入,新旧数据整合bug修复
|
2022-09-20 16:36:01 +08:00 |
|
钱涛
|
f302654d0a
|
排序
|
2022-09-20 16:32:52 +08:00 |
|
Harryxzy
|
1db57838eb
|
Merge branch 'origin/feature/addedemployeeExport' into develop
|
2022-09-20 16:19:22 +08:00 |
|
Harryxzy
|
183e63140a
|
xzy-月度绩效环比增加人员导出功能
|
2022-09-20 16:18:43 +08:00 |
|
钱涛
|
8ef4c37112
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-09-20 15:47:28 +08:00 |
|
钱涛
|
f8f50380f7
|
排序
|
2022-09-20 15:47:22 +08:00 |
|
sy
|
5a1f92c3f0
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-20 15:27:11 +08:00 |
|
sy
|
882b1306b0
|
薪酬系统-薪资档案导入bug修复
|
2022-09-20 15:26:47 +08:00 |
|
钱涛
|
3a91225d65
|
排序
|
2022-09-20 15:07:42 +08:00 |
|
sy
|
5b74873a6e
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-20 10:34:43 +08:00 |
|
sy
|
7f557903a8
|
薪酬系统-福利台账-补缴导入
|
2022-09-20 10:13:05 +08:00 |
|
Harryxzy
|
5866136334
|
Merge branch 'origin/fix/archivePower' into develop
|
2022-09-20 09:41:04 +08:00 |
|
Harryxzy
|
2c795fe94a
|
xzy-fix-社保福利中社保方案、公积金方案等选择权限问题
|
2022-09-20 09:20:17 +08:00 |
|
钱涛
|
f678aa46d6
|
薪资档案排序
|
2022-09-19 18:21:34 +08:00 |
|
sy
|
7120d80689
|
薪酬系统-福利台账-补缴导入模板开发
|
2022-09-19 17:59:12 +08:00 |
|
钱涛
|
bc1e874a1c
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
|
2022-09-19 16:45:10 +08:00 |
|
钱涛
|
830e099b57
|
排序规则
|
2022-09-19 16:44:32 +08:00 |
|
Harryxzy
|
44b3c76a8e
|
xzy-同比增加人员
|
2022-09-19 16:05:59 +08:00 |
|
sy
|
ff4884fbb9
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-19 15:13:42 +08:00 |
|
sy
|
f54481bbf1
|
薪酬系统-福利台账补缴功能开发v1
|
2022-09-19 15:13:30 +08:00 |
|
sy
|
b0cc2cc19d
|
薪酬系统导入方式配置-人员匹配全局配置的confValue默认设为0
|
2022-09-19 15:11:27 +08:00 |
|
sy
|
eb033d64fd
|
薪酬系统-福利台账，补缴页新增补缴数据时，校验数据库中是否已有该组信息的补缴数据
|
2022-09-19 14:14:17 +08:00 |
|
钱涛
|
b464240ff7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-09-19 13:45:14 +08:00 |
|
钱涛
|
a7bd4a43d6
|
排序规则
|
2022-09-19 13:41:09 +08:00 |
|
sy
|
86ba593d1f
|
薪酬系统导入方式配置-数据采集-累计附加专项扣除-导入,添加导入人员筛选配置化处理
|
2022-09-19 11:01:17 +08:00 |
|
sy
|
280c979536
|
薪酬系统-修改导入信息时对于姓名字段的依赖逻辑
|
2022-09-16 15:03:48 +08:00 |
|
sy
|
0d1a77d81b
|
薪酬系统-修复工号字段信息映射有误的问题
|
2022-09-16 14:22:11 +08:00 |
|
sy
|
4d9b7af975
|
薪酬系统-福利台账导入项添加社保合计、公积金合计、其他福利合计、合计四个字段可以选择，并增加这四个字段的更新逻辑
|
2022-09-16 14:21:15 +08:00 |
|
sy
|
478b9a3d16
|
薪酬系统导入方式配置-薪资核算-导入,添加导入人员筛选配置化处理
|
2022-09-16 13:23:37 +08:00 |
|
sy
|
7daa256584
|
薪酬系统-福利台账导入涉及的sql优化
|
2022-09-16 11:41:09 +08:00 |
|
sy
|
8492c2097b
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-16 09:47:15 +08:00 |
|
sy
|
a3ec7caf44
|
薪酬系统导入方式配置-薪资档案调薪/初始化-导入,添加导入人员筛选配置化处理
|
2022-09-15 17:54:59 +08:00 |
|
钱涛
|
d88e2bff4e
|
薪资档案列表按人事排序正序排列
|
2022-09-15 17:09:38 +08:00 |
|
sy
|
c13ca103f3
|
薪酬系统导入方式配置-社保福利台账核算导入,添加导入人员筛选配置化处理
|
2022-09-15 16:14:34 +08:00 |
|
钱涛
|
23e89d15ec
|
定制
|
2022-09-15 15:43:47 +08:00 |
|
钱涛
|
b61b83976d
|
1、系统详情接口
|
2022-09-15 15:41:48 +08:00 |
|
sy
|
3c007f8e0b
|
薪酬系统导入方式配置-社保福利档案导入,添加导入人员筛选配置化处理
|
2022-09-15 15:31:34 +08:00 |
|
钱涛
|
d238502b2c
|
1、修复线下对比
2、系统配置
|
2022-09-15 15:15:34 +08:00 |