 钱涛
|
1e2d37ad2e
|
推送明细
|
2024-11-27 09:02:24 +08:00 |
|
钱涛
|
74b78a3ab5
|
推送记录
|
2024-11-26 18:05:19 +08:00 |
|
钱涛
|
035209afa8
|
推送记录
|
2024-11-26 16:47:51 +08:00 |
|
钱涛
|
94da757524
|
Merge branch 'release/2.17.1.2411.01' into feature/数据推送
# Conflicts:
# src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
|
2024-11-26 14:21:02 +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 |
|
钱涛
|
38b283e9ba
|
推送记录
|
2024-11-22 10:59:16 +08:00 |
|
钱涛
|
119d9f3cd8
|
推送日志功能
|
2024-11-21 11:54:47 +08:00 |
|
钱涛
|
7ea1e5fc80
|
建模列表接口
|
2024-11-21 10:25:37 +08:00 |
|
钱涛
|
2fe7b7dc03
|
Merge branch 'release/2.17.1.2411.01' into feature/数据推送
|
2024-11-20 18:43:59 +08:00 |
|
钱涛
|
dd77a2f11b
|
数据推送
|
2024-11-20 17:03:41 +08:00 |
|
Harryxzy
|
04fb5edade
|
浮动薪酬字符、数值限制
|
2024-11-20 11:28:14 +08:00 |
|
钱涛
|
e4e3fb4bec
|
数据推送
|
2024-11-19 19:34:41 +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 |
|
钱涛
|
fd48cd9a3d
|
sql
|
2024-11-19 11:29:21 +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 |
|
钱涛
|
9eb6a83f7b
|
数据推送列表
|
2024-11-19 09:37:43 +08:00 |
|
钱涛
|
37b9d20faa
|
数据推送来源枚举
|
2024-11-18 17:57:58 +08:00 |
|
钱涛
|
bca10e8978
|
数据推送权限重构
|
2024-11-18 17:52:48 +08:00 |
|
钱涛
|
527bd5e1ed
|
数据推送管理
|
2024-11-18 16:41:48 +08:00 |
|
钱涛
|
f4de5b16e9
|
Merge branch 'feature/权限' into feature/数据推送
|
2024-11-15 15:53:08 +08:00 |
|
钱涛
|
db99fc12e2
|
专项操作按钮
|
2024-11-15 15:50:32 +08:00 |
|
钱涛
|
7644e27e05
|
处理冲突
|
2024-11-15 14:25:07 +08:00 |
|
钱涛
|
5c4d7d8bde
|
Merge branch 'feature/权限' into feature/数据推送
# Conflicts:
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
|
2024-11-15 14:20:51 +08:00 |
|
钱涛
|
a40697ec33
|
数据推送配置
|
2024-11-15 13:57:35 +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 |
|
钱涛
|
84aa4caf54
|
解决冲突
|
2024-11-13 11:24:19 +08:00 |
|
钱涛
|
5a520a367a
|
Merge branch 'release/2.17.1.2411.01' into feature/权限
# Conflicts:
# resource/wiki/常用查询.md
# src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
# src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-11-13 11:10:27 +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 |
|
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 |