Harryxzy
|
71a3ba4569
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-06-19 11:39:25 +08:00 |
Harryxzy
|
e402029f6c
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-06-19 11:38:40 +08:00 |
Harryxzy
|
63c9558331
|
修复社保上下限校验 漏掉只开启了公司没开启个人的场景
|
2025-06-19 11:38:05 +08:00 |
钱涛
|
490e6ab0fe
|
Merge branch 'release/个税&业务线' into custom/钱智
|
2025-06-19 11:05:53 +08:00 |
钱涛
|
0b566561a0
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-06-19 11:05:09 +08:00 |
钱涛
|
ef1bfbdc25
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-06-18 17:22:14 +08:00 |
钱涛
|
c7e295e1d2
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-06-18 17:21:51 +08:00 |
钱涛
|
d4e6e111fc
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-06-18 17:21:35 +08:00 |
钱涛
|
f7cba636b3
|
修复默认值保留位数
|
2025-06-18 17:21:22 +08:00 |
钱涛
|
5f3c5f82b8
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-06-18 13:33:24 +08:00 |
钱涛
|
c27105aa21
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-06-18 13:33:02 +08:00 |
钱涛
|
a8c6e8e59e
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-06-18 13:32:41 +08:00 |
钱涛
|
919ade5715
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-06-18 13:32:17 +08:00 |
钱涛
|
de5caded9e
|
修复工资单性别问题
|
2025-06-18 13:32:12 +08:00 |
钱涛
|
c3d6ac8b66
|
分类所得-上市公司股息红利所得(沪市、深市、创业板)
分类所得-其他利息股息红利所得
|
2025-06-17 17:25:27 +08:00 |
钱涛
|
d4ff9af8b7
|
分类所得-上市公司股息红利所得(沪市、深市、创业板)
分类所得-其他利息股息红利所得
|
2025-06-17 11:23:30 +08:00 |
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
|
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 |
Harryxzy
|
0bd518f6e7
|
批量核算
|
2025-06-10 10:59:25 +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 |
Harryxzy
|
d8d46cd932
|
薪资核算记录 批量新建并核算
|
2025-06-09 10:42:23 +08:00 |
钱涛
|
adbdb64b4c
|
补偿金自动生成免税附表
|
2025-06-06 11:07:33 +08:00 |
钱涛
|
9af6178636
|
对“是否雇员”字段为“其他”时的场景做了调整。新增了一个字段 ”其他情况说明“
|
2025-06-06 10:27:16 +08:00 |
钱涛
|
e9e3483c8b
|
修复社保批量核算
|
2025-06-04 15:05:44 +08:00 |
钱涛
|
9e6ab0c155
|
社保台账:
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
薪资核算:
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
工资单:
1、批量发放
2、批量撤回
申报表:
1、批量申报
|
2025-06-04 13:23:29 +08:00 |
钱涛
|
4755d51d2d
|
社保台账:
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
薪资核算:
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
工资单:
1、批量发放
2、批量撤回
申报表:
1、批量申报
|
2025-06-03 14:30:46 +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 |
Harryxzy
|
773a128902
|
钱智 考勤引用二开
|
2025-05-23 14:05:11 +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 |
钱涛
|
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 |
钱涛
|
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 |
钱涛
|
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
|
增加SUBSTR拦截处理
|
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 |
Harryxzy
|
30707de205
|
处理冲突
|
2025-04-22 16:54:11 +08:00 |
钱涛
|
f638665b72
|
Merge branch 'release/个税&业务线' into custom/钱智
# Conflicts:
# src/com/engine/salary/service/impl/SIExportServiceImpl.java
|
2025-04-22 16:05:31 +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 |
钱涛
|
083f266a85
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-04-17 14:24:23 +08:00 |
钱涛
|
6e366bed5a
|
fix账套列表检索问题
|
2025-04-17 14:20:14 +08:00 |
钱涛
|
d01c9bf06f
|
增加扣缴义务人搜索核算列表
|
2025-04-17 11:06:02 +08:00 |
钱涛
|
da6364a511
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-04-16 14:06:53 +08:00 |
钱涛
|
37445cdd58
|
fix部分发放
|
2025-04-16 14:06:46 +08:00 |
Harryxzy
|
99a0c3facc
|
2100bug修复
|
2025-04-16 13:26:36 +08:00 |
钱涛
|
b0fb2b3866
|
部分发放
|
2025-04-15 17:49:38 +08:00 |
钱涛
|
61beec603e
|
创建推送记录接口;
推送接口;
撤回接口;
|
2025-04-14 17:00:16 +08:00 |
钱涛
|
cca13614e3
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-04-14 15:46:04 +08:00 |
Harryxzy
|
0bcafd3934
|
修复个税申报 不同税款所属期校验bug
|
2025-04-09 17:20:48 +08:00 |
钱涛
|
be8ede54df
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-04-09 14:25:43 +08:00 |
钱涛
|
c04dad0c4d
|
修改字段名
|
2025-04-09 14:23:38 +08:00 |
钱涛
|
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 |
钱涛
|
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 |
钱涛
|
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 |
钱涛
|
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 |
钱涛
|
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 |