Harryxzy
|
0c42e1cb35
|
同步社保、薪资档案起始发薪日为入职日定时任务
|
2024-03-14 14:05:36 +08:00 |
|
Harryxzy
|
af57e8ecf4
|
Merge remote-tracking branch 'origin/release/3.0.0.2403.01' into release/3.0.0.2403.01
|
2024-03-12 14:58:21 +08:00 |
 钱涛
|
836947725f
|
切换了elog位置
|
2024-03-12 14:34:44 +08:00 |
|
Harryxzy
|
83624be06e
|
Merge branch 'fix/240301_薪资核算、社保台账导入提示缺失' into release/3.0.0.2403.01
|
2024-03-12 14:26:42 +08:00 |
|
Harryxzy
|
afb4bfd7ad
|
修复bug：
1、薪资核算结果导入提示缺失
2、社保福利台账导入操作日志导致报错
|
2024-03-11 17:23:20 +08:00 |
|
钱涛
|
4b823ccca7
|
国际化注解
|
2024-03-11 16:50:47 +08:00 |
|
Harryxzy
|
0f82b8ce10
|
Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01
|
2024-03-07 14:23:46 +08:00 |
|
Harryxzy
|
17428c621e
|
非系统人员范围操作日志
|
2024-03-07 14:23:12 +08:00 |
|
钱涛
|
3b1edddf00
|
优化薪资账套项目保存逻辑
|
2024-03-07 10:21:06 +08:00 |
|
Harryxzy
|
20d7266db9
|
Merge branch 'feature/240201_社保福利台账导入字段缓存' into release/2.11.1.2402.01
# Conflicts:
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
|
2024-03-06 13:50:56 +08:00 |
|
Harryxzy
|
0ac291d83d
|
Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01
|
2024-03-06 09:23:21 +08:00 |
|
Harryxzy
|
8984369343
|
薪资档案、社保档案查看日志
|
2024-03-05 15:15:20 +08:00 |
|
Harryxzy
|
6c2d20a5a7
|
Merge branch 'feature/240101_我的薪资福利显示页签支持配置' into release/2.11.1.2402.01
|
2024-03-05 14:24:19 +08:00 |
|
钱涛
|
1c62be09d1
|
Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01
|
2024-03-05 13:58:50 +08:00 |
|
Harryxzy
|
3f76b5bbbf
|
非系统人员管理日志
|
2024-03-04 16:12:30 +08:00 |
|
Harryxzy
|
8c6c6a4966
|
社保福利台账，非系统人员导入报错
|
2024-03-04 14:30:25 +08:00 |
|
钱涛
|
c081581ba7
|
Merge branch 'feature/报表支持账套筛选' into release/2.11.1.2402.01
|
2024-03-04 14:01:33 +08:00 |
|
钱涛
|
f325674673
|
Merge branch 'release/2.11.1.2402.01' into feature/操作日志组件
|
2024-03-04 09:41:35 +08:00 |
|
Harryxzy
|
5485f7d260
|
社保福利台账导入，表单字段缓存
|
2024-03-01 17:40:19 +08:00 |
|
钱涛
|
8ae06f27b8
|
fix导入性能，导入方法类型改完外层引用
|
2024-02-29 15:53:22 +08:00 |
|
Harryxzy
|
efa556ddd9
|
操作日志修复
|
2024-02-29 11:31:18 +08:00 |
|
Harryxzy
|
89787332e3
|
操作日志修复
|
2024-02-28 18:03:55 +08:00 |
|
Harryxzy
|
066222400b
|
操作日志修复
|
2024-02-28 16:44:52 +08:00 |
|
Harryxzy
|
adff178a7c
|
义务人日志优化
|
2024-02-28 15:01:44 +08:00 |
|
钱涛
|
a1ab3c79f4
|
添加账套筛选条件
|
2024-02-28 14:43:27 +08:00 |
|
Harryxzy
|
f9163340e5
|
分片
|
2024-02-28 09:17:28 +08:00 |
|
Harryxzy
|
1261194d88
|
操作日志优化
|
2024-02-27 11:30:14 +08:00 |
|
钱涛
|
f11d6a035c
|
去除pagehelper jar包
|
2024-02-26 15:40:52 +08:00 |
sy
|
4ea2499d85
|
Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件
|
2024-02-23 16:11:18 +08:00 |
|
sy
|
624c7db09f
|
薪酬系统-福利台账，核算功能操作日志逻辑添加
|
2024-02-23 16:11:11 +08:00 |
|
Harryxzy
|
093cb34f77
|
操作日志fix some bugs
|
2024-02-23 15:11:56 +08:00 |
|
sy
|
dce7f684a5
|
薪酬系统-福利台账，列表分权问题修复
|
2024-02-23 11:34:48 +08:00 |
|
Harryxzy
|
a39806bb92
|
我的薪资福利显示页签支持配置
|
2024-02-23 11:04:14 +08:00 |
|
sy
|
e4cbcdd400
|
Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件
|
2024-02-22 15:24:12 +08:00 |
|
sy
|
1654e041b9
|
薪酬系统-福利档案，相关功能操作日志逻辑优化
|
2024-02-22 15:23:59 +08:00 |
|
Harryxzy
|
5c5dcdabb2
|
Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件
|
2024-02-22 09:44:02 +08:00 |
|
Harryxzy
|
f591074fc1
|
日志
|
2024-02-22 09:43:47 +08:00 |
|
sy
|
f7eb698c4c
|
Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件
|
2024-02-22 09:34:09 +08:00 |
|
sy
|
75dd4235af
|
薪酬系统-福利台账，补缴、补差、退差页相关功能操作日志添加
|
2024-02-22 09:33:35 +08:00 |
|
Harryxzy
|
dee20149bb
|
日志
|
2024-02-21 18:19:02 +08:00 |
|
sy
|
e813a195f5
|
Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件
|
2024-02-20 17:05:04 +08:00 |
|
sy
|
088a5c1d72
|
薪酬系统-福利台账，正常缴纳页相关功能操作日志添加
|
2024-02-20 16:50:45 +08:00 |
|
Harryxzy
|
117dbeb211
|
Merge branch 'fix/240101_考勤引用查看数据报错' into feature/操作日志组件
|
2024-02-20 10:10:22 +08:00 |
|
Harryxzy
|
b4f36ab101
|
Merge branch 'feature/240102_工资单确认和反馈按钮分开' into release/2.10.1.2401.01
|
2024-02-20 09:51:00 +08:00 |
|
sy
|
cfb82cb9b2
|
薪酬系统-福利方案、档案、台账，相关实现类代码梳理，去除sqlsession形式的mpper调用
|
2024-02-19 17:27:42 +08:00 |
|
Harryxzy
|
c64e9b4b76
|
工资单确认反馈sql
|
2024-02-19 14:01:30 +08:00 |
|
Harryxzy
|
7fe03ac7a1
|
工资单确认反馈优化
|
2024-02-19 10:09:49 +08:00 |
|
钱涛
|
b2972e8aca
|
增加操作日志类型
|
2024-02-18 11:40:59 +08:00 |
|
sy
|
6a79b22c17
|
薪酬系统-福利档案，增加操作日志
|
2024-02-07 17:39:26 +08:00 |
|
sy
|
1c61c0004d
|
薪酬系统-福利方案，方案明细编辑并保存，主表增加操作日志
|
2024-02-05 15:04:39 +08:00 |