Harryxzy
|
75d66e4cb9
|
专项附加扣除导入 批量更新分片
|
2023-04-06 16:07:42 +08:00 |
 钱涛
|
bb76df3718
|
个人养老金
|
2023-04-04 17:29:56 +08:00 |
|
Harryxzy
|
accb0d3d2b
|
社保福利台账 - 合计列
|
2023-04-04 17:21:29 +08:00 |
sy
|
6a9d2a6fab
|
Merge remote-tracking branch 'origin/release/2.7.3.2304.01' into release/2.7.3.2304.01
|
2023-04-04 16:28:25 +08:00 |
|
sy
|
add7051759
|
薪酬系统, 适配金仓-个税申报单逻辑优化、薪资部分发放逻辑优化、删除initserviceimpl文件
|
2023-04-04 16:28:15 +08:00 |
|
钱涛
|
44fe9203ab
|
个人养老金
|
2023-04-04 14:21:25 +08:00 |
|
钱涛
|
cb46fccb16
|
工资单推送
|
2023-04-03 18:49:28 +08:00 |
|
sy
|
eb1d441de7
|
薪酬系统, 关闭加密方法优化
|
2023-04-03 16:07:37 +08:00 |
|
sy
|
521db08cde
|
Merge remote-tracking branch 'remotes/origin/feature/v4-salaryExcelFormat-0328' into release/2.7.3.2304.01
# Conflicts:
# src/com/engine/salary/service/SalaryAcctExcelService.java
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
|
2023-04-03 15:59:58 +08:00 |
|
Harryxzy
|
5847f3f449
|
Merge branch 'fix/salaryTemplateUpdateBug_0407' into release/2.7.3.2304.01
|
2023-04-03 11:31:49 +08:00 |
|
Harryxzy
|
c97407c2ac
|
工资单模板修复
|
2023-04-03 11:31:09 +08:00 |
|
Harryxzy
|
dcfe6479ed
|
Merge branch 'feature/cancelSuspend' into release/2.7.3.2304.01
|
2023-04-03 11:12:20 +08:00 |
|
Harryxzy
|
4faa9e36a6
|
取消待办优化
|
2023-03-31 10:17:31 +08:00 |
|
Harryxzy
|
2e85f72362
|
工资单发放系统异常
|
2023-03-31 09:40:55 +08:00 |
|
Harryxzy
|
40b38b5347
|
社保福利档案列表提速
|
2023-03-30 22:52:52 +08:00 |
|
sy
|
31bf7cfd99
|
薪酬系统-薪资核算和档案，excel导出行高自适应
|
2023-03-30 17:26:55 +08:00 |
|
Harryxzy
|
30660ce04b
|
工资单模板，无法修改薪资项为0时不显示
|
2023-03-30 13:33:52 +08:00 |
|
sy
|
0427ec5ed4
|
薪酬系统, 关闭加密方法优化
|
2023-03-30 11:44:21 +08:00 |
|
Harryxzy
|
52decb10ff
|
Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.3.2304.01
|
2023-03-30 11:03:22 +08:00 |
|
Harryxzy
|
f0c80f3287
|
薪资档案导入无法带出工号数据
|
2023-03-30 10:02:09 +08:00 |
|
Harryxzy
|
295331d1a5
|
按照工号导入，支持不输入姓名
|
2023-03-30 09:49:49 +08:00 |
|
Harryxzy
|
2fc4560488
|
薪资档案按照工号导入无效
|
2023-03-29 16:46:10 +08:00 |
|
Harryxzy
|
ef3260085f
|
修复重新核算，往期累计删多数据
|
2023-03-28 14:18:01 +08:00 |
|
Harryxzy
|
b331152d27
|
修复合计列
|
2023-03-28 13:59:57 +08:00 |
|
Harryxzy
|
d99e6147d3
|
Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.3.2304.01
|
2023-03-28 13:40:12 +08:00 |
|
Harryxzy
|
952a8e845c
|
修复合计列
|
2023-03-28 11:00:18 +08:00 |
|
Harryxzy
|
2dc40a7b91
|
取消待办
|
2023-03-28 10:10:54 +08:00 |
|
Harryxzy
|
95cf271c80
|
修复薪资档案导入，重复数据报错行数少一
|
2023-03-28 09:31:00 +08:00 |
|
Harryxzy
|
530dcd7028
|
Merge branch 'feature/SalaryAcctResult-ImportField-cache_0324' into release/2.7.3.2304.01
|
2023-03-27 17:36:41 +08:00 |
|
钱涛
|
9f6950d8ae
|
工资单发放
|
2023-03-20 17:36:29 +08:00 |
|
钱涛
|
052eebe83a
|
解决工资单人名缺失
|
2023-03-16 19:17:33 +08:00 |
|
Harryxzy
|
1ab7fcc7b8
|
Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.1.2303.02
|
2023-03-16 17:20:43 +08:00 |
|
钱涛
|
f79569fe4f
|
解决工资单人名缺失
|
2023-03-16 17:19:02 +08:00 |
|
Harryxzy
|
3304ffdbd5
|
薪资核算导入，添加表头字段缓存功能
|
2023-03-16 16:19:23 +08:00 |
|
钱涛
|
8430397d03
|
外部人员终极版
|
2023-03-16 16:10:29 +08:00 |
|
Harryxzy
|
e1b4927eaa
|
删除多余代码
|
2023-03-16 14:52:08 +08:00 |
|
sy
|
dc2cb5f448
|
薪酬系统-薪资核算，薪资核算和薪资档案导出excel通用格式改造
|
2023-03-16 13:51:41 +08:00 |
|
Harryxzy
|
b9c40955ac
|
Merge branch 'fix/AddUpSituationCantImport_0316' into release/2.7.1.2303.02
|
2023-03-16 11:38:38 +08:00 |
|
Harryxzy
|
cdf7dd916b
|
往期累计情况编辑
|
2023-03-16 11:37:43 +08:00 |
|
Harryxzy
|
6a7e5eacdc
|
社保福利台账合计列
|
2023-03-16 11:17:18 +08:00 |
|
Harryxzy
|
521de26b51
|
Merge branch 'fix/AddUpSituationCantImport_0316' into release/2.7.1.2303.02
|
2023-03-16 09:54:49 +08:00 |
|
Harryxzy
|
16cfe18b90
|
往期累计情况导入BUG
|
2023-03-16 09:53:46 +08:00 |
|
钱涛
|
62d124efb1
|
外部人员终极版
|
2023-03-15 22:48:01 +08:00 |
|
钱涛
|
81650888c7
|
非系统人员
|
2023-03-15 18:21:04 +08:00 |
|
钱涛
|
ace15ca7a1
|
非系统人员
|
2023-03-15 18:03:46 +08:00 |
|
Harryxzy
|
ca03e0785e
|
工资单发放详情导出没有部门信息
|
2023-03-15 17:09:02 +08:00 |
|
钱涛
|
50c15989c6
|
Merge branch 'release/2.7.1.2303.02' into feature/外部人员
|
2023-03-15 16:15:48 +08:00 |
|
Harryxzy
|
712f30ddfa
|
工资单发放详情合计列
|
2023-03-15 16:00:37 +08:00 |
|
Harryxzy
|
1f9597195f
|
外部人员-个税扣缴义务人service获取人员信息改变写法
|
2023-03-15 15:49:20 +08:00 |
|
Harryxzy
|
a9fb24145d
|
修复往期累计情况，无法导入编辑
|
2023-03-15 14:14:53 +08:00 |