 钱涛
|
dd77a2f11b
|
数据推送
|
2024-11-20 17:03:41 +08:00 |
|
钱涛
|
e4e3fb4bec
|
数据推送
|
2024-11-19 19:34:41 +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 |
|
钱涛
|
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
|
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 |
|
钱涛
|
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
|
e4071edab6
|
修复社保福利台账添加人员
|
2024-11-12 16:21:56 +08:00 |
|
Harryxzy
|
c88c8acf90
|
薪资档案搜索2100优化
|
2024-11-12 14:44:44 +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
|
95abadfb0d
|
社保福利台账添加人员bug
|
2024-11-11 14:06:15 +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 |
|
钱涛
|
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
|
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 |
|
Harryxzy
|
07c0492ec2
|
Merge branch 'release/2.16.1.2410.01' into feature/次账号
|
2024-11-04 17:29:32 +08:00 |
|
钱涛
|
ea06150dc5
|
取消社保台账重新核算限制
|
2024-11-04 15:06:27 +08:00 |
|
钱涛
|
ef13d93fe1
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
# Conflicts:
# src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java
|
2024-11-04 14:33:15 +08:00 |
|
Harryxzy
|
906a432ec2
|
Merge branch 'fix/241001-社保停缴action最后缴纳月支持分开设置' into release/2.16.1.2410.01
|
2024-11-01 14:34:14 +08:00 |
|
Harryxzy
|
989468cdc7
|
Merge branch 'feature/241001-社保台账人员信息快照' into release/2.16.1.2410.01
|
2024-11-01 14:33:14 +08:00 |
|
钱涛
|
ad48063ca9
|
扣缴义务人和账套的人员范围支持编辑
|
2024-10-31 16:56:32 +08:00 |
|
钱涛
|
812ca6c752
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
|
2024-10-28 15:46:51 +08:00 |
|
钱涛
|
455550836e
|
解决账套项目过多，快照问题
|
2024-10-28 15:46:29 +08:00 |
|
钱涛
|
2499d543d8
|
解决主次账号档案异常
|
2024-10-28 15:11:31 +08:00 |
|
钱涛
|
63928ddc59
|
解决人员状态null问题
|
2024-10-28 15:08:10 +08:00 |
|
钱涛
|
a51f20b798
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
|
2024-10-28 13:48:52 +08:00 |
|
钱涛
|
bfbd9e4b40
|
修复人员报表排序
|
2024-10-28 11:35:57 +08:00 |
|
钱涛
|
f884e3ff25
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
|
2024-10-25 16:04:43 +08:00 |
|
钱涛
|
71569cad9e
|
薪资所属年变量
|
2024-10-25 16:01:45 +08:00 |
|
钱涛
|
c3e7037667
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
|
2024-10-25 09:34:45 +08:00 |
|
钱涛
|
45c99da037
|
Merge branch 'release/2.16.1.2410.01' into feature/次账号
|
2024-10-24 11:08:20 +08:00 |
|
钱涛
|
c0de305c3d
|
核算记录最后操作日期
|
2024-10-24 10:55:44 +08:00 |
|
钱涛
|
94bb1ede32
|
Merge branch 'release/2.16.1.2410.01' into feature/次账号
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-10-24 10:34:56 +08:00 |
|
钱涛
|
28fa294c6f
|
异步记录日志
|
2024-10-24 10:19:35 +08:00 |
|
钱涛
|
e3c6b08e6f
|
处理报表导出异常
|
2024-10-23 17:41:28 +08:00 |
|
钱涛
|
77d8c8168c
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
# Conflicts:
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-10-22 17:10:47 +08:00 |