Harryxzy
|
649f8c2432
|
Merge branch 'release/3.0.2.2504.01' into custom/领悦业务线
# Conflicts:
# src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml
|
2025-04-10 13:36:23 +08:00 |
 钱涛
|
c04dad0c4d
|
修改字段名
|
2025-04-09 14:23:38 +08:00 |
|
Harryxzy
|
ba2e83447f
|
Merge branch 'release/3.0.1.2503.01' into custom/领悦业务线
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
|
2025-04-08 11:36:34 +08:00 |
|
钱涛
|
f4c025e078
|
数据推送
|
2025-04-07 09:19:47 +08:00 |
|
钱涛
|
d4f45d5eb3
|
扩展排序字段
|
2025-04-03 10:49:10 +08:00 |
|
钱涛
|
0a78f17230
|
记录推送耗时
|
2025-04-02 17:05:04 +08:00 |
|
钱涛
|
8e3c4bfacc
|
数据推送配置sql
|
2025-04-01 16:43:02 +08:00 |
|
钱涛
|
97546393a4
|
上线版本
|
2025-03-27 16:31:40 +08:00 |
|
钱涛
|
8a49a2ef1b
|
上线版本
|
2025-03-27 16:13:19 +08:00 |
|
钱涛
|
93defb41cd
|
版本
|
2025-03-20 17:32:06 +08:00 |
|
Harryxzy
|
db3fab6e85
|
领悦薪酬二开
|
2025-03-20 15:31:38 +08:00 |
|
钱涛
|
93b98ce583
|
版本
|
2025-02-20 10:54:52 +08:00 |
|
Harryxzy
|
35551d09a5
|
Merge branch 'release/3.0.0.2502.01' into custom/领悦业务线
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2025-02-19 10:49:43 +08:00 |
|
钱涛
|
f2b71b1c38
|
Merge branch 'release/2.19.1.2501.01' into feature/数据推送
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
|
2025-02-08 09:59:44 +08:00 |
|
钱涛
|
0dd98cf616
|
薪资excel模板导出
|
2025-02-06 16:11:39 +08:00 |
|
Harryxzy
|
81e8b70746
|
Merge branch 'release/2.19.1.2501.01' into feature/数据推送
|
2025-02-06 14:22:06 +08:00 |
|
钱涛
|
0aabf7df6c
|
处理sql异常
|
2025-01-22 15:06:03 +08:00 |
|
钱涛
|
50c3bbf41d
|
Merge branch 'release/2.19.1.2501.01' into feature/数据推送
# Conflicts:
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
|
2025-01-21 17:14:47 +08:00 |
|
钱涛
|
5e95742508
|
人事信息快照表
|
2025-01-15 16:39:50 +08:00 |
|
钱涛
|
5a0ef67816
|
版本
|
2025-01-03 09:14:08 +08:00 |
|
钱涛
|
8f697eba36
|
版本
|
2025-01-02 15:00:21 +08:00 |
|
钱涛
|
35aff0431e
|
Merge branch 'release/2.18.2.2412.02' into feature/数据推送
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-12-27 09:24:22 +08:00 |
|
钱涛
|
851921dedd
|
Merge branch 'release/2.18.1.2412.01' into custom/领悦业务线
# Conflicts:
# src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-12-17 16:07:01 +08:00 |
|
钱涛
|
b3dcafa6f1
|
版本号
|
2024-12-09 15:12:33 +08:00 |
|
钱涛
|
a342673ffb
|
Merge branch 'feature/权限' into custom/领悦业务线
# Conflicts:
# src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
|
2024-12-03 12:20:41 +08:00 |
|
钱涛
|
583f3fa85a
|
Merge branch 'release/2.17.1.2411.01' into feature/权限
# Conflicts:
# src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
|
2024-12-03 12:14:25 +08:00 |
|
钱涛
|
3d61bfa9a6
|
薪资报表明细显示定制列配置
|
2024-12-03 10:45:03 +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 |
|
钱涛
|
de5a00f588
|
修改默认列设置功能
|
2024-11-25 16:04:19 +08:00 |
|
钱涛
|
38b283e9ba
|
推送记录
|
2024-11-22 10:59:16 +08:00 |
|
钱涛
|
2fe7b7dc03
|
Merge branch 'release/2.17.1.2411.01' into feature/数据推送
|
2024-11-20 18:43:59 +08:00 |
|
钱涛
|
fd48cd9a3d
|
sql
|
2024-11-19 11:29:21 +08:00 |
|
钱涛
|
ba3e635e1f
|
版本
|
2024-11-19 11:12:39 +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 |
|
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 |
|
钱涛
|
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 |
|
钱涛
|
7aa3d12d4f
|
模板sql
|
2024-11-08 17:00:42 +08:00 |
|
Harryxzy
|
07c0492ec2
|
Merge branch 'release/2.16.1.2410.01' into feature/次账号
|
2024-11-04 17:29:32 +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
|
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 |
|
钱涛
|
909782d7d6
|
调薪管理页面权限
|
2024-10-31 10:46:02 +08:00 |
|
钱涛
|
4a7b218ee3
|
次账号sql
|
2024-10-25 15:19:16 +08:00 |
|
钱涛
|
c3e7037667
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
|
2024-10-25 09:34:45 +08:00 |
|
钱涛
|
28fa294c6f
|
异步记录日志
|
2024-10-24 10:19:35 +08:00 |
|
Harryxzy
|
8c49838adc
|
Merge branch 'custom/领悦' into custom/领悦业务线
|
2024-10-22 09:53:07 +08:00 |
|
Harryxzy
|
0ce80ffcd6
|
领悦 社保公积金报表拆分sql
|
2024-10-22 09:52:15 +08:00 |
|
钱涛
|
b99ce85dd9
|
Merge branch 'custom/领悦' into custom/领悦业务线
# Conflicts:
# src/com/engine/salary/constant/SalaryDefaultTenantConstant.java
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
# src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
# src/com/engine/salary/service/VariableArchiveService.java
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
|
2024-10-22 09:44:34 +08:00 |