 钱涛
|
0aabcd0471
|
将除重新核算的项目外的所有的值都锁定
|
2023-04-28 14:37:59 +08:00 |
|
钱涛
|
59c32b24e6
|
补算
|
2023-04-25 17:08:42 +08:00 |
|
钱涛
|
cef3d26693
|
维护工具
|
2023-04-24 14:55:32 +08:00 |
|
钱涛
|
c94d5169f0
|
维护工具
|
2023-04-24 09:19:18 +08:00 |
|
钱涛
|
598ff0cf9a
|
Merge remote-tracking branch 'origin/feature/维护工具' into feature/维护工具
|
2023-04-23 18:00:41 +08:00 |
|
钱涛
|
5c936a0334
|
补算
|
2023-04-23 18:00:30 +08:00 |
Harryxzy
|
468dd092a7
|
恢复往期累计数据 接口
|
2023-04-23 17:43:02 +08:00 |
|
Harryxzy
|
ad6b9a1eb0
|
Merge remote-tracking branch 'origin/feature/维护工具' into feature/维护工具
|
2023-04-23 17:37:14 +08:00 |
|
Harryxzy
|
31235096bb
|
恢复往期累计数据
|
2023-04-23 17:37:06 +08:00 |
|
钱涛
|
f4ebcf987c
|
维护估计控制层
|
2023-04-23 17:30:43 +08:00 |
|
钱涛
|
413de52d6a
|
维护工具v1
|
2023-04-23 16:27:11 +08:00 |
|
钱涛
|
ce8ca9cdb8
|
分部实现逻辑
|
2023-04-21 13:52:57 +08:00 |
|
钱涛
|
4a9df2276d
|
分部计算类
|
2023-04-21 11:25:16 +08:00 |
|
钱涛
|
d2b304e690
|
全量数据
|
2023-04-20 18:04:18 +08:00 |
|
钱涛
|
135530d3b7
|
全量数据
|
2023-04-20 17:55:37 +08:00 |
|
钱涛
|
aeab5c75f5
|
往期修复
|
2023-04-18 11:45:30 +08:00 |
|
钱涛
|
c5d9ea5421
|
累计个人养老金bug
|
2023-04-18 11:03:09 +08:00 |
|
Harryxzy
|
b5d3acf418
|
Merge branch 'feature/salaryItemFieldsCanCopy_0420' into release/2.7.3.2304.01
|
2023-04-14 09:04:23 +08:00 |
|
钱涛
|
a87c344581
|
个人养老金
|
2023-04-13 17:14:58 +08:00 |
|
钱涛
|
15d6a63df6
|
薪酬上下文
|
2023-04-13 11:53:43 +08:00 |
|
钱涛
|
deb2e367f4
|
薪酬上下文
|
2023-04-13 11:53:08 +08:00 |
|
钱涛
|
59a38954bc
|
Merge branch 'feature/个人养老金' into release/2.7.3.2304.01
# Conflicts:
# src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java
|
2023-04-13 09:35:29 +08:00 |
|
钱涛
|
f0eb9c8994
|
养老金最终版
|
2023-04-12 13:57:13 +08:00 |
|
钱涛
|
671bbc6bfb
|
养老金最终版
|
2023-04-12 10:51:52 +08:00 |
|
钱涛
|
58dbdb0d05
|
养老金
|
2023-04-12 09:39:53 +08:00 |
|
钱涛
|
a4a829d201
|
年终奖数据
|
2023-04-11 17:24:31 +08:00 |
|
Harryxzy
|
e21b53c2df
|
Merge branch 'fix/deleteSalarySobAddCheck_0414' into release/2.7.3.2304.01
|
2023-04-11 14:00:26 +08:00 |
|
Harryxzy
|
bbe7edaa22
|
Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.3.2304.01
|
2023-04-11 13:56:18 +08:00 |
|
Harryxzy
|
0bfe0b62a7
|
fix 字段重复无法保存
|
2023-04-11 11:43:32 +08:00 |
|
Harryxzy
|
8c58cf01b3
|
字段拷贝调整
|
2023-04-11 10:48:41 +08:00 |
|
Harryxzy
|
482f4dfc25
|
薪资项目名不允许包含大括号
|
2023-04-11 10:36:06 +08:00 |
|
Harryxzy
|
a286ac6f44
|
Merge branch 'fix/salaryArchiveImportByRuleBug_0407' into release/2.7.3.2304.01
|
2023-04-11 10:18:54 +08:00 |
|
Harryxzy
|
0ef8a2ae12
|
Merge branch 'fix/salaryItemHideDuplicateItem_0407' into release/2.7.3.2304.01
|
2023-04-11 10:16:28 +08:00 |
|
Harryxzy
|
593ad0d3a4
|
Merge branch 'fix/specialAddDeduction_cannotImport' into release/2.7.3.2304.01
|
2023-04-11 10:16:00 +08:00 |
sy
|
6bb5f8ddb4
|
Merge remote-tracking branch 'remotes/origin/feature/v4-closeEncryptSettingWithChange-0406' into release/2.7.3.2304.01
|
2023-04-11 10:10:59 +08:00 |
|
sy
|
8544abe1bc
|
Merge remote-tracking branch 'origin/release/2.7.3.2304.01' into release/2.7.3.2304.01
|
2023-04-11 10:08:05 +08:00 |
|
Harryxzy
|
c3dfc5692e
|
薪资项目拷贝
|
2023-04-11 09:56:20 +08:00 |
|
Harryxzy
|
d9f041c9bb
|
账套删除前校验是否存在工资单模板
|
2023-04-07 16:06:47 +08:00 |
|
Harryxzy
|
207d338ec2
|
薪资账套重复薪资项目
|
2023-04-07 15:14:07 +08:00 |
|
钱涛
|
b0284022c1
|
核算导出全部功能修复
|
2023-04-07 14:39:22 +08:00 |
|
Harryxzy
|
d5f6d053b3
|
修复累计专项附加扣除导出全部bug
|
2023-04-06 16:20:58 +08:00 |
|
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 |