 钱涛
|
47ba860cc6
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-04-08 16:39:27 +08:00 |
|
钱涛
|
ed15911067
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-04-08 16:38:45 +08:00 |
|
钱涛
|
c32dab5562
|
数据撤回功能
|
2025-04-07 13:50:34 +08:00 |
|
钱涛
|
f4c025e078
|
数据推送
|
2025-04-07 09:19:47 +08:00 |
|
钱涛
|
d4f45d5eb3
|
扩展排序字段
|
2025-04-03 10:49:10 +08:00 |
|
钱涛
|
0a78f17230
|
记录推送耗时
|
2025-04-02 17:05:04 +08:00 |
|
钱涛
|
ba650b9fe6
|
推送记录状态变更；
推送明细状态变更；
|
2025-04-02 14:59:32 +08:00 |
|
钱涛
|
0777f99870
|
创建推送记录接口；
重推接口；
|
2025-04-01 17:35:29 +08:00 |
|
钱涛
|
8e3c4bfacc
|
数据推送配置sql
|
2025-04-01 16:43:02 +08:00 |
|
钱涛
|
3511c18e31
|
数据推送配置
|
2025-04-01 15:12:36 +08:00 |
|
钱涛
|
1a4ab02bdc
|
确认名单转义
|
2025-03-31 18:23:12 +08:00 |
|
钱涛
|
590046b0a3
|
Merge branch 'feature/个税云6万扣除名单' into release/个税版本
|
2025-03-31 17:40:13 +08:00 |
|
钱涛
|
9d03aaffdc
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-03-31 17:18:39 +08:00 |
|
钱涛
|
993cba21bd
|
增加申报表取值算法
|
2025-03-31 17:15:01 +08:00 |
|
钱涛
|
6ade625a39
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
|
2025-03-31 13:31:33 +08:00 |
|
钱涛
|
96f88e1eec
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-03-27 17:12:57 +08:00 |
|
钱涛
|
7fe109a1af
|
修复获取累计专项附加
|
2025-03-27 17:12:37 +08:00 |
|
钱涛
|
97546393a4
|
上线版本
|
2025-03-27 16:31:40 +08:00 |
|
钱涛
|
8a49a2ef1b
|
上线版本
|
2025-03-27 16:13:19 +08:00 |
|
钱涛
|
f3dd68792c
|
修复业务线冲突
|
2025-03-27 14:44:47 +08:00 |
|
钱涛
|
e25c1f59d2
|
人员报送，业务线功能
|
2025-03-27 09:51:44 +08:00 |
|
钱涛
|
b1c1587344
|
Merge branch 'release/3.0.1.2503.01' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/service/SalaryAcctResultService.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/wrapper/SalarySobWrapper.java
|
2025-03-26 15:48:02 +08:00 |
|
钱涛
|
c0ef81258b
|
Merge branch 'release/个税版本' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/service/OtherDeductionService.java
|
2025-03-26 15:45:20 +08:00 |
|
钱涛
|
77df0f4c58
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01
|
2025-03-24 15:03:27 +08:00 |
|
钱涛
|
eea9093cfd
|
Merge branch 'release/2.17.1.2411.01' into release/2.19.1.2501.01
|
2025-03-24 15:03:09 +08:00 |
|
钱涛
|
b128f219f7
|
处理敏感信息泄露
|
2025-03-24 14:57:00 +08:00 |
|
钱涛
|
93defb41cd
|
版本
|
2025-03-20 17:32:06 +08:00 |
|
钱涛
|
5673bba357
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01
|
2025-03-19 18:08:31 +08:00 |
|
钱涛
|
8910183e7f
|
核算是否采用线程池配置
|
2025-03-19 18:08:19 +08:00 |
|
钱涛
|
a63d956da3
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01
|
2025-03-19 17:55:41 +08:00 |
|
钱涛
|
fe4b8b1fb3
|
核算是否采用线程池配置
|
2025-03-19 17:18:09 +08:00 |
|
钱涛
|
d7702d7cae
|
扣除名单编辑接口
|
2025-03-19 16:25:42 +08:00 |
|
钱涛
|
10f1ec1629
|
确认名单sql
|
2025-03-19 16:03:12 +08:00 |
|
钱涛
|
47dbfeb8db
|
确认名单反馈
|
2025-03-19 15:26:06 +08:00 |
|
钱涛
|
7de1062387
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01
|
2025-03-19 10:09:28 +08:00 |
|
钱涛
|
c8f281613b
|
薪资明细增加人员浏览按钮多选搜索
|
2025-03-18 17:45:00 +08:00 |
|
钱涛
|
3b520fcf62
|
社保和档案执行标识
|
2025-03-18 17:31:32 +08:00 |
|
钱涛
|
4913398650
|
修复业务线分页问题
|
2025-03-18 11:10:27 +08:00 |
|
钱涛
|
660a2718a1
|
扣减确认和反馈
|
2025-03-17 18:59:16 +08:00 |
|
钱涛
|
d672dd8d61
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01
|
2025-03-17 11:05:52 +08:00 |
|
钱涛
|
a29f8b3da9
|
薪资明细模板导出根据项目类型设置单元格格式
|
2025-03-17 11:03:42 +08:00 |
|
钱涛
|
bad6928f34
|
删除确认名单
|
2025-03-14 15:56:28 +08:00 |
Harryxzy
|
e2ac113378
|
fix 个税申报报错
|
2025-03-13 17:20:05 +08:00 |
|
Harryxzy
|
d0ec44c7b1
|
Merge branch 'feature/250301_社保福利台账增减人员' into release/3.0.1.2503.01
|
2025-03-13 16:59:11 +08:00 |
|
钱涛
|
ccb0dcd8d5
|
修复数值类型判断
|
2025-03-13 16:02:00 +08:00 |
|
钱涛
|
9c3bb5f956
|
处理未开启分权的情况
|
2025-03-13 10:06:23 +08:00 |
|
Harryxzy
|
3fb29b2c3d
|
停薪action 增加日志
|
2025-03-12 18:21:04 +08:00 |
|
钱涛
|
a119e7c7cd
|
扣除确认接口
|
2025-03-12 13:55:59 +08:00 |
|
Harryxzy
|
25723af00a
|
社保福利台账增减人员
|
2025-03-11 15:18:05 +08:00 |
|
钱涛
|
12bbfeceae
|
增加扣除名单
|
2025-03-11 11:15:08 +08:00 |