 钱涛
|
044b02e002
|
社保报表
|
2025-11-27 16:08:08 +08:00 |
|
钱涛
|
bfa4057016
|
钱智，社保
|
2025-11-27 10:44:01 +08:00 |
|
钱涛
|
a85e371791
|
钱智，社保报表
|
2025-11-26 16:45:01 +08:00 |
|
钱涛
|
fe02f57215
|
钱智，社保报表
|
2025-11-25 16:13:40 +08:00 |
|
钱涛
|
4c874c7569
|
Merge branch 'release/3.0.2.2504.01' into custom/钱智
|
2025-11-14 09:52:44 +08:00 |
|
钱涛
|
44b5113ae9
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-11-06 11:28:17 +08:00 |
|
钱涛
|
e6a474261c
|
补缴信息提示优化
|
2025-11-06 11:27:41 +08:00 |
|
钱涛
|
8f81b38d4d
|
Merge branch 'release/个税&业务线' into custom/钱智
|
2025-09-16 14:21:26 +08:00 |
|
钱涛
|
fd75e9fe54
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
# Conflicts:
# src/com/engine/salary/service/SIAccountService.java
|
2025-09-16 10:57:48 +08:00 |
|
钱涛
|
1ae436e91a
|
修复社保批量核算
|
2025-09-16 10:07:16 +08:00 |
|
钱涛
|
f224916aac
|
社保台账：
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
薪资核算：
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
工资单：
1、批量发放
2、批量撤回
申报表：
1、批量申报
|
2025-09-16 10:07:16 +08:00 |
|
钱涛
|
2767114bfb
|
社保台账：
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
薪资核算：
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
工资单：
1、批量发放
2、批量撤回
申报表：
1、批量申报
|
2025-09-16 10:07:15 +08:00 |
Harryxzy
|
c7dad616a4
|
钱智合计
|
2025-06-19 15:57:25 +08:00 |
|
Harryxzy
|
30707de205
|
处理冲突
|
2025-04-22 16:54:11 +08:00 |
|
钱涛
|
f638665b72
|
Merge branch 'release/个税&业务线' into custom/钱智
# Conflicts:
# src/com/engine/salary/service/impl/SIExportServiceImpl.java
|
2025-04-22 16:05:31 +08:00 |
|
Harryxzy
|
25723af00a
|
社保福利台账增减人员
|
2025-03-11 15:18:05 +08:00 |
|
Harryxzy
|
5b66efa3cc
|
社保福利台账增减人员
|
2025-03-10 16:47:48 +08:00 |
|
Harryxzy
|
ef28618db4
|
社保福利台账增减人员
|
2025-03-04 16:48:00 +08:00 |
|
Harryxzy
|
35db0c3ea8
|
钱智
|
2025-02-17 11:37:31 +08:00 |
|
Harryxzy
|
6cb2b2e677
|
钱智 社保核算需求变更
|
2025-02-14 16:47:20 +08:00 |
|
钱涛
|
05690a81fa
|
替换listAllTaxAgentsAsAdmin方法
|
2025-02-14 15:13:40 +08:00 |
|
钱涛
|
a688ca8b52
|
业务线分权;
调薪记录多语言;
|
2025-02-13 14:23:58 +08:00 |
|
Harryxzy
|
09b358f5b2
|
钱智 特殊人员社保福利台账计算
|
2025-02-13 13:34:22 +08:00 |
|
钱涛
|
c17a566443
|
Merge branch 'release/2.19.1.2501.01' into feature/数据推送
|
2025-02-12 13:31:54 +08:00 |
|
Harryxzy
|
be59482fc8
|
fix社保福利台账核算人员bug
|
2025-02-08 11:28:36 +08:00 |
|
Harryxzy
|
c77ecf8d69
|
Merge branch 'feature/250101-社保福利台账不核算暂不缴纳人员' into release/2.19.1.2501.01
|
2025-02-07 09:16:18 +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 |
|
钱涛
|
74bb4beffc
|
修复业务线核算不了社保
|
2025-02-05 16:00:52 +08:00 |
|
Harryxzy
|
4875bd327c
|
社保福利台账勾选了暂不缴纳的不出现在台账中
|
2025-02-05 15:52:34 +08:00 |
|
Harryxzy
|
ad22c2df94
|
钱智逻辑调整
|
2025-01-23 16:55:11 +08:00 |
|
Harryxzy
|
16d986b2f5
|
钱智
|
2025-01-23 09:43:58 +08:00 |
|
Harryxzy
|
06dd1e51cf
|
钱智社保核算二开
|
2025-01-21 10:13:52 +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 |
|
钱涛
|
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 |
|
钱涛
|
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 |
|
Harryxzy
|
3ac5da2b31
|
社保台账sqlserver 2100bug
|
2024-10-14 14:34:46 +08:00 |
|
Harryxzy
|
752de1fa8e
|
社保福利台账人员信息快照
|
2024-10-09 10:57:23 +08:00 |
|
钱涛
|
0d7cdeddb0
|
社保台账操作按钮
|
2024-09-26 15:57:16 +08:00 |
|
钱涛
|
9b9d41532d
|
社保福利业务线
|
2024-09-26 10:35:46 +08:00 |
|
Harryxzy
|
832a6ac1ec
|
社保福利台账明细导入2100bug
|
2024-08-14 11:17:56 +08:00 |
|
Harryxzy
|
a6f02082d8
|
fix社保福利台账非系统人员日志空指针
|
2024-07-10 15:01:49 +08:00 |
|
Harryxzy
|
1dd3439ce3
|
社保福利台账小数位优化
|
2024-06-13 13:59:43 +08:00 |
|
Harryxzy
|
16f5ffcf29
|
优化 - 社保福利台账小数位数
|
2024-06-05 15:30:57 +08:00 |
|
Harryxzy
|
b6331b952c
|
修复
1、社保福利台账补差下载导入模板，显示的是补差数据；
2、报表分享不设置起始日期时oracle数据库兼容问题；
|
2024-06-05 11:02:59 +08:00 |