 钱涛
|
b4dfe2c740
|
适配汇通的二开，社保能跨扣缴义务人核算
|
2025-12-16 16:22:25 +08:00 |
|
钱涛
|
c7313d2bed
|
版本
|
2025-12-16 11:05:33 +08:00 |
|
钱涛
|
405efdc55e
|
Merge branch 'release/3.0.2.2504.01' into custom/汇通建设集团
# Conflicts:
# resource/WEB-INF/prop/hrmSalary.properties
# src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java
# src/com/engine/salary/service/SIAccountService.java
# src/com/engine/salary/service/SalaryAcctResultService.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
|
2025-12-16 10:40:32 +08:00 |
|
钱涛
|
7acdc94380
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-12-05 14:18:59 +08:00 |
|
钱涛
|
b83a916610
|
修复null
|
2025-12-05 14:18:39 +08:00 |
|
钱涛
|
e7923a2486
|
修复业务线查询
|
2025-12-03 17:34:05 +08:00 |
|
钱涛
|
eebfa5ec3f
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-12-02 14:56:21 +08:00 |
|
钱涛
|
10a11dcca4
|
处理社保补缴手动填写异常
|
2025-12-02 14:55:50 +08:00 |
|
钱涛
|
1a0df26e0b
|
汇通版本
|
2025-12-02 10:43:23 +08:00 |
|
钱涛
|
12c5e8b3b9
|
Merge branch 'release/2.19.1.2501.01' into custom/汇通建设集团
# Conflicts:
# src/com/engine/salary/service/SIAccountService.java
# src/com/engine/salary/service/SalaryAcctRecordService.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/web/SalaryAcctController.java
# src/com/engine/salary/web/SalaryBillController.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/SalarySendWrapper.java
|
2025-12-02 10:39:21 +08:00 |
|
钱涛
|
cf68e118fa
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-12-02 10:22:35 +08:00 |
|
钱涛
|
cb423962a2
|
报表穿透，按照薪资所属月排序
|
2025-12-02 10:22:14 +08:00 |
|
钱涛
|
d1abbad832
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-11-28 17:48:21 +08:00 |
|
钱涛
|
00fc87ffd8
|
修复生成年终奖申报表null
|
2025-11-28 15:41:42 +08:00 |
|
钱涛
|
5377a472cc
|
社保方案更新日志
|
2025-11-26 17:20:17 +08:00 |
|
钱涛
|
9f0c00ef25
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-11-24 17:20:43 +08:00 |
|
钱涛
|
85e0b85871
|
批量操作
|
2025-11-24 17:20:11 +08:00 |
|
钱涛
|
84e57edee1
|
常见sql
|
2025-11-18 17:52:26 +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 |
|
钱涛
|
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 |
|
钱涛
|
a74227f12a
|
action日志
|
2025-10-23 10:44:50 +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 |
Harryxzy
|
8be3ababa9
|
汇通调整
|
2025-10-15 17:52:16 +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 |
|
Harryxzy
|
422681e448
|
汇通调整
|
2025-09-24 16:33:13 +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 |
|
钱涛
|
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 |
|
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 |