 钱涛
|
0964dcd9ca
|
钱智未报送人员log
|
2025-09-25 11:15:35 +08:00 |
|
钱涛
|
33328ac7b9
|
Merge branch 'release/个税版本' into custom/钱智
|
2025-09-25 11:03:07 +08:00 |
|
钱涛
|
ae43dbbe04
|
人员报送批量处理
|
2025-09-25 11:02:46 +08:00 |
|
钱涛
|
38e1bd47c4
|
Merge branch 'release/个税版本' into custom/钱智
# Conflicts:
# src/com/engine/salary/wrapper/TaxDeclareRecordWrapper.java
|
2025-09-24 17:00:56 +08:00 |
|
钱涛
|
d0e7f7ed8c
|
人员报送批量处理
|
2025-09-24 16:59:50 +08:00 |
|
钱涛
|
f3f2eca609
|
钱智需求
|
2025-09-24 16:53:56 +08:00 |
|
钱涛
|
41fc2d5c13
|
钱智需求
|
2025-09-24 16:14:06 +08:00 |
|
钱涛
|
613478b19c
|
钱智需求
|
2025-09-23 14:20:52 +08:00 |
|
钱涛
|
2b92c2f5d6
|
Merge branch 'release/个税&业务线' into custom/钱智
|
2025-09-17 17:25:10 +08:00 |
|
钱涛
|
e47e8106f3
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-09-17 17:23:27 +08:00 |
|
钱涛
|
17247f111f
|
批量人员报送
|
2025-09-16 16:23:44 +08:00 |
|
钱涛
|
8f81b38d4d
|
Merge branch 'release/个税&业务线' into custom/钱智
|
2025-09-16 14:21:26 +08:00 |
|
钱涛
|
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 |
|
钱涛
|
1dda34408f
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-07-07 10:21:54 +08:00 |
|
钱涛
|
d3e40d1b9e
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-07-07 10:21:36 +08:00 |
|
钱涛
|
9830b156a5
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-07-07 10:21:09 +08:00 |
|
钱涛
|
8168a42b61
|
日志
|
2025-07-07 10:20:53 +08:00 |