harryxzy
|
0192bc89fa
|
领悦报表调整
|
2025-11-21 09:57:38 +08:00 |
|
harryxzy
|
a88c1d7af0
|
领悦报表调整
|
2025-11-15 21:24:47 +08:00 |
 钱涛
|
c35b6a8076
|
领悦合并
|
2025-10-13 19:29:59 +08:00 |
|
钱涛
|
3a59187162
|
Merge branch 'release/3.0.2.2504.01' into custom/领悦业务线
|
2025-10-13 16:40:12 +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
|
1751dae127
|
领悦4张报表增加搜索框；删除往期累计数据action
|
2025-09-18 15:15:48 +08:00 |
|
Harryxzy
|
6ed1d5033f
|
修复业务线数据明细搜索bug
|
2025-09-18 14:15:02 +08:00 |
|
Harryxzy
|
a55b20234f
|
领悦报表2、3、4：薪酬档案职级统计报表
|
2025-09-16 17:12:58 +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 |
|
Harryxzy
|
9a1b7be680
|
领悦报表1：薪酬档案职级统计报表
|
2025-09-16 10:47:15 +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
|
4dcb8f2275
|
业务线权限bug修复
|
2025-09-11 09:27:35 +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 |
|
Harryxzy
|
83297993cd
|
专项附加扣除业务线bug修复
|
2025-09-09 18:44:18 +08:00 |
|
Harryxzy
|
d738497ab2
|
领悦建模更新时间
|
2025-09-05 10:24:38 +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
|
d5ed2ffac0
|
1、社保公积金解锁加锁分开
2、报表加2个字段
3、推送成功反写状态不根据id反写 根据公司名称
|
2025-08-15 13:33:43 +08:00 |
|
Harryxzy
|
6de10786df
|
领悦需求调整
|
2025-07-31 10:47:27 +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 |
|
Harryxzy
|
cbdc483c4c
|
薪酬报表浏览框根据业务线分权
|
2025-07-07 14:01:05 +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 |
|
Harryxzy
|
5cc0dda5f6
|
修复业务线版本个税申报bug
|
2025-06-27 13:45:57 +08:00 |
|
Harryxzy
|
2cd9484069
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-06-19 17:28:50 +08:00 |
|
Harryxzy
|
bfd953d082
|
水印单独配置分部不显示
|
2025-06-19 17:28:09 +08:00 |
|
钱涛
|
45acec8468
|
上线版本
|
2025-06-19 14:40:09 +08:00 |
|
Harryxzy
|
904c053d2c
|
Merge remote-tracking branch 'origin/release/3.0.2.2504.01' into release/3.0.2.2504.01
|
2025-06-19 11:39:42 +08:00 |
|
Harryxzy
|
71a3ba4569
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-06-19 11:39:25 +08:00 |
|
Harryxzy
|
e402029f6c
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-06-19 11:38:40 +08:00 |
|
Harryxzy
|
63c9558331
|
修复社保上下限校验 漏掉只开启了公司没开启个人的场景
|
2025-06-19 11:38:05 +08:00 |
|
钱涛
|
d4e6e111fc
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-06-18 17:21:35 +08:00 |
|
钱涛
|
f7cba636b3
|
修复默认值保留位数
|
2025-06-18 17:21:22 +08:00 |
|
钱涛
|
a8c6e8e59e
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-06-18 13:32:41 +08:00 |
|
钱涛
|
919ade5715
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-06-18 13:32:17 +08:00 |