Commit Graph

3664 Commits

Author SHA1 Message Date
钱涛 dff47ab789 修复工资单 2025-12-17 13:55:02 +08:00
钱涛 967c227473 亨通,工资单 2025-12-09 14:27:56 +08:00
钱涛 20f67d8589 亨通,无账号人员工资单 2025-12-08 15:49:53 +08:00
钱涛 4f29b7f753 亨通,无账号人员工资单 2025-12-08 15:43:14 +08:00
钱涛 3aa8571ec7 亨通,无账号人员工资单 2025-12-08 10:53:24 +08:00
钱涛 8531fec598 亨通,无账号人员工资单 2025-12-05 16:36:09 +08:00
钱涛 01617ca39e 亨通,无账号人员工资单 2025-12-05 16:15:00 +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
钱涛 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
钱涛 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
钱涛 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
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