 钱涛
|
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 |
|
钱涛
|
0988dd6d5a
|
下载excel模板示例
|
2025-02-08 09:52:32 +08:00 |
|
钱涛
|
5916cd63ef
|
支持根据税款所属期进行申报
|
2025-02-07 16:58:58 +08:00 |
|
钱涛
|
3394c92964
|
修复导出模板附件删除问题
|
2025-02-07 11:44:17 +08:00 |
|
钱涛
|
20f06e07da
|
修复导出模板附件删除问题
|
2025-02-07 11:42:31 +08:00 |
|
钱涛
|
8425a30aa0
|
模板显示附件名称
|
2025-02-07 10:13:29 +08:00 |
|
Harryxzy
|
c77ecf8d69
|
Merge branch 'feature/250101-社保福利台账不核算暂不缴纳人员' into release/2.19.1.2501.01
|
2025-02-07 09:16:18 +08:00 |
|
钱涛
|
d75979ed45
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-02-06 16:11:50 +08:00 |
|
钱涛
|
0dd98cf616
|
薪资excel模板导出
|
2025-02-06 16:11:39 +08:00 |
|
Harryxzy
|
d63702891d
|
fix 社保福利台账核算人数大于1000时sqlbug
|
2025-02-06 13:51:22 +08:00 |
|
Harryxzy
|
4875bd327c
|
社保福利台账勾选了暂不缴纳的不出现在台账中
|
2025-02-05 15:52:34 +08:00 |
|
钱涛
|
b86854f368
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-01-23 16:49:17 +08:00 |
|
钱涛
|
0aabf7df6c
|
处理sql异常
|
2025-01-22 15:06:03 +08:00 |
|
钱涛
|
e398622191
|
处理冲突
|
2025-01-22 14:41:00 +08:00 |
|
钱涛
|
a5fdcc26e5
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
|
2025-01-22 11:48:31 +08:00 |
|
钱涛
|
076e3029b1
|
获取已归档的正常工资薪金所得人员
|
2025-01-21 15:03:36 +08:00 |
|
钱涛
|
7195dc7618
|
兼容0状态档案
|
2025-01-21 10:20:16 +08:00 |
|
钱涛
|
b206fd984c
|
考勤引用排除非系统人员
|
2025-01-20 15:05:04 +08:00 |
|
钱涛
|
f2cbbbe18a
|
下载附表明细数据
|
2025-01-16 13:41:17 +08:00 |
|
钱涛
|
5e95742508
|
人事信息快照表
|
2025-01-15 16:39:50 +08:00 |
|
钱涛
|
7a58e92fc7
|
同步主数据
|
2025-01-15 16:11:34 +08:00 |
|
钱涛
|
aea27897b7
|
同步主数据
|
2025-01-14 17:05:31 +08:00 |
|
钱涛
|
0bb2abc281
|
暂存
|
2025-01-14 14:56:36 +08:00 |
|
钱涛
|
d48f6131e0
|
暂存
|
2025-01-14 09:15:09 +08:00 |
|
钱涛
|
fefc6301b3
|
二开，调整附表传值策略
|
2025-01-07 11:27:20 +08:00 |
|
钱涛
|
e726cb10b9
|
Merge branch 'release/个税版本' into custom/艾志工业
|
2025-01-07 11:22:11 +08:00 |