 钱涛
|
291cd426fe
|
公式变量支持获取上月数据
|
2025-02-17 15:54:35 +08:00 |
|
钱涛
|
22077f431e
|
权限改造
|
2025-02-17 09:49:01 +08:00 |
|
钱涛
|
05690a81fa
|
替换listAllTaxAgentsAsAdmin方法
|
2025-02-14 15:13:40 +08:00 |
|
钱涛
|
32be67e022
|
替换listAllTaxAgents方法
|
2025-02-14 14:50:54 +08:00 |
|
钱涛
|
3d0aff3f1d
|
薪资档案字段管理业务线分权
|
2025-02-14 14:05:18 +08:00 |
|
钱涛
|
a688ca8b52
|
业务线分权;
调薪记录多语言;
|
2025-02-13 14:23:58 +08:00 |
|
钱涛
|
c0dbce4786
|
业务线分权
|
2025-02-13 11:27:13 +08:00 |
|
钱涛
|
c17a566443
|
Merge branch 'release/2.19.1.2501.01' into feature/数据推送
|
2025-02-12 13:31:54 +08:00 |
Harryxzy
|
9c419f09bf
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-02-11 09:23:15 +08:00 |
|
钱涛
|
e48c74b2e2
|
处理模板示例列合并问题
|
2025-02-08 15:12:21 +08:00 |
|
Harryxzy
|
06e117f3aa
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-02-08 11:29:23 +08:00 |
|
Harryxzy
|
be59482fc8
|
fix社保福利台账核算人员bug
|
2025-02-08 11:28:36 +08:00 |
|
钱涛
|
747c349e9a
|
处理冲突
|
2025-02-08 10:06:01 +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 |
|
钱涛
|
0988dd6d5a
|
下载excel模板示例
|
2025-02-08 09:52:32 +08:00 |
|
钱涛
|
5916cd63ef
|
支持根据税款所属期进行申报
|
2025-02-07 16:58:58 +08:00 |
|
钱涛
|
3394c92964
|
修复导出模板附件删除问题
|
2025-02-07 11:44:17 +08:00 |
|
钱涛
|
8425a30aa0
|
模板显示附件名称
|
2025-02-07 10:13:29 +08:00 |
|
Harryxzy
|
c77ecf8d69
|
Merge branch 'feature/250101-社保福利台账不核算暂不缴纳人员' into release/2.19.1.2501.01
|
2025-02-07 09:16:18 +08:00 |
|
钱涛
|
d75979ed45
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-02-06 16:11:50 +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 |
|
Harryxzy
|
d63702891d
|
fix 社保福利台账核算人数大于1000时sqlbug
|
2025-02-06 13:51:22 +08:00 |
|
钱涛
|
36a92fee91
|
Merge branch 'feature/权限' into feature/数据推送
|
2025-02-05 16:04:30 +08:00 |
|
钱涛
|
74bb4beffc
|
修复业务线核算不了社保
|
2025-02-05 16:00:52 +08:00 |
|
Harryxzy
|
4875bd327c
|
社保福利台账勾选了暂不缴纳的不出现在台账中
|
2025-02-05 15:52:34 +08:00 |
|
钱涛
|
f3994f852d
|
修复业务核算不了社保
|
2025-02-05 14:38:53 +08:00 |
|
钱涛
|
e113c7f124
|
Merge branch 'feature/权限' into feature/数据推送
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2025-01-22 10:27:31 +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 |
|
钱涛
|
076e3029b1
|
获取已归档的正常工资薪金所得人员
|
2025-01-21 15:03:36 +08:00 |
|
钱涛
|
b206fd984c
|
考勤引用排除非系统人员
|
2025-01-20 15:05:04 +08:00 |
|
钱涛
|
bfeab498c8
|
Merge branch 'release/2.19.1.2501.01' into feature/权限
|
2025-01-03 09:40:39 +08:00 |
|
钱涛
|
df3ce490c0
|
处理账套复制问题
|
2024-12-27 14:34:03 +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 |
|
Harryxzy
|
d4a42e0ed6
|
修复人员确认页面“环比上月减少人员”搜索后，显示数据错误
|
2024-12-25 11:27:06 +08:00 |
|
Harryxzy
|
bbb02bcd81
|
fix 报表按照分部维度错误
fix 调薪记录导入生效日期格式错误
|
2024-12-24 15:39:58 +08:00 |
|
钱涛
|
9b9c169246
|
Merge branch 'release/2.18.1.2412.01' into feature/权限
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-12-17 16:27:46 +08:00 |
|
钱涛
|
10266bf739
|
处理离职员工无法导入问题
|
2024-12-17 15:00:41 +08:00 |
|
钱涛
|
4d90d0d8f0
|
支持主账号查看次账号工资单
|
2024-12-16 10:38:08 +08:00 |
|
Harryxzy
|
ec88fc5b10
|
修复基数没有自动调整 日志调整
|
2024-12-13 16:29:24 +08:00 |
|
Harryxzy
|
874de98a91
|
修复基数没有自动调整
|
2024-12-13 16:19:56 +08:00 |
|
Harryxzy
|
66912f62a4
|
社保基数自动调整 增加日志
|
2024-12-12 16:16:18 +08:00 |
|
Harryxzy
|
19a4385703
|
社保基数自动调整 增加日志
|
2024-12-12 15:30:26 +08:00 |
|
Harryxzy
|
4ddb123b3d
|
移动端获取工资单列表优化
|
2024-12-11 15:22:08 +08:00 |
|
钱涛
|
b8fdc4dde6
|
隐藏项目导入导出不显示
|
2024-12-10 16:25:20 +08:00 |
|
钱涛
|
72605793d1
|
处理冲突
|
2024-12-10 14:24:42 +08:00 |
|
钱涛
|
36de3feeed
|
Merge branch 'release/2.18.1.2412.01' into feature/权限
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
|
2024-12-10 14:14:28 +08:00 |
|
Harryxzy
|
b769e762ca
|
社保福利台账非系统人员
|
2024-12-10 11:50:20 +08:00 |
|
Harryxzy
|
1715b58bad
|
社保福利台账进度条优化
|
2024-12-10 11:00:05 +08:00 |
|
钱涛
|
89ca47d65e
|
进度条问题
|
2024-12-10 09:12:35 +08:00 |
|
Harryxzy
|
77f7640a24
|
社保台账进度条key增加义务人id
|
2024-12-09 17:13:29 +08:00 |
|
钱涛
|
2932df22e9
|
推送明细
|
2024-12-09 16:55:22 +08:00 |
|
Harryxzy
|
3fa6205c11
|
Merge remote-tracking branch 'origin/release/2.18.1.2412.01' into release/2.18.1.2412.01
|
2024-12-09 14:35:15 +08:00 |
|
Harryxzy
|
d52e13f09e
|
薪资明细报表增加证件号码
|
2024-12-09 14:34:57 +08:00 |
|
钱涛
|
887531ba5d
|
Merge branch 'feature/权限' into feature/数据推送
# Conflicts:
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
|
2024-12-09 14:26:32 +08:00 |
|
钱涛
|
7c1e314f2c
|
保存核算人员时增加快照数据
|
2024-12-09 14:20:52 +08:00 |
|
钱涛
|
4100ba1331
|
保存核算人员时增加快照数据
|
2024-12-09 13:21:25 +08:00 |
|
钱涛
|
0b6a832c4f
|
组织信息替换
|
2024-12-06 16:05:51 +08:00 |
|
钱涛
|
de5af5f2c9
|
组织快照
|
2024-12-06 16:00:05 +08:00 |
|
钱涛
|
dff42953b5
|
Merge branch 'release/2.17.1.2411.01' into feature/组织快照
|
2024-12-05 15:21:28 +08:00 |
|
钱涛
|
ec0e74a8eb
|
系统模板bug修改
|
2024-12-05 10:26:37 +08:00 |
|
钱涛
|
5fedafc67e
|
系统模板配置
|
2024-12-05 10:17:12 +08:00 |
|
钱涛
|
0114bdeb3f
|
系统模板配置
|
2024-12-04 17:45:56 +08:00 |
|
钱涛
|
f000148af7
|
Merge branch 'feature/薪资报表明细页面配置' into release/2.17.1.2411.01
|
2024-12-04 15:54:04 +08:00 |
|
钱涛
|
85e3d414fe
|
查询组织信息快照
|
2024-12-04 15:41:11 +08:00 |
|
钱涛
|
051a38d408
|
社保和薪资档案支持定时任务增员
|
2024-12-04 11:46:00 +08:00 |
|
钱涛
|
3e3350bcd6
|
删除模板功能
|
2024-12-04 10:14:39 +08:00 |
|
钱涛
|
c80d900339
|
模板管理列表
|
2024-12-04 09:13: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 |
|
钱涛
|
09b5dee199
|
模板权限
|
2024-12-02 15:01:06 +08:00 |
|
钱涛
|
186473f9f6
|
数据推送服务
|
2024-12-02 14:08:03 +08:00 |
|
钱涛
|
4606e11754
|
数据推送列表和明细列表
|
2024-11-29 10:10:25 +08:00 |
|
钱涛
|
ff3d569e1d
|
数据推送列表和明细列表
|
2024-11-29 09:14:04 +08:00 |
|
钱涛
|
17ceeef74d
|
数据推送明细状态
|
2024-11-28 15:30:36 +08:00 |
|
钱涛
|
3ba1ea6cc7
|
推送记录状态
|
2024-11-28 09:41:10 +08:00 |
|
钱涛
|
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 |
|
钱涛
|
33cc898257
|
刷新数据bug
|
2024-11-25 13:40:00 +08:00 |
|
钱涛
|
38b283e9ba
|
推送记录
|
2024-11-22 10:59:16 +08:00 |
|
钱涛
|
119d9f3cd8
|
推送日志功能
|
2024-11-21 11:54:47 +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
|
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 |
|
钱涛
|
7644e27e05
|
处理冲突
|
2024-11-15 14:25:07 +08:00 |