 钱涛
|
8b1fe9ed3f
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-12-19 13:30:51 +08:00 |
|
钱涛
|
55c8680ab2
|
修改流量使用量
|
2025-12-19 13:30:11 +08:00 |
|
钱涛
|
6a0909ef3a
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-12-12 15:47:58 +08:00 |
|
钱涛
|
688f518e83
|
连续劳务收入版本
|
2025-12-12 15:47:11 +08:00 |
|
钱涛
|
911085477d
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-11-20 16:21:58 +08:00 |
|
钱涛
|
84e57edee1
|
常见sql
|
2025-11-18 17:52:26 +08:00 |
|
钱涛
|
9555de6acf
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-11-18 10:58:27 +08:00 |
|
钱涛
|
37ff12bf6a
|
报表
|
2025-11-18 09:34:24 +08:00 |
|
钱涛
|
4b717e9b2c
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-11-13 11:38:08 +08:00 |
|
钱涛
|
6a061592e5
|
处理pg脚本
|
2025-11-13 11:37:46 +08:00 |
|
钱涛
|
20bd294397
|
考勤引用数据范围100
|
2025-11-12 14:57:46 +08:00 |
|
钱涛
|
179711bc1a
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-11-06 13:42:29 +08:00 |
|
钱涛
|
44b5113ae9
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-11-06 11:28:17 +08:00 |
|
钱涛
|
e6a474261c
|
补缴信息提示优化
|
2025-11-06 11:27:41 +08:00 |
|
钱涛
|
e537107538
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-11-03 13:36:55 +08:00 |
|
钱涛
|
3dd8db37dc
|
账套sql类型的人员范围接入状态
|
2025-11-03 13:35:06 +08:00 |
|
钱涛
|
0a1acc89d3
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-10-29 15:46:38 +08:00 |
|
钱涛
|
b4994dab3f
|
常用sql
|
2025-10-29 15:46:24 +08:00 |
|
钱涛
|
310be11f43
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-10-27 11:23:09 +08:00 |
|
钱涛
|
f1bd47f8b7
|
修复核算多条件问题
|
2025-10-27 11:22:51 +08:00 |
|
钱涛
|
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 |