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 |
|
sy
|
d491288296
|
薪酬系统导入方式配置-各导入模板添加工号字段
|
2022-09-15 10:43:34 +08:00 |
|
sy
|
8eb769ee05
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-14 14:37:19 +08:00 |
|
sy
|
a6028c51e7
|
福利核算干预数据导入功能优化v2-针对单个保险种类的数值未填值时，默认取数据库中原有数值
|
2022-09-14 14:36:05 +08:00 |
|
钱涛
|
8c0b9038d6
|
1、系统配置列表
2、修复调薪周期对于核算的结果不准确
|
2022-09-14 11:28:17 +08:00 |
|
钱涛
|
198075209e
|
1、核算、合并计税使用税款所属期作为依据
2、核算列表分页
|
2022-09-13 16:03:55 +08:00 |
|
钱涛
|
32f5f25341
|
防止未归档时合并计税异常
|
2022-09-08 16:26:24 +08:00 |
|
钱涛
|
28551918c2
|
修复部门id和岗位id不显示
|
2022-09-08 10:13:57 +08:00 |
|
sy
|
6a52554d71
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-08 09:44:14 +08:00 |
|
sy
|
8c7a5d477a
|
福利核算干预数据导入功能优化v1
|
2022-09-08 09:43:46 +08:00 |
|
钱涛
|
243d8e0d6b
|
批量调薪前置校验
|
2022-09-07 16:35:57 +08:00 |
|
钱涛
|
572c4cb9f1
|
调薪前置校验
|
2022-09-07 16:12:43 +08:00 |
|
sy
|
1b34914e13
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-07 14:57:46 +08:00 |
|
sy
|
8f9a335dd0
|
福利核算干预数据导入预览
|
2022-09-07 14:57:07 +08:00 |
|
钱涛
|
06f6dcf8f2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-09-07 09:46:02 +08:00 |
|
钱涛
|
8ff4e9e231
|
停薪操作
|
2022-09-07 09:45:37 +08:00 |
|
sy
|
d4886c0d46
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-06 17:14:31 +08:00 |
|
sy
|
5a6df5a257
|
福利核算结果干预功能，福利核算项列表接口、福利核算导入模板下载接口、福利核算干预数据导入接口
|
2022-09-06 17:13:33 +08:00 |
|
钱涛
|
c84836d490
|
修复调薪导致起始缴纳日期消失
|
2022-09-06 17:12:56 +08:00 |
|
钱涛
|
e372173b74
|
获取系统配置接口
|
2022-09-05 17:20:57 +08:00 |
|
钱涛
|
299bbf1f66
|
达梦适配
|
2022-09-05 15:50:01 +08:00 |
|
sy
|
3445642489
|
优化薪资核算导入相关的唯一匹配逻辑v3
|
2022-09-02 15:40:05 +08:00 |
|
sy
|
85566329d9
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-02 12:47:36 +08:00 |
|
sy
|
dd721aa314
|
Merge branch 'hotfix/checkImport0902' into develop
|
2022-09-02 12:45:11 +08:00 |
|
sy
|
43bf76b036
|
Merge remote-tracking branch 'remotes/origin/develop' into hotfix/checkImport0902
|
2022-09-02 12:43:53 +08:00 |
|
Harryxzy
|
0269506f78
|
xzy-fix当用户发薪日期为一个月最后一天时，薪资核算无数据bug
|
2022-09-02 12:41:58 +08:00 |
|
sy
|
a1f310775d
|
优化薪资核算导入相关的唯一匹配逻辑v3
|
2022-09-02 12:41:22 +08:00 |
|
sy
|
79cab3629e
|
福利核算干预功能开发v1
|
2022-09-02 11:53:38 +08:00 |
|
sy
|
749279e372
|
优化薪资核算导入相关的唯一匹配逻辑v2
|
2022-09-02 11:04:51 +08:00 |
|
Harryxzy
|
40728ea598
|
Merge branch 'origin/fix/salaryArchiveImportDate_xzy' into develop
|
2022-09-01 17:07:18 +08:00 |
|
Harryxzy
|
38edb1bbb8
|
xzy-fix薪资档案导入时添加起始发薪日期格式校验
|
2022-09-01 17:06:30 +08:00 |
|
钱涛
|
cc24406319
|
向上求偶
|
2022-09-01 16:17:27 +08:00 |
|
Harryxzy
|
0d3f76c414
|
Merge branch 'origin/feature/addSubComSearchCondition_xzy' into develop
|
2022-09-01 09:22:11 +08:00 |
|
钱涛
|
c0498052cb
|
Merge branch 'hotfix/0831' into develop
|
2022-08-31 17:23:32 +08:00 |
|
钱涛
|
c3201b66a3
|
fix福利人员导入异常
|
2022-08-31 17:19:12 +08:00 |
|
Harryxzy
|
387b6a2897
|
xzy-在薪资档案以及薪资核算的高级搜索中,增加分部搜索条件
|
2022-08-31 15:06:49 +08:00 |
|
Harryxzy
|
5ade93de8c
|
Merge branch 'fix/peopleCount' into develop
|
2022-08-30 10:00:16 +08:00 |
|
sy
|
457f144bc6
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-08-30 09:30:38 +08:00 |
|
Harryxzy
|
feb1e14c29
|
xzy-fix社保福利台账人数错误
|
2022-08-30 09:19:29 +08:00 |
|
sy
|
3fba03d482
|
优化薪资核算导入相关的唯一匹配逻辑及导入模板
|
2022-08-30 09:15:37 +08:00 |
|
钱涛
|
a13d56063b
|
fix累计已预扣预缴税额，带入个税调差
|
2022-08-29 16:06:56 +08:00 |
|
Harryxzy
|
e1239d3018
|
xzy-核算自定义列表添加分部
|
2022-08-29 14:50:26 +08:00 |
|
钱涛
|
f71e222c73
|
fix导入
|
2022-08-26 14:06:21 +08:00 |
|
sy
|
8ea34ef7dd
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-08-26 09:18:06 +08:00 |
|
钱涛
|
aab48a1733
|
1、可见性范围回显
|
2022-08-25 17:34:30 +08:00 |
|
钱涛
|
60fb7fb110
|
1、可见性范围回显
|
2022-08-25 17:05:36 +08:00 |
|
钱涛
|
7cd4981a5a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-08-25 16:46:26 +08:00 |
|
钱涛
|
bfcda3525a
|
1、福利方案分权
2、累计、往期、其他导入分权
3、导入精度
|
2022-08-25 16:46:12 +08:00 |
|
Harryxzy
|
14b0797128
|
xzy-fix薪资项目保存报错
|
2022-08-25 15:44:00 +08:00 |
|
Harryxzy
|
bc794b4585
|
xzy-fix社保福利方案无法新建自定义福利
|
2022-08-25 11:52:24 +08:00 |
|
sy
|
2041031e92
|
薪酬模块导入按钮匹配项优化
姓名-部门-手机号
涉及接口，薪资档案导入接口、数据采集子菜单中的四个导入接口
|
2022-08-25 11:43:52 +08:00 |
|
Harryxzy
|
8b84f0b15f
|
xzy-fix北京城建集团-考勤引用中引用时报错问题
|
2022-08-25 09:59:19 +08:00 |
|
Harryxzy
|
6809839a2c
|
Merge branch 'feature/addSalaryShowSwitch_xzy' into develop
|
2022-08-25 09:38:59 +08:00 |
|
Harryxzy
|
9244440a0d
|
xzy-薪资项目显隐控制(修改传参itemHide为字符串)
|
2022-08-25 09:20:51 +08:00 |
|
钱涛
|
a4e6042adf
|
调薪流程按钮
|
2022-08-24 20:00:57 +08:00 |
|
钱涛
|
7a052e5ce0
|
Merge branch 'hotfix/0801' into develop
|
2022-08-24 17:12:11 +08:00 |
|
钱涛
|
71b2f6f41c
|
导入核算结果时去除多余的人员
|
2022-08-24 16:51:57 +08:00 |
|
钱涛
|
378d3a49e9
|
Merge branch 'hotfix/0801' into develop
|
2022-08-24 14:49:57 +08:00 |
|
钱涛
|
1567ecb956
|
核算结果的导入bug，null
|
2022-08-24 14:24:20 +08:00 |
|
钱涛
|
7dfe9ee732
|
福利方案分权
|
2022-08-24 12:03:04 +08:00 |