 钱涛
|
866dc1c6ff
|
薪资项目分页功能
|
2024-11-27 11:13:20 +08:00 |
|
钱涛
|
b652dbbc8b
|
处理报表空指针
|
2024-11-26 18:14:41 +08:00 |
|
钱涛
|
5d458356a5
|
Merge remote-tracking branch 'origin/release/2.17.1.2411.01' into release/2.17.1.2411.01
|
2024-11-26 13:50:20 +08:00 |
|
钱涛
|
79ed6a3226
|
定制列恢复默认设置
|
2024-11-26 13:50:10 +08:00 |
Harryxzy
|
607fd2c6a2
|
Merge remote-tracking branch 'origin/release/2.17.1.2411.01' into release/2.17.1.2411.01
|
2024-11-26 13:30:04 +08:00 |
|
钱涛
|
12df33960a
|
修改默认列设置功能
|
2024-11-25 18:05:18 +08:00 |
|
钱涛
|
de5a00f588
|
修改默认列设置功能
|
2024-11-25 16:04:19 +08:00 |
|
Harryxzy
|
04fb5edade
|
浮动薪酬字符、数值限制
|
2024-11-20 11:28:14 +08:00 |
|
钱涛
|
199fe67374
|
适配港澳台通行证
|
2024-11-19 16:44:08 +08:00 |
|
钱涛
|
b3c2047a3d
|
港澳通行证
|
2024-11-19 15:07:42 +08:00 |
|
Harryxzy
|
7b6c6d211c
|
Merge remote-tracking branch 'origin/release/2.17.1.2411.01' into release/2.17.1.2411.01
|
2024-11-19 13:36:23 +08:00 |
|
Harryxzy
|
94c8d82f08
|
action 增加enableField字段值wei
|
2024-11-19 13:35:25 +08:00 |
|
钱涛
|
ce098fcd89
|
Merge branch 'release/2.17.1.2411.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
# src/com/engine/salary/wrapper/SalarySobItemWrapper.java
|
2024-11-19 13:29:22 +08:00 |
|
钱涛
|
ba3e635e1f
|
版本
|
2024-11-19 11:12:39 +08:00 |
|
Harryxzy
|
27b4e4c8fd
|
Merge remote-tracking branch 'origin/release/2.17.1.2411.01' into release/2.17.1.2411.01
|
2024-11-19 10:03:09 +08:00 |
|
Harryxzy
|
05c0995841
|
工资单导出增加查看、确认状态
|
2024-11-19 10:02:33 +08:00 |
|
钱涛
|
618dbd17d8
|
fix默认值列表重复bug
|
2024-11-19 09:48:13 +08:00 |
|
Harryxzy
|
00271f3a4b
|
解决冲突
|
2024-11-14 09:23:44 +08:00 |
|
Harryxzy
|
cd182a24b7
|
解决冲突
|
2024-11-14 09:13:23 +08:00 |
|
Harryxzy
|
8a06eaad93
|
Merge branch 'feature/工资单审批' into release/2.17.1.2411.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/sys/constant/SalarySysConstant.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
|
2024-11-13 18:36:20 +08:00 |
|
钱涛
|
9ff0612f59
|
sql缺失
|
2024-11-13 09:59:13 +08:00 |
|
钱涛
|
158e7dd20c
|
Merge branch 'feature/次账号' into release/2.17.1.2411.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/sys/constant/SalarySysConstant.java
|
2024-11-12 18:05:42 +08:00 |
|
钱涛
|
af7d51ac79
|
Merge branch 'release/2.16.1.2410.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
# src/com/engine/salary/web/SalaryCommonController.java
# src/com/engine/salary/wrapper/SalaryCommonWrapper.java
|
2024-11-12 18:01:22 +08:00 |
|
Harryxzy
|
ce1312d605
|
修复没有档案的人，定薪action状态保持不变
|
2024-11-12 17:08:59 +08:00 |
|
Harryxzy
|
5a18ccf57b
|
修复没有档案的人，定薪action状态保持不变
|
2024-11-12 17:06:41 +08:00 |
|
Harryxzy
|
e4071edab6
|
修复社保福利台账添加人员
|
2024-11-12 16:21:56 +08:00 |
|
钱涛
|
e42e950905
|
fix薪资明细报表搜索
|
2024-11-12 15:34:51 +08:00 |
|
Harryxzy
|
c88c8acf90
|
薪资档案搜索2100优化
|
2024-11-12 14:44:44 +08:00 |
|
钱涛
|
0e3a5320a4
|
新增核算结果状态编码
|
2024-11-12 11:31:47 +08:00 |
|
钱涛
|
4601d5ec81
|
修复打印模板列表不显示
|
2024-11-11 18:03:31 +08:00 |
|
钱涛
|
99274b95ec
|
修复打印模板列表不显示
|
2024-11-11 16:58:16 +08:00 |
|
Harryxzy
|
02de1e4444
|
工资单发放预览，兼容很早之前新建的工资单模板
|
2024-11-11 15:02:21 +08:00 |
|
Harryxzy
|
6ebef0cd5e
|
Merge remote-tracking branch 'origin/release/2.16.1.2410.01' into release/2.16.1.2410.01
|
2024-11-11 14:06:37 +08:00 |
|
Harryxzy
|
95abadfb0d
|
社保福利台账添加人员bug
|
2024-11-11 14:06:15 +08:00 |
|
钱涛
|
553764da86
|
模板sql
|
2024-11-11 10:51:59 +08:00 |
|
Harryxzy
|
ce80905ad0
|
薪资明细接口优化
|
2024-11-11 09:59:27 +08:00 |
|
钱涛
|
7aa3d12d4f
|
模板sql
|
2024-11-08 17:00:42 +08:00 |
|
Harryxzy
|
11f2591797
|
Merge branch 'feature/241101-定薪action支持不设为发薪人员' into release/2.16.1.2410.01
|
2024-11-08 16:30:53 +08:00 |
|
Harryxzy
|
32eabb25f0
|
Merge branch 'feature/241101_薪资档案增加调薪筛选' into release/2.16.1.2410.01
|
2024-11-08 16:30:40 +08:00 |
|
Harryxzy
|
058e7dcb3c
|
薪资档案增加调薪时间 筛选
|
2024-11-08 16:29:06 +08:00 |
|
钱涛
|
7e235e112a
|
处理核算结果null插入问题
|
2024-11-08 16:20:30 +08:00 |
|
Harryxzy
|
a2f8803e76
|
薪资档案增加调薪时间 筛选
|
2024-11-08 16:08:49 +08:00 |
|
钱涛
|
e537ffaa5a
|
薪资明细显示模板
|
2024-11-07 17:45:17 +08:00 |
|
Harryxzy
|
15fe5044e8
|
修复先加锁 再核算时报错
|
2024-11-07 15:19:11 +08:00 |
|
Harryxzy
|
5953c2b938
|
薪酬token加解密
|
2024-11-06 13:37:03 +08:00 |
|
Harryxzy
|
dbb332e07f
|
Merge branch 'release/2.16.1.2410.01' into fix/240901_token加解密
|
2024-11-06 10:05:53 +08:00 |
|
Harryxzy
|
13012b739e
|
定薪action支持配置留在待定薪
|
2024-11-05 16:22:48 +08:00 |
|
Harryxzy
|
1026599131
|
Merge remote-tracking branch 'origin/release/2.16.1.2410.01' into release/2.16.1.2410.01
|
2024-11-05 14:35:15 +08:00 |
|
Harryxzy
|
cb6738734a
|
修复社保福利档案导出，一个人在多个义务人下 导出bug
|
2024-11-05 11:04:21 +08:00 |
|
钱涛
|
4cd0fbfe30
|
报表模板
|
2024-11-04 19:49:46 +08:00 |