 钱涛
|
1a4ab02bdc
|
确认名单转义
|
2025-03-31 18:23:12 +08:00 |
|
钱涛
|
590046b0a3
|
Merge branch 'feature/个税云6万扣除名单' into release/个税版本
|
2025-03-31 17:40:13 +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 |
|
钱涛
|
7fe109a1af
|
修复获取累计专项附加
|
2025-03-27 17:12:37 +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 |
|
钱涛
|
8910183e7f
|
核算是否采用线程池配置
|
2025-03-19 18:08:19 +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 |
|
钱涛
|
c8f281613b
|
薪资明细增加人员浏览按钮多选搜索
|
2025-03-18 17:45:00 +08:00 |
|
钱涛
|
3b520fcf62
|
社保和档案执行标识
|
2025-03-18 17:31:32 +08:00 |
|
钱涛
|
660a2718a1
|
扣减确认和反馈
|
2025-03-17 18:59:16 +08:00 |
Harryxzy
|
2c5e4a9d34
|
艾志二期薪酬二开
|
2025-03-17 15:19:49 +08:00 |
|
钱涛
|
a29f8b3da9
|
薪资明细模板导出根据项目类型设置单元格格式
|
2025-03-17 11:03:42 +08:00 |
|
钱涛
|
bad6928f34
|
删除确认名单
|
2025-03-14 15:56:28 +08:00 |
|
Harryxzy
|
3fb29b2c3d
|
停薪action 增加日志
|
2025-03-12 18:21:04 +08:00 |
|
钱涛
|
a119e7c7cd
|
扣除确认接口
|
2025-03-12 13:55:59 +08:00 |
|
钱涛
|
12bbfeceae
|
增加扣除名单
|
2025-03-11 11:15:08 +08:00 |
|
钱涛
|
0eb2b140e9
|
修改申报反馈数据请求体
|
2025-03-10 17:46:40 +08:00 |
|
钱涛
|
894b9cd1fc
|
1、扣除名单查询
2、扣除名单确认
|
2025-03-10 15:31:33 +08:00 |
|
钱涛
|
9cee19397d
|
记录核算具体操作日志
|
2025-03-06 17:35:25 +08:00 |
|
钱涛
|
f57ca94900
|
配置
|
2025-03-06 14:46:16 +08:00 |
|
钱涛
|
e0a686f776
|
Merge branch 'release/个税版本' into custom/艾志工业
|
2025-03-05 17:18:49 +08:00 |
|
钱涛
|
98ab42d4e1
|
Merge branch 'feature/CBS8对接' into custom/艾志工业
|
2025-03-05 17:18:18 +08:00 |
|
Harryxzy
|
671e2dd2da
|
其他免税扣除导入bug
|
2025-03-05 15:06:01 +08:00 |
|
钱涛
|
e663fac646
|
同步票据池功能
|
2025-03-05 10:56:49 +08:00 |
|
钱涛
|
848ce0a62d
|
1、递归查询分页逻辑
2、票据收款承兑逻辑
|
2025-03-03 18:10:02 +08:00 |
|
钱涛
|
28b5ee71f6
|
汇款人与办事处逻辑
|
2025-03-03 17:38:28 +08:00 |
|
钱涛
|
fb005a8139
|
票据池配置
|
2025-02-26 17:25:51 +08:00 |
|
钱涛
|
388352b937
|
票据池配置
|
2025-02-26 14:40:28 +08:00 |
|
钱涛
|
214419e835
|
交易明细同步
|
2025-02-26 09:22:20 +08:00 |
|
钱涛
|
de25d6cdf4
|
cbs配置
|
2025-02-24 18:01:07 +08:00 |
|
钱涛
|
050653ca01
|
对接票据台账
|
2025-02-24 15:14:06 +08:00 |
|
钱涛
|
7dbc7f21cd
|
对接交易明细
|
2025-02-24 11:31:57 +08:00 |
|
钱涛
|
a8dc1d4010
|
Merge branch 'feature/减免附表' into release/个税版本
|
2025-02-12 15:59:53 +08:00 |
|
钱涛
|
73185785ed
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-02-12 13:31:19 +08:00 |
|
钱涛
|
e905bfacf4
|
申报没有线上数据做出提示
|
2025-02-11 15:36:15 +08:00 |
|
钱涛
|
7336fad730
|
增加在线数据日志
|
2025-02-11 11:47:03 +08:00 |
|
Harryxzy
|
9c419f09bf
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-02-11 09:23:15 +08:00 |
|
钱涛
|
cd9e112c99
|
Merge branch 'release/个税版本' into custom/艾志工业
|
2025-02-10 10:34:14 +08:00 |
|
钱涛
|
b572bd19d0
|
处理获取累计专项附加错误日志记录
|
2025-02-08 17:37:47 +08:00 |
|
钱涛
|
b19e71a5f9
|
处理冲突
|
2025-02-08 15:55:40 +08:00 |
|
钱涛
|
9adafca446
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationSaveParam.java
# src/com/engine/salary/maintainer/datacollection/AddUpSituationManager.java
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
# src/com/engine/salary/wrapper/SalaryCommonWrapper.java
|
2025-02-08 15:50:39 +08:00 |
|
钱涛
|
54559b198b
|
处理模板示例列合并问题
|
2025-02-08 15:12:42 +08:00 |
|
钱涛
|
e48c74b2e2
|
处理模板示例列合并问题
|
2025-02-08 15:12:21 +08:00 |
|
Harryxzy
|
06e117f3aa
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-02-08 11:29:23 +08:00 |
|
Harryxzy
|
be59482fc8
|
fix社保福利台账核算人员bug
|
2025-02-08 11:28:36 +08:00 |