 钱涛
|
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 |
|
钱涛
|
20f06e07da
|
修复导出模板附件删除问题
|
2025-02-07 11:42:31 +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 |
|
Harryxzy
|
ad22c2df94
|
钱智逻辑调整
|
2025-01-23 16:55:11 +08:00 |
|
钱涛
|
e1804c303b
|
薪资档案调整分权
|
2025-01-23 14:20:21 +08:00 |
|
Harryxzy
|
16d986b2f5
|
钱智
|
2025-01-23 09:43:58 +08:00 |
|
钱涛
|
6e6347555a
|
处理oracle适配
|
2025-01-22 15:56:56 +08:00 |
|
钱涛
|
e398622191
|
处理冲突
|
2025-01-22 14:41:00 +08:00 |
|
钱涛
|
a5fdcc26e5
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
|
2025-01-22 11:48:31 +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 |
|
钱涛
|
a0cd1f1973
|
处理冲突
|
2025-01-21 17:19:17 +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 |
|
钱涛
|
7195dc7618
|
兼容0状态档案
|
2025-01-21 10:20:16 +08:00 |
|
Harryxzy
|
06dd1e51cf
|
钱智社保核算二开
|
2025-01-21 10:13:52 +08:00 |
|
钱涛
|
b206fd984c
|
考勤引用排除非系统人员
|
2025-01-20 15:05:04 +08:00 |
|
钱涛
|
f2cbbbe18a
|
下载附表明细数据
|
2025-01-16 13:41:17 +08:00 |
|
钱涛
|
7a58e92fc7
|
同步主数据
|
2025-01-15 16:11:34 +08:00 |
|
钱涛
|
aea27897b7
|
同步主数据
|
2025-01-14 17:05:31 +08:00 |
|
钱涛
|
0bb2abc281
|
暂存
|
2025-01-14 14:56:36 +08:00 |
|
钱涛
|
d48f6131e0
|
暂存
|
2025-01-14 09:15:09 +08:00 |
|
钱涛
|
60fcb403db
|
Merge branch 'feature/减免附表' into release/个税版本
|
2025-01-06 17:45:13 +08:00 |
|
钱涛
|
8a49ea89f8
|
增加申报表导入时导出现有数据选项
|
2025-01-06 16:55:52 +08:00 |
|
钱涛
|
5ec4fc3516
|
申报表查看附表
|
2025-01-03 17:38:47 +08:00 |
|
钱涛
|
bfeab498c8
|
Merge branch 'release/2.19.1.2501.01' into feature/权限
|
2025-01-03 09:40:39 +08:00 |
|
钱涛
|
4df0f90f79
|
Merge branch 'release/2.18.2.2412.02' into release/个税版本
|
2025-01-03 09:11:38 +08:00 |
|
钱涛
|
e23c4d08cc
|
修复其他免税编辑功能
|
2024-12-27 15:46:22 +08:00 |
|
钱涛
|
5946ea6985
|
修复其他免税编辑功能
|
2024-12-27 15:38:00 +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 |
|
钱涛
|
d096597a0a
|
申报添加附表
|
2024-12-26 18:56:33 +08:00 |
|
钱涛
|
39c536c7b4
|
申报功能
|
2024-12-26 15:16:24 +08:00 |
|
钱涛
|
5b241cda49
|
导入功能
|
2024-12-25 16:42:27 +08:00 |
|
钱涛
|
18bd6509db
|
导入功能
|
2024-12-25 16:28:21 +08:00 |
|
Harryxzy
|
d4a42e0ed6
|
修复人员确认页面“环比上月减少人员”搜索后，显示数据错误
|
2024-12-25 11:27:06 +08:00 |
|
钱涛
|
2e4c3ddaff
|
删除接口
|
2024-12-25 10:36:37 +08:00 |
|
钱涛
|
9c99e53288
|
列表和保存接口
|
2024-12-24 15:52:36 +08:00 |
|
Harryxzy
|
bbb02bcd81
|
fix 报表按照分部维度错误
fix 调薪记录导入生效日期格式错误
|
2024-12-24 15:39:58 +08:00 |
|
钱涛
|
412d3488d1
|
减免税额列表和保存接口
|
2024-12-24 10:54:57 +08:00 |
|
钱涛
|
cf253ecfb0
|
个人养老金附表
|
2024-12-23 16:41:42 +08:00 |
|
钱涛
|
090331e5b1
|
Merge branch 'release/个税版本' into feature/减免附表
|
2024-12-20 16:44:55 +08:00 |
|
钱涛
|
c415cc7f25
|
Merge branch 'release/2.18.2.2412.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-12-20 16:41:08 +08:00 |
|
Harryxzy
|
7b82b570e4
|
获取token增加https配置
|
2024-12-19 16:59:38 +08:00 |
|
Harryxzy
|
fda791624e
|
获取token增加https配置
|
2024-12-19 16:34:32 +08:00 |
|
钱涛
|
d1a4b83f33
|
健康保险附表
|
2024-12-19 11:23:59 +08:00 |
|
钱涛
|
e6f8b31f69
|
延税养老保险附表
|
2024-12-19 10:57:21 +08:00 |
|
钱涛
|
fe8910f2c5
|
减免税额附表
|
2024-12-19 10:46:04 +08:00 |
|
钱涛
|
4a9a001311
|
几个附表列表
|
2024-12-19 09:53:56 +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 |
|
钱涛
|
bf8f55aaa9
|
是否引用班次给出按钮选择
|
2024-12-17 15:47:49 +08:00 |
|
钱涛
|
10266bf739
|
处理离职员工无法导入问题
|
2024-12-17 15:00:41 +08:00 |
|
钱涛
|
d14ac4bda3
|
免税收入附表
|
2024-12-17 14:05:05 +08:00 |
|
钱涛
|
8c83e8ed6c
|
新增免税收入、商业健康保险、税延养老保险、准予扣除的捐赠额、减免税额、其他附表
|
2024-12-16 17:48:03 +08:00 |
|
Harryxzy
|
94da3d3a31
|
修复报表导出，单元格格式问题
|
2024-12-16 17:46:58 +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 |
|
钱涛
|
7243eece3d
|
Merge branch 'release/2.18.1.2412.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/SalaryEmployeeService.java
|
2024-12-13 13:53:00 +08:00 |
|
钱涛
|
c13cc9d0a2
|
处理薪资档案问题
|
2024-12-12 18:24:00 +08:00 |
|
Harryxzy
|
66912f62a4
|
社保基数自动调整 增加日志
|
2024-12-12 16:16:18 +08:00 |
|
Harryxzy
|
3d04414511
|
Merge remote-tracking branch 'origin/release/2.18.1.2412.01' into release/2.18.1.2412.01
|
2024-12-12 15:30:55 +08:00 |
|
Harryxzy
|
19a4385703
|
社保基数自动调整 增加日志
|
2024-12-12 15:30:26 +08:00 |
|
钱涛
|
83df05b763
|
控制下账号类型显示隐藏
|
2024-12-12 10:18:07 +08:00 |
|
Harryxzy
|
4ddb123b3d
|
移动端获取工资单列表优化
|
2024-12-11 15:22:08 +08:00 |
|
钱涛
|
b373f062c7
|
处理冲突
|
2024-12-11 11:07:36 +08:00 |
|
钱涛
|
bd3b815bcf
|
隐藏项目导入导出不显示
|
2024-12-11 11:04:42 +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
|
cc0568a149
|
Merge remote-tracking branch 'origin/release/2.18.1.2412.01' into release/2.18.1.2412.01
|
2024-12-09 17:14:23 +08:00 |
|
钱涛
|
c872fc69ba
|
处理分页问题
|
2024-12-09 17:13:45 +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 |
|
Harryxzy
|
7d346aa4b0
|
fix非系统人员导入薪资档案时，employeetype为null
|
2024-12-06 16:33:52 +08:00 |
|
钱涛
|
0b6a832c4f
|
组织信息替换
|
2024-12-06 16:05:51 +08:00 |
|
钱涛
|
5b8562edb6
|
组织快照
|
2024-12-06 16:00:53 +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 |
|
钱涛
|
f94ab9c3be
|
Merge branch 'release/2.17.1.2411.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/wrapper/SalaryCommonWrapper.java
|
2024-12-05 10:52:08 +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 |
|
钱涛
|
c3b71201a4
|
组织快照
|
2024-12-03 16:39:02 +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 |
|
Harryxzy
|
9daa406d83
|
优化token接口，避免不配时报错
|
2024-11-28 13:33:03 +08:00 |
|
钱涛
|
3ba1ea6cc7
|
推送记录状态
|
2024-11-28 09:41:10 +08:00 |
|
钱涛
|
866dc1c6ff
|
薪资项目分页功能
|
2024-11-27 11:13:20 +08:00 |
|
钱涛
|
1e2d37ad2e
|
推送明细
|
2024-11-27 09:02:24 +08:00 |
|
钱涛
|
b652dbbc8b
|
处理报表空指针
|
2024-11-26 18:14:41 +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 |
|
钱涛
|
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 |
|
钱涛
|
199fe67374
|
适配港澳台通行证
|
2024-11-19 16:44:08 +08:00 |
|
钱涛
|
b3c2047a3d
|
港澳通行证
|
2024-11-19 15:07:42 +08:00 |
|
Harryxzy
|
94c8d82f08
|
action 增加enableField字段值wei
|
2024-11-19 13:35:25 +08:00 |
|
钱涛
|
ce098fcd89
|
Merge branch 'release/2.17.1.2411.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
# src/com/engine/salary/wrapper/SalarySobItemWrapper.java
|
2024-11-19 13:29:22 +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 |
|
钱涛
|
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 |
|
钱涛
|
af7d51ac79
|
Merge branch 'release/2.16.1.2410.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
# src/com/engine/salary/web/SalaryCommonController.java
# src/com/engine/salary/wrapper/SalaryCommonWrapper.java
|
2024-11-12 18:01:22 +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 |
|
钱涛
|
553764da86
|
模板sql
|
2024-11-11 10:51:59 +08:00 |
|
Harryxzy
|
ce80905ad0
|
薪资明细接口优化
|
2024-11-11 09:59:27 +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 |
|
Harryxzy
|
058e7dcb3c
|
薪资档案增加调薪时间 筛选
|
2024-11-08 16:29:06 +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
|
5953c2b938
|
薪酬token加解密
|
2024-11-06 13:37:03 +08:00 |
|
Harryxzy
|
dbb332e07f
|
Merge branch 'release/2.16.1.2410.01' into fix/240901_token加解密
|
2024-11-06 10:05:53 +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 |
|
钱涛
|
e3d5ca78f4
|
修改账套状态类型
|
2024-11-04 10:53:21 +08:00 |
|
Harryxzy
|
e9b347c07c
|
前端增加薪资审批按钮的显隐控制
|
2024-11-01 16:03:51 +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 |
|
钱涛
|
7fd0f95802
|
扣缴义务人和账套的人员的人员状态
|
2024-11-01 14:27:47 +08:00 |
|
钱涛
|
391fa6ebd9
|
扣缴义务人和账套的人员的人员状态
|
2024-11-01 10:04:15 +08:00 |
|
钱涛
|
ad48063ca9
|
扣缴义务人和账套的人员范围支持编辑
|
2024-10-31 16:56:32 +08:00 |
|
钱涛
|
13ed52d1d8
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
|
2024-10-30 17:11:04 +08:00 |
|
钱涛
|
d21258596a
|
扣缴义务人新加入人员，不会修改历史档案
|
2024-10-30 17:10: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 |
|
钱涛
|
aebe8c59f8
|
Merge branch 'release/2.16.1.2410.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.java
# src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml
# src/com/engine/salary/service/SalaryAcctRecordService.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
|
2024-10-28 13:40:56 +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 |
|
钱涛
|
8cf9688862
|
获取三方信息失败，删除相关任务
|
2024-10-23 15:14:18 +08:00 |
|
Harryxzy
|
e694d53eea
|
个税版本 浮动薪酬bug修复
|
2024-10-22 17:32:00 +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 |
|
钱涛
|
b5e6059298
|
核算记录组织字段分开标识
|
2024-10-22 16:38:27 +08:00 |
|
钱涛
|
ce8356f9b2
|
分部id字段
|
2024-10-22 16:12:30 +08:00 |
|
钱涛
|
8c5c3d5949
|
工资单查看限制类型约束
|
2024-10-22 15:00:19 +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 |
|
钱涛
|
2bd336fc16
|
单元格锁定
|
2024-10-18 16:54:34 +08:00 |
|
钱涛
|
24dad9d988
|
Merge branch 'release/2.16.1.2410.01' into release/个税版本
|
2024-10-18 16:49:44 +08:00 |
|
钱涛
|
af34b8a5b5
|
单元格锁定
|
2024-10-18 16:49:17 +08:00 |
|
钱涛
|
988b82751e
|
考勤日志
|
2024-10-18 16:21:14 +08:00 |
|
钱涛
|
57fdc79e7b
|
修复引用日期转换问题
|
2024-10-18 15:58:43 +08:00 |
|
钱涛
|
47329fbcb9
|
累计专项附加扣除在线获取
|
2024-10-18 14:58:10 +08:00 |
|
钱涛
|
517d1e8d0b
|
Merge branch 'release/2.16.1.2410.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
|
2024-10-18 11:08:18 +08:00 |
|
钱涛
|
96a7be5625
|
修复核算列表次账号不显示问题
|
2024-10-18 11:03:33 +08:00 |
|
钱涛
|
313b91297f
|
Merge branch 'release/2.16.1.2410.01' into feature/次账号
# Conflicts:
# src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
|
2024-10-18 10:39:12 +08:00 |
|
钱涛
|
9f498551e4
|
单元格锁定字段改成字符型
|
2024-10-18 10:20:29 +08:00 |
|
钱涛
|
be2d6b693a
|
单元格锁定
|
2024-10-17 18:27:37 +08:00 |
|
Harryxzy
|
c6fdbe6403
|
社保停缴action最后缴纳月支持分开设置
|
2024-10-17 16:39:24 +08:00 |
|
Harryxzy
|
f664536bce
|
社保停缴action最后缴纳月支持分开设置
|
2024-10-17 15:51:05 +08:00 |
|
钱涛
|
4ec883cd9c
|
Merge branch 'release/2.16.1.2410.01' into feature/次账号
|
2024-10-17 14:28:08 +08:00 |
|
钱涛
|
38f773d125
|
优化核算导入效率
|
2024-10-17 14:07:27 +08:00 |
|
钱涛
|
70429df180
|
Merge branch 'custom/上海电力设计院' into release/2.16.1.2410.01
|
2024-10-17 13:42:23 +08:00 |
|
钱涛
|
0d100d9f53
|
修复报表分部条件过滤不生效
|
2024-10-17 10:20:58 +08:00 |
|
钱涛
|
fb8595ac00
|
次账号规则
|
2024-10-16 18:20:11 +08:00 |
|
钱涛
|
070a2a75ac
|
Merge branch 'release/2.15.2.2409.01' into feature/次账号
|
2024-10-16 17:19:43 +08:00 |
|
钱涛
|
637e5ced98
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-10-16 17:19:19 +08:00 |
|
钱涛
|
b89b068a1a
|
Merge branch 'release/2.15.2.2409.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
|
2024-10-16 17:13:35 +08:00 |
|
钱涛
|
d42e9768c2
|
处理sqlserver浮动数据bug
|
2024-10-16 16:53:24 +08:00 |
|
Harryxzy
|
fc88f03904
|
浮动薪酬加解密
|
2024-10-16 15:47:18 +08:00 |
|
钱涛
|
53ce7c7b43
|
核算人员显示次账号
|
2024-10-16 15:25:48 +08:00 |
|
钱涛
|
8e90361e82
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
# Conflicts:
# src/com/engine/salary/service/VariableArchiveService.java
|
2024-10-16 10:04:24 +08:00 |
|
Harryxzy
|
35a0349f38
|
Merge remote-tracking branch 'origin/release/2.15.2.2409.01' into release/2.15.2.2409.01
|
2024-10-16 09:42:10 +08:00 |
|
Harryxzy
|
e8559e1afa
|
修复社保福利导入报无人员 （历史数据兼容bug）
|
2024-10-16 09:41:55 +08:00 |
|
钱涛
|
5f50c26640
|
取消核算导入vlookup支持
|
2024-10-16 09:30:10 +08:00 |
|
钱涛
|
80dce4add7
|
fix冲突
|
2024-10-15 14:56:52 +08:00 |
|
钱涛
|
b2938a6e52
|
Merge branch 'release/2.15.2.2409.01' into release/个税版本
|
2024-10-15 14:55:23 +08:00 |
|
钱涛
|
6ec7210720
|
除去核算支持函数
|
2024-10-15 14:40:04 +08:00 |
|
钱涛
|
06d6854ff3
|
Merge branch 'release/2.15.2.2409.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/constant/SalaryDefaultTenantConstant.java
# src/com/engine/salary/web/SalaryCommonController.java
# src/com/engine/salary/wrapper/SalaryCommonWrapper.java
|
2024-10-15 14:29:08 +08:00 |
|
钱涛
|
6336ae24a0
|
Merge branch 'release/2.15.2.2409.01' into custom/上海电力设计院
|
2024-10-15 14:27:55 +08:00 |
|
钱涛
|
d3050117d1
|
支持次账号
|
2024-10-15 14:24:37 +08:00 |
|
Harryxzy
|
4c551dae87
|
Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01
|
2024-10-14 15:06:52 +08:00 |
|
Harryxzy
|
dbd1b574e0
|
浮动薪酬优化
|
2024-10-14 15:05:22 +08:00 |
|
Harryxzy
|
3ac5da2b31
|
社保台账sqlserver 2100bug
|
2024-10-14 14:34:46 +08:00 |
|
Harryxzy
|
49cbb7a7cc
|
浮动薪酬
|
2024-10-14 10:38:30 +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 |
|
钱涛
|
779d519a6f
|
Merge branch 'release/2.15.2.2409.01' into feature/自定义列全局设置
|
2024-10-12 11:11:44 +08:00 |
|
钱涛
|
c209399566
|
修复模板设置主键
|
2024-10-12 09:38:08 +08:00 |
|
钱涛
|
265ca2a54e
|
默认展示所有薪资明细列
|
2024-10-11 18:02:52 +08:00 |
|
钱涛
|
a0bc3b5452
|
记录核算日志
|
2024-10-11 17:32:02 +08:00 |
|
钱涛
|
3a224170f1
|
导入字段持久化
|
2024-10-11 17:17:07 +08:00 |
|
钱涛
|
4c4b6ab57d
|
导入字段持久化
|
2024-10-11 17:14:14 +08:00 |
|
钱涛
|
b6c7a7f2bd
|
自定义列全局设置
|
2024-10-11 17:04:13 +08:00 |
|
钱涛
|
32b3ce97a9
|
Merge branch 'release/2.15.2.2409.01' into feature/自定义列全局设置
|
2024-10-11 15:34:44 +08:00 |
|
钱涛
|
64ac30c05f
|
自定义列全局设置
|
2024-10-11 15:34:17 +08:00 |
|
Harryxzy
|
310c77a270
|
excel设置列宽 超过255报错
|
2024-10-11 15:14:21 +08:00 |
|
Harryxzy
|
8d8fc5c15d
|
社保台账人员信息快照
|
2024-10-11 10:17:35 +08:00 |
|
钱涛
|
861cda00fa
|
1、批量锁定、批量解锁选择人员的所在行的工资项目，需根据人员的选择来设置。
2、导入薪资项目时，优化下当前导入表头能否自动为上次选择的表头信息
|
2024-10-10 11:39:22 +08:00 |
|
钱涛
|
2ba4bb72db
|
薪资明细增加入职日期
|
2024-10-09 18:10:38 +08:00 |
|
钱涛
|
767d650ee9
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-10-09 17:31:45 +08:00 |
|
钱涛
|
3a128a4c5b
|
报表快照
|
2024-10-09 14:59:33 +08:00 |
|
钱涛
|
a40188659f
|
报表快照
|
2024-10-09 13:21:28 +08:00 |
|
Harryxzy
|
752de1fa8e
|
社保福利台账人员信息快照
|
2024-10-09 10:57:23 +08:00 |
|
钱涛
|
c2b200d843
|
业务线
|
2024-10-08 19:47:45 +08:00 |
|
钱涛
|
237ea8fcd8
|
业务线
|
2024-10-08 19:47:18 +08:00 |
|
钱涛
|
f487e060a2
|
Merge branch 'feature/快照条件搜索报表' into feature/权限
# Conflicts:
# src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
|
2024-10-08 16:20:32 +08:00 |
|
钱涛
|
09ccda7883
|
Merge branch 'release/2.15.2.2409.01' into feature/快照条件搜索报表
|
2024-10-08 16:12:08 +08:00 |
|
钱涛
|
61dee5d3a1
|
薪资明细排序
|
2024-10-08 15:48:33 +08:00 |
|
钱涛
|
ff5419f2bb
|
薪资明细排序
|
2024-10-08 15:45:12 +08:00 |
|
钱涛
|
f89e2d9bda
|
Merge branch 'release/2.15.2.2409.01' into release/个税版本
|
2024-10-08 14:37:32 +08:00 |
|
钱涛
|
edb07052b5
|
员工明细排序
|
2024-10-08 14:36:18 +08:00 |
|
钱涛
|
87f819f3e2
|
Merge branch 'release/2.15.2.2409.01' into feature/快照条件搜索报表
|
2024-10-08 14:25:26 +08:00 |
|
钱涛
|
ff44ddd8b1
|
员工明细排序
|
2024-10-08 14:19:02 +08:00 |
|
钱涛
|
8c0bad8023
|
报表快照
|
2024-09-30 10:37:27 +08:00 |
|
钱涛
|
13f0854208
|
报表缓存
|
2024-09-29 17:02:59 +08:00 |
|
钱涛
|
b4050e4ee8
|
报表快照搜索
|
2024-09-29 16:58:41 +08:00 |
|
钱涛
|
5d8cfbd169
|
Merge branch 'release/2.15.2.2409.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
|
2024-09-29 15:08:38 +08:00 |
|
钱涛
|
800f03427d
|
社保档案业务线
|
2024-09-29 14:34:44 +08:00 |
|
钱涛
|
7f233145d4
|
fix刷新核算人员功能冲突
|
2024-09-29 11:07:48 +08:00 |
|
钱涛
|
d54dd4e237
|
fix刷新核算人员功能冲突
|
2024-09-29 10:52:04 +08:00 |
|
钱涛
|
541546f5c8
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
|
2024-09-29 10:46:04 +08:00 |
|
钱涛
|
93d2980ad8
|
刷新核算人员功能
|
2024-09-29 10:37:38 +08:00 |
|
钱涛
|
4a8e96ebe6
|
修复扣缴业务人
|
2024-09-27 18:10:21 +08:00 |
|
钱涛
|
4db0fdc699
|
SQL 使用mybatis执行
|
2024-09-27 17:18:07 +08:00 |
|
钱涛
|
6e03afecc2
|
社保档案导入
|
2024-09-27 16:15:01 +08:00 |
|
钱涛
|
1d43e980e7
|
1、优化浮动数据业务线
2、优化浮动字段业务线
3、修复累计专项附加编辑权限
|
2024-09-27 11:34:01 +08:00 |
|
钱涛
|
e512a2868a
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-27 11:13:24 +08:00 |
|
钱涛
|
0852094cb1
|
修改浮动数据扣缴义务人id类型
|
2024-09-27 11:13:00 +08:00 |
|
钱涛
|
ab2912fb28
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-27 11:08:53 +08:00 |
|
钱涛
|
ecd99537fa
|
修复浮动数据null
|
2024-09-27 11:04:44 +08:00 |
|
钱涛
|
ffb4b5f0b4
|
记录删除业务线日志
|
2024-09-27 10:16:48 +08:00 |
|
钱涛
|
222fe9facd
|
业务线明细列表
|
2024-09-26 19:20:37 +08:00 |
|
钱涛
|
7f17c2a9b7
|
业务线同步
|
2024-09-26 17:52:01 +08:00 |
|
钱涛
|
0d7cdeddb0
|
社保台账操作按钮
|
2024-09-26 15:57:16 +08:00 |
|
钱涛
|
78c8d06200
|
社保福利搜索条件
|
2024-09-26 11:24:12 +08:00 |
|
钱涛
|
9b9d41532d
|
社保福利业务线
|
2024-09-26 10:35:46 +08:00 |
|
钱涛
|
2ada09f16c
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-25 16:07:42 +08:00 |
|
钱涛
|
b732430562
|
支持根据工号排序
|
2024-09-25 15:40:36 +08:00 |
|
钱涛
|
9f7fe00303
|
穿透显示快照组织信息
|
2024-09-25 13:38:45 +08:00 |
|
钱涛
|
ff200e2586
|
核算确认列表组织信息
|
2024-09-25 11:45:36 +08:00 |
|
钱涛
|
63c6a5af5e
|
业务线配置
|
2024-09-24 19:02:40 +08:00 |
|
钱涛
|
ae708a1d3b
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-24 13:19:59 +08:00 |
|
钱涛
|
0944efcf5e
|
物理删除业务线数据
|
2024-09-24 11:04:44 +08:00 |
|
钱涛
|
d959c75ce0
|
业务线操作日志
|
2024-09-24 10:19:06 +08:00 |
|
钱涛
|
a659821be8
|
业务线高级搜索
|
2024-09-24 09:50:46 +08:00 |
|
钱涛
|
cc6deee04c
|
报表模块分权
|
2024-09-23 14:35:51 +08:00 |
|
钱涛
|
1bb5dd63fb
|
优化申报提示
|
2024-09-23 13:20:59 +08:00 |
|
钱涛
|
164a97a8e0
|
修复大数据量，重新核算报错
|
2024-09-23 11:10:25 +08:00 |
|
钱涛
|
f0f6943eb0
|
薪资项目模块
|
2024-09-23 10:17:36 +08:00 |
|
钱涛
|
f62dfa17be
|
往期累计模块
|
2024-09-20 17:01:37 +08:00 |
|
钱涛
|
0ece125d18
|
其他免税扣除模块
|
2024-09-20 16:49:46 +08:00 |
|
钱涛
|
619af1a76a
|
其他免税扣除模块
|
2024-09-20 16:45:35 +08:00 |
|
钱涛
|
7ea6278e4e
|
累计专项附加扣除模块
|
2024-09-20 15:58:05 +08:00 |
|
钱涛
|
63a9e9caf8
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
# Conflicts:
# src/com/engine/salary/service/impl/VariableArchiveServiceImpl.java
|
2024-09-20 13:20:30 +08:00 |
|
钱涛
|
dc3dfc2d6b
|
去除脱敏报表
|
2024-09-20 11:41:44 +08:00 |
|
钱涛
|
7584404bc1
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-20 10:27:42 +08:00 |
|
钱涛
|
0f1d710cc1
|
穿梭薪资项目列表
|
2024-09-19 17:57:48 +08:00 |
|
Harryxzy
|
2b7b61745a
|
Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01
|
2024-09-19 17:50:09 +08:00 |
|
钱涛
|
ee535fc2bf
|
1、业务线-新建累计专项附加扣除
2、业务线-报表
|
2024-09-19 16:46:36 +08:00 |
|
钱涛
|
91863b901f
|
增加核算日志
|
2024-09-19 14:17:47 +08:00 |
|
钱涛
|
a59448e454
|
修复人力资源删除数据影响列表展示
|
2024-09-18 18:24:08 +08:00 |
|
钱涛
|
6e7ccb2339
|
浮动薪资档案分权
|
2024-09-18 18:19:58 +08:00 |
|
Harryxzy
|
3420c36448
|
人员id加密
|
2024-09-18 18:10:30 +08:00 |
|
Harryxzy
|
18ab255678
|
Merge branch 'fix/240901_社保福利档案补缴添加bug' into release/2.15.2.2409.01
|
2024-09-18 16:47:19 +08:00 |
|
Harryxzy
|
58012fe1e1
|
修复社保福利档案补缴添加bug
|
2024-09-18 16:44:02 +08:00 |
|
钱涛
|
9edf23fa37
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-18 16:13:24 +08:00 |
|
钱涛
|
cbd6553e11
|
Merge remote-tracking branch 'origin/release/2.15.2.2409.01' into release/2.15.2.2409.01
|
2024-09-18 15:59:45 +08:00 |
|
钱涛
|
09042321d1
|
1、支持获取班次信息
2、导出考勤功能优化，excel列和列表显示保持一致
|
2024-09-18 15:59:36 +08:00 |
|
Harryxzy
|
c4826515e1
|
Merge branch 'fix/240802-报表数据透视bug' into feature/240901-报表增加岗位筛选
|
2024-09-14 15:33:58 +08:00 |
|
Harryxzy
|
eefd4d1795
|
报表增加岗位筛选
|
2024-09-14 15:33:31 +08:00 |
|
钱涛
|
174838382a
|
支持扣缴义务人选项
|
2024-09-14 10:52:06 +08:00 |
|
Harryxzy
|
31d2994a9a
|
浮动薪酬多语言
|
2024-09-14 10:30:32 +08:00 |
|
钱涛
|
a48d4cea11
|
浮动数据
|
2024-09-14 09:36:52 +08:00 |
|
钱涛
|
96ced6e934
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-13 17:32:58 +08:00 |
|
钱涛
|
de0728665b
|
导入往期累计
|
2024-09-13 17:32:15 +08:00 |
|
Harryxzy
|
c212a2782f
|
薪酬统计报表增加岗位筛选
|
2024-09-13 14:54:52 +08:00 |
|
Harryxzy
|
9e5810f173
|
Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01
|
2024-09-13 11:11:24 +08:00 |
|
钱涛
|
d70e63e787
|
修复工资单保存异常
|
2024-09-12 17:07:52 +08:00 |