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 |
|
钱涛
|
b86854f368
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-01-23 16:49:17 +08:00 |
|
钱涛
|
e1804c303b
|
薪资档案调整分权
|
2025-01-23 14:20:21 +08:00 |
|
钱涛
|
6e6347555a
|
处理oracle适配
|
2025-01-22 15:56:56 +08:00 |
|
钱涛
|
0aabf7df6c
|
处理sql异常
|
2025-01-22 15:06:03 +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 |
|
钱涛
|
b206fd984c
|
考勤引用排除非系统人员
|
2025-01-20 15:05:04 +08:00 |
|
钱涛
|
f2cbbbe18a
|
下载附表明细数据
|
2025-01-16 13:41:17 +08:00 |
|
钱涛
|
5e95742508
|
人事信息快照表
|
2025-01-15 16:39:50 +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 |
|
钱涛
|
483c368732
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-01-06 11:30:23 +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 |
|
钱涛
|
5a0ef67816
|
版本
|
2025-01-03 09:14:08 +08:00 |
|
钱涛
|
4df0f90f79
|
Merge branch 'release/2.18.2.2412.02' into release/个税版本
|
2025-01-03 09:11:38 +08:00 |
|
钱涛
|
8f697eba36
|
版本
|
2025-01-02 15:00:21 +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 |