 钱涛
|
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 |
|
钱涛
|
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 |
|
钱涛
|
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 |
|
钱涛
|
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 |
|
钱涛
|
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 |
|
钱涛
|
4a7b218ee3
|
次账号sql
|
2024-10-25 15:19:16 +08:00 |
|
钱涛
|
5271d2516a
|
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/SalaryAcctEmployeeServiceImpl.java
|
2024-10-22 09:27:11 +08:00 |
|
钱涛
|
641b085a28
|
单元格锁定sql
|
2024-10-17 18:53:37 +08:00 |
|
钱涛
|
0111822a47
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
# Conflicts:
# src/com/engine/salary/constant/SalaryDefaultTenantConstant.java
# src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
|
2024-10-12 15:16:38 +08:00 |
|
钱涛
|
64ac30c05f
|
自定义列全局设置
|
2024-10-11 15:34:17 +08:00 |
|
钱涛
|
da4e908a7d
|
模板sql
|
2024-10-10 14:16:57 +08:00 |
|
Harryxzy
|
752de1fa8e
|
社保福利台账人员信息快照
|
2024-10-09 10:57:23 +08:00 |
|
钱涛
|
4b60c83df2
|
出去多余sql字段
|
2024-09-27 10:02:22 +08:00 |
|
钱涛
|
fed88b5ac5
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-24 19:05:21 +08:00 |
|
钱涛
|
6f10ac4ab2
|
取消非系统人员菜单
|
2024-09-24 19:04:57 +08:00 |
|
钱涛
|
a40814fa0b
|
业务线sql
|
2024-09-24 14:37:46 +08:00 |
|
钱涛
|
17ef5a3c2b
|
浮动数据菜单
|
2024-09-24 13:19:20 +08:00 |
|
钱涛
|
659560550a
|
Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资
|
2024-08-16 13:18:08 +08:00 |
|
钱涛
|
f74ec99644
|
账套支持sql范围
|
2024-08-15 10:37:41 +08:00 |
|
Harryxzy
|
1ebc56bb70
|
浮动薪酬增加义务人sql
|
2024-08-12 16:49:29 +08:00 |
|
Harryxzy
|
75fb15928a
|
浮动薪酬
|
2024-08-09 10:21:40 +08:00 |
|
钱涛
|
993f21b448
|
Merge branch 'feature/人员信息快照' into release/2.14.5.2406.03
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-06-21 14:17:36 +08:00 |
|
钱涛
|
fa26d3041a
|
默认算税sql
|
2024-06-20 11:08:52 +08:00 |
|
钱涛
|
0c0c754a9d
|
人员信息快照
|
2024-06-18 11:01:58 +08:00 |
|
钱涛
|
6bd0d1b8a8
|
锁定人员sql
|
2024-05-28 17:51:26 +08:00 |
|
钱涛
|
def5bae707
|
账套快照-隐藏字段脚本
|
2024-05-07 16:41:12 +08:00 |
|
钱涛
|
3428de9e33
|
账套快照
|
2024-05-06 16:03:29 +08:00 |
|
Harryxzy
|
8ff315b341
|
工资单审批sql
|
2024-04-25 17:24:47 +08:00 |
|
Harryxzy
|
4ccfac80f5
|
sql
|
2024-04-01 16:33:13 +08:00 |
|
Harryxzy
|
c3800881bc
|
sql
|
2024-03-15 09:31:04 +08:00 |
|
钱涛
|
e81937c4dd
|
去除报表原先的表
|
2024-03-07 11:45:26 +08:00 |
|
钱涛
|
1c62be09d1
|
Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01
|
2024-03-05 13:58:50 +08:00 |
|
钱涛
|
022b904581
|
添加账套筛选条件sql
|
2024-02-28 14:54:13 +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 |
|
Harryxzy
|
c64e9b4b76
|
工资单确认反馈sql
|
2024-02-19 14:01:30 +08:00 |
sy
|
f4ecb19ef2
|
Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件
|
2024-02-01 10:21:47 +08:00 |