Harryxzy
|
1263514a81
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-06-16 18:06:40 +08:00 |
|
Harryxzy
|
c2f2390013
|
修复薪资明细导出，合计行统计文本字段
|
2025-06-16 16:41:38 +08:00 |
|
Harryxzy
|
ed88d3c531
|
联特调整
|
2025-06-13 14:47:27 +08:00 |
|
Harryxzy
|
447d682b4e
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-06-13 09:32:11 +08:00 |
 钱涛
|
3dc9f327df
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-06-12 11:04:58 +08:00 |
|
Harryxzy
|
2c39a1fa12
|
toMap空指针bug
|
2025-06-12 10:25:31 +08:00 |
|
Harryxzy
|
84339ab715
|
定时任务查询超1000bug
|
2025-06-10 17:35:44 +08:00 |
|
钱涛
|
eb26e556a3
|
Merge branch 'release/个税&业务线' into custom/联特
# Conflicts:
# src/com/engine/salary/util/excel/ExcelUtilPlus.java
|
2025-06-10 10:55:00 +08:00 |
|
钱涛
|
d35b6df42b
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-06-10 10:54:19 +08:00 |
|
钱涛
|
2cc43b8983
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-06-10 10:54:11 +08:00 |
|
钱涛
|
a16a16d13a
|
Merge branch 'release/3.0.2.2504.01' into custom/联特
# Conflicts:
# src/com/engine/salary/util/excel/ExcelUtilPlus.java
|
2025-06-10 10:53:55 +08:00 |
|
Harryxzy
|
6b5aebb6dd
|
联特修复已推送状态
|
2025-06-10 10:39:13 +08:00 |
|
钱涛
|
adbdb64b4c
|
补偿金自动生成免税附表
|
2025-06-06 11:07:33 +08:00 |
|
钱涛
|
9af6178636
|
对“是否雇员”字段为“其他”时的场景做了调整。新增了一个字段 ”其他情况说明“
|
2025-06-06 10:27:16 +08:00 |
|
Harryxzy
|
5aefe5272d
|
联特 流程获取数据接口
|
2025-06-05 10:48:28 +08:00 |
|
Harryxzy
|
af64d39fa7
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-05-29 10:56:23 +08:00 |
|
Harryxzy
|
aff5dbf185
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-05-29 10:39:32 +08:00 |
|
Harryxzy
|
578842aa39
|
修复数据穿透过滤条件
|
2025-05-29 10:39:06 +08:00 |
|
钱涛
|
61153309ca
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-05-27 15:57:28 +08:00 |
|
钱涛
|
1026ff1aae
|
fix邮件中数据为null
|
2025-05-27 15:56:33 +08:00 |
|
钱涛
|
5ebae4208a
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-05-27 10:54:54 +08:00 |
|
钱涛
|
d9982d2508
|
fix邮件中数据为null
|
2025-05-27 10:46:11 +08:00 |
|
钱涛
|
5435a5a736
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-05-26 10:37:47 +08:00 |
|
钱涛
|
93dc70de26
|
fix邮件中数据为null
|
2025-05-26 10:36:38 +08:00 |
|
钱涛
|
a5b693041f
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-05-21 11:37:40 +08:00 |
|
钱涛
|
c6633005aa
|
个税版本取消系统算税
|
2025-05-21 11:37:25 +08:00 |
|
钱涛
|
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 |
|
钱涛
|
9c06f080c5
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/util/excel/ExcelUtilPlus.java
|
2025-05-20 16:47:54 +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 |
|
Harryxzy
|
3b6a6222c9
|
Merge remote-tracking branch 'origin/custom/联特' into custom/联特
|
2025-05-16 11:14:14 +08:00 |
|
Harryxzy
|
a711c2f557
|
联特工资单发生校验修改
|
2025-05-16 11:13:46 +08:00 |
|
钱涛
|
f117f888b9
|
Merge branch 'release/个税版本' into custom/联特
|
2025-05-15 14:08:40 +08:00 |
|
钱涛
|
4a2821d793
|
离职日期允许导入清空
|
2025-05-15 14:08:12 +08:00 |
|
Harryxzy
|
ec0905d514
|
联特，cbs推送
|
2025-05-14 15:48:22 +08:00 |
|
Harryxzy
|
97e90e0a81
|
Merge remote-tracking branch 'origin/custom/联特' into custom/联特
|
2025-05-14 15:03:51 +08:00 |
|
钱涛
|
24c67ddaf3
|
二开，人员报送刷新不引用停薪人员
|
2025-05-14 11:30:49 +08:00 |
|
Harryxzy
|
e2839767fa
|
联特，cbs推送
|
2025-05-14 11:06:07 +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 |
|
Harryxzy
|
6cfeed52f6
|
联特修复
|
2025-05-13 15:57:00 +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 |
|
Harryxzy
|
888472d5e0
|
联特cbs对接
|
2025-05-13 11:05:10 +08:00 |
|
Harryxzy
|
8e839b23ba
|
Merge remote-tracking branch 'origin/custom/联特' into custom/联特
|
2025-05-12 18:31:09 +08:00 |
|
Harryxzy
|
4c05906f03
|
联特cbs对接
|
2025-05-12 17:42:15 +08:00 |
|
钱涛
|
48712d7d37
|
打印人员报送反馈
|
2025-05-12 15:24:21 +08:00 |
|
钱涛
|
8f2ff5e63d
|
Merge branch 'release/个税&业务线' into custom/联特
|
2025-05-09 19:47:12 +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 |
|
钱涛
|
d296fba3e9
|
二开，人员报送，刷新不采集税期当月或者之后月份
|
2025-05-09 19:43:44 +08:00 |
|
钱涛
|
df093e606c
|
二开，自离账套不参与申报
|
2025-05-09 17:59:40 +08:00 |
|
钱涛
|
223049c9c5
|
Merge branch 'release/个税&业务线' into custom/联特
# Conflicts:
# src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
|
2025-05-09 16:31:23 +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 |
|
钱涛
|
3a843fc41f
|
Merge branch 'release/3.0.2.2504.01' into custom/联特
|
2025-05-09 16:23:21 +08:00 |
|
钱涛
|
6925e4daea
|
fix冲突
|
2025-05-09 16:21:17 +08:00 |
|
钱涛
|
aa37e174e9
|
Merge branch 'release/个税版本' into custom/联特
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
|
2025-05-09 16:18:18 +08:00 |
|
钱涛
|
8c4fbf7919
|
拼接错误信息
|
2025-05-09 11:45:06 +08:00 |
|
钱涛
|
af89a43da7
|
修复业务线权限
|
2025-04-30 11:04:18 +08:00 |
|
钱涛
|
ca75a5f403
|
fix导出明细
|
2025-04-29 16:57:33 +08:00 |
|
钱涛
|
1a66a1f846
|
版本
|
2025-04-29 16:07:51 +08:00 |
|
钱涛
|
cc510db3cc
|
Merge remote-tracking branch 'origin/custom/联特' into custom/联特
|
2025-04-29 09:20:26 +08:00 |
|
钱涛
|
ecb920de0e
|
去除验证码
|
2025-04-29 09:19:44 +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 |
|
钱涛
|
a1af56bbcc
|
忘记密码
|
2025-04-28 18:08:29 +08:00 |
|
Harryxzy
|
2bd545964a
|
联特 季度绩效分段计算
|
2025-04-28 10:14:11 +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 |
|
钱涛
|
6e6606f3ac
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-04-21 15:49:39 +08:00 |
|
钱涛
|
552cee8a6f
|
修复合并计税问题
|
2025-04-21 15:49:28 +08:00 |
|
钱涛
|
110cec1b33
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-04-21 14:27:00 +08:00 |
|
钱涛
|
0e93cbab04
|
t
|
2025-04-21 10:37:44 +08:00 |