 钱涛
|
af7ba37b4b
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-10-23 18:32:41 +08:00 |
|
钱涛
|
25f0713bb3
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-10-23 18:32:33 +08:00 |
|
钱涛
|
a74227f12a
|
action日志
|
2025-10-23 10:44:50 +08:00 |
|
钱涛
|
074ea5cf7f
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-10-21 16:59:19 +08:00 |
|
钱涛
|
038fac392c
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-10-21 16:56:09 +08:00 |
|
钱涛
|
953a590cca
|
常用sql
|
2025-10-21 16:55:42 +08:00 |
|
钱涛
|
9205c736ba
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-10-17 17:29:50 +08:00 |
|
钱涛
|
014cdd7618
|
增加有序map
|
2025-10-17 17:29:31 +08:00 |
|
钱涛
|
0adfa422a4
|
版本
|
2025-10-13 13:47:55 +08:00 |
|
钱涛
|
f5f84a9ec3
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-10-09 13:38:17 +08:00 |
|
钱涛
|
e3d6cbe5a1
|
批量锁定人员列
|
2025-09-30 16:40:20 +08:00 |
|
钱涛
|
ae43dbbe04
|
人员报送批量处理
|
2025-09-25 11:02:46 +08:00 |
|
钱涛
|
d0e7f7ed8c
|
人员报送批量处理
|
2025-09-24 16:59:50 +08:00 |
|
钱涛
|
60755a9a0b
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-09-18 16:32:28 +08:00 |
|
钱涛
|
fbce286c17
|
修复字段管理分权问题
|
2025-09-18 16:31:58 +08:00 |
Harryxzy
|
f57582da52
|
修复业务线搜索bug
|
2025-09-18 15:38:13 +08:00 |
|
Harryxzy
|
6ed1d5033f
|
修复业务线数据明细搜索bug
|
2025-09-18 14:15:02 +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 |
|
钱涛
|
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 |
|
钱涛
|
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 |
|
钱涛
|
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 |