 钱涛
|
a89dee3c1e
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/util/excel/ExcelUtilPlus.java
|
2025-05-20 16:49:24 +08:00 |
|
钱涛
|
79f23e4e5a
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-05-20 16:45:46 +08:00 |
|
钱涛
|
81e87ec9ce
|
优化，导出时过滤空字符串
|
2025-05-20 16:44:46 +08:00 |
|
钱涛
|
445fce498a
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-05-20 16:20:31 +08:00 |
|
钱涛
|
9bb7c7f7f5
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-05-20 16:20:25 +08:00 |
|
钱涛
|
4a2821d793
|
离职日期允许导入清空
|
2025-05-15 14:08:12 +08:00 |
Harryxzy
|
bb84021758
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-05-13 16:29:02 +08:00 |
|
Harryxzy
|
05e92add4a
|
修复明细导出
|
2025-05-13 16:07:46 +08:00 |
|
钱涛
|
a0f85ea367
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-05-13 13:14:54 +08:00 |
|
钱涛
|
7de3dca2a3
|
撤回的工资单不允许查看
|
2025-05-13 13:14:30 +08:00 |
|
钱涛
|
48712d7d37
|
打印人员报送反馈
|
2025-05-12 15:24:21 +08:00 |
|
钱涛
|
3e49c412ea
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-05-09 19:47:02 +08:00 |
|
钱涛
|
24e7cbb32e
|
处理申报人次
|
2025-05-09 19:46:32 +08:00 |
|
钱涛
|
582a370170
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-05-09 16:29:05 +08:00 |
|
钱涛
|
603d31b095
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-05-09 16:28:56 +08:00 |
|
钱涛
|
f6428be044
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-05-09 16:23:53 +08:00 |
|
钱涛
|
8c4fbf7919
|
拼接错误信息
|
2025-05-09 11:45:06 +08:00 |
|
钱涛
|
ac1a767a29
|
版本
|
2025-05-09 10:19:58 +08:00 |
|
钱涛
|
98556e3a90
|
修改oracle去除;
|
2025-05-09 10:13:08 +08:00 |
|
钱涛
|
af89a43da7
|
修复业务线权限
|
2025-04-30 11:04:18 +08:00 |
|
钱涛
|
48632444fe
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-04-30 08:59:31 +08:00 |
|
钱涛
|
ca75a5f403
|
fix导出明细
|
2025-04-29 16:57:33 +08:00 |
|
钱涛
|
1a66a1f846
|
版本
|
2025-04-29 16:07:51 +08:00 |
|
钱涛
|
23b1fae3a3
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-04-28 18:15:00 +08:00 |
|
钱涛
|
bc8e80b4e6
|
增加ＳＵＢＳＴＲ拦截处理
|
2025-04-28 18:14:17 +08:00 |
|
钱涛
|
c7cadd2b98
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-04-25 17:40:03 +08:00 |
|
Harryxzy
|
344571997f
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-04-24 17:50:17 +08:00 |
|
Harryxzy
|
25c8479d53
|
修复社保福利台账线下对比和核算人数不匹配问题
|
2025-04-24 17:48:54 +08:00 |
|
钱涛
|
a2ead2346e
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/service/impl/PushServiceImpl.java
|
2025-04-24 17:36:03 +08:00 |
|
钱涛
|
508012c82b
|
修复数据推送查询问题
|
2025-04-24 17:35:22 +08:00 |
|
钱涛
|
efd2eafd1e
|
修复数据推送分页问题
|
2025-04-24 16:45:24 +08:00 |
|
钱涛
|
e54b775d69
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-04-24 16:19:54 +08:00 |
|
钱涛
|
d03c67644a
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-04-24 16:19:50 +08:00 |
|
钱涛
|
ee3fd8da8e
|
修复按照扣缴义务人名称检索
|
2025-04-24 16:19:23 +08:00 |
|
钱涛
|
9b9b47de88
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-04-24 16:08:39 +08:00 |
|
钱涛
|
99f6c43f25
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
|
2025-04-24 16:04:13 +08:00 |
|
钱涛
|
22f494fe12
|
修复按照扣缴义务人名称检索
|
2025-04-24 16:02:34 +08:00 |
|
钱涛
|
43d35cb81b
|
Merge branch 'release/个税版本' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
|
2025-04-24 11:07:01 +08:00 |
|
钱涛
|
0bdc48f1c2
|
修复归档后查看拓扑图
|
2025-04-24 11:03:13 +08:00 |
|
钱涛
|
35f8368715
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java
# src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
# src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
# src/com/engine/salary/web/TaxDeclarationController.java
|
2025-04-24 09:15:35 +08:00 |
|
钱涛
|
ac2143080f
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java
# src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
# src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
# src/com/engine/salary/web/TaxDeclarationController.java
|
2025-04-23 18:10:26 +08:00 |
|
钱涛
|
491a746c75
|
申报表税款所属期检索和申报
|
2025-04-23 17:45:14 +08:00 |
|
钱涛
|
2fe958f5db
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
|
2025-04-23 17:42:08 +08:00 |
|
钱涛
|
7a7030a91c
|
申报表税款所属期检索和申报
|
2025-04-23 17:39:30 +08:00 |
|
钱涛
|
47c267ba3b
|
拓扑图显示非薪资项目数据
|
2025-04-22 15:45:56 +08:00 |
|
钱涛
|
595fceddaa
|
拓扑图显示非薪资项目数据
|
2025-04-22 15:41:11 +08:00 |
|
钱涛
|
0b27d47d30
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-04-22 15:33:50 +08:00 |
|
钱涛
|
6532bfdd07
|
拓扑图显示非薪资项目数据
|
2025-04-22 15:33:28 +08:00 |
|
钱涛
|
06ba416d37
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-04-21 15:50:17 +08:00 |
|
钱涛
|
6b90c8c45c
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-04-21 15:50:00 +08:00 |