 钱涛
|
b7ecb9a239
|
1、批量申报
|
2025-09-16 11:51:08 +08:00 |
|
钱涛
|
3d948a431e
|
Merge branch 'release/个税版本' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2025-09-16 11:49:35 +08:00 |
|
钱涛
|
c4f860f742
|
1、批量申报
|
2025-09-16 11:42:20 +08:00 |
|
钱涛
|
07cdf2063a
|
1、批量申报
|
2025-09-16 11:41:33 +08:00 |
|
钱涛
|
943ce95ccc
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/SalaryAcctRecordService.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/web/TaxDeclarationController.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2025-09-16 11:21:28 +08:00 |
|
钱涛
|
4c61714069
|
1、批量申报
|
2025-09-16 11:12:34 +08:00 |
|
钱涛
|
82b6c2f072
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/service/SalaryAcctRecordService.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/web/TaxDeclarationController.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2025-09-16 11:04:00 +08:00 |
|
钱涛
|
fd75e9fe54
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
# Conflicts:
# src/com/engine/salary/service/SIAccountService.java
|
2025-09-16 10:57:48 +08:00 |
|
钱涛
|
1ae436e91a
|
修复社保批量核算
|
2025-09-16 10:07:16 +08:00 |
|
钱涛
|
f224916aac
|
社保台账：
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
薪资核算：
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
工资单：
1、批量发放
2、批量撤回
申报表：
1、批量申报
|
2025-09-16 10:07:16 +08:00 |
|
钱涛
|
2767114bfb
|
社保台账：
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
薪资核算：
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
工资单：
1、批量发放
2、批量撤回
申报表：
1、批量申报
|
2025-09-16 10:07:15 +08:00 |
|
钱涛
|
d04896b0c5
|
1、人员报送功能处原有逻辑是根据员工薪资档案时间作为受雇从业日期以及结束日期，现调整为以薪资档案时间往后延一个月作为雇从业日期以、结束日期。
|
2025-09-15 16:51:20 +08:00 |
|
钱涛
|
be4998b62d
|
1、人员报送功能处原有逻辑是根据员工薪资档案时间作为受雇从业日期以及结束日期，现调整为以薪资档案时间往后延一个月作为雇从业日期以、结束日期。
|
2025-09-15 11:33:51 +08:00 |
|
钱涛
|
344658a7ed
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-09-15 09:49:02 +08:00 |
Harryxzy
|
aa79512ded
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-09-12 16:00:37 +08:00 |
|
Harryxzy
|
0762fbee4d
|
社保StringUtils修改为lang3包中
|
2025-09-12 15:59:40 +08:00 |
|
Harryxzy
|
28ec56e4cc
|
业务线权限bug修复
|
2025-09-11 09:36:13 +08:00 |
|
Harryxzy
|
24676fe027
|
考勤引用多语言修复
|
2025-09-10 11:45:43 +08:00 |
|
Harryxzy
|
b053e7df83
|
Merge remote-tracking branch 'origin/release/3.0.2.2504.01' into release/3.0.2.2504.01
|
2025-09-09 18:47:45 +08:00 |
|
Harryxzy
|
3274043397
|
专项附加扣除业务线bug修复
|
2025-09-09 18:46:25 +08:00 |
|
钱涛
|
e603883635
|
短信验证码
|
2025-09-03 14:21:35 +08:00 |
|
钱涛
|
70732f38a9
|
短信验证码
|
2025-09-02 15:17:39 +08:00 |
Harryxzy
|
3775dbe686
|
修复业务线版本 报表分享问题
|
2025-08-26 16:04:27 +08:00 |
|
钱涛
|
d1d2130a52
|
参数解析工具
|
2025-08-25 16:40:47 +08:00 |
|
Harryxzy
|
d88f48216a
|
钱智 义务人名称
|
2025-08-22 11:44:01 +08:00 |
|
Harryxzy
|
6e56660e1a
|
钱智考勤引用逻辑跳转
|
2025-08-18 17:24:44 +08:00 |
|
钱涛
|
2bd092ae11
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-07-11 17:19:10 +08:00 |
|
钱涛
|
aa864cdd38
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-07-11 17:18:47 +08:00 |
|
钱涛
|
ed5f6da8a6
|
缴款需要按照分类分别缴纳
|
2025-07-11 17:18:15 +08:00 |
|
Harryxzy
|
e225965e33
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-07-09 10:09:10 +08:00 |
|
Harryxzy
|
fb239f34ed
|
修复薪资核算筛选为空时导出报错
|
2025-07-09 10:08:27 +08:00 |
|
钱涛
|
aa5547025f
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-07-08 18:28:24 +08:00 |
|
钱涛
|
b82538fea9
|
申报免税收入
|
2025-07-08 18:28:00 +08:00 |
|
Harryxzy
|
cbdc483c4c
|
薪酬报表浏览框根据业务线分权
|
2025-07-07 14:01:05 +08:00 |
|
钱涛
|
d3e40d1b9e
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-07-07 10:21:36 +08:00 |
|
Harryxzy
|
be3b4fc7e1
|
个税版本 个税申报bug修复
|
2025-07-04 15:13:28 +08:00 |
|
钱涛
|
4fd9883858
|
Merge branch 'release/个税&业务线' into custom/钱智
|
2025-07-03 09:09:35 +08:00 |
|
钱涛
|
d6061fa059
|
申报
|
2025-07-02 20:43:53 +08:00 |
|
钱涛
|
2a883868ba
|
Merge branch 'release/个税版本' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
|
2025-07-02 20:08:08 +08:00 |
|
钱涛
|
a2303bb450
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-07-02 20:06:02 +08:00 |
|
钱涛
|
fe7481d753
|
核算精准使用附表
|
2025-07-02 20:02:05 +08:00 |
|
钱涛
|
b2507306e5
|
附表导入导出功能
|
2025-07-02 15:46:32 +08:00 |
|
钱涛
|
cabaed627b
|
其他附加扣除增加申报类型
|
2025-07-02 13:42:41 +08:00 |
|
钱涛
|
de713c820d
|
附表填写
|
2025-07-02 11:37:16 +08:00 |
|
钱涛
|
cb02136ff6
|
免税收入
|
2025-07-01 18:37:50 +08:00 |
|
Harryxzy
|
5cc0dda5f6
|
修复业务线版本个税申报bug
|
2025-06-27 13:45:57 +08:00 |
|
钱涛
|
53c8909de4
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-06-25 14:37:22 +08:00 |
|
Harryxzy
|
2cd9484069
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-06-19 17:28:50 +08:00 |
|
Harryxzy
|
bfd953d082
|
水印单独配置分部不显示
|
2025-06-19 17:28:09 +08:00 |
|
Harryxzy
|
c7dad616a4
|
钱智合计
|
2025-06-19 15:57:25 +08:00 |
|
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 |