 钱涛
|
37e9e06c56
|
钱智封存功能
|
2025-12-01 15:07:00 +08:00 |
|
钱涛
|
044b02e002
|
社保报表
|
2025-11-27 16:08:08 +08:00 |
|
钱涛
|
fe02f57215
|
钱智，社保报表
|
2025-11-25 16:13:40 +08:00 |
|
钱涛
|
ceb542ce89
|
Merge branch 'release/3.0.2.2504.01' into custom/钱智
|
2025-11-24 17:21:10 +08:00 |
|
钱涛
|
9f0c00ef25
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-11-24 17:20:43 +08:00 |
|
钱涛
|
85e0b85871
|
批量操作
|
2025-11-24 17:20:11 +08:00 |
|
钱涛
|
6a01e1b0f6
|
钱智，批量在线算税
|
2025-11-17 15:02:11 +08:00 |
|
钱涛
|
9f98572144
|
申报
|
2025-11-14 10:12:22 +08:00 |
|
钱涛
|
5c2c0f603f
|
Merge branch 'feature/批量操作' into custom/钱智
# Conflicts:
# src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java
# src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationBatParam.java
# src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.java
# src/com/engine/salary/service/SIAccountService.java
# src/com/engine/salary/service/SalaryAcctRecordService.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/web/SalaryAcctController.java
# src/com/engine/salary/web/TaxDeclarationController.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2025-11-14 09:20:59 +08:00 |
|
钱涛
|
2b92c2f5d6
|
Merge branch 'release/个税&业务线' into custom/钱智
|
2025-09-17 17:25:10 +08:00 |
|
钱涛
|
e47e8106f3
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-09-17 17:23:27 +08:00 |
|
钱涛
|
17247f111f
|
批量人员报送
|
2025-09-16 16:23:44 +08:00 |
|
钱涛
|
8f81b38d4d
|
Merge branch 'release/个税&业务线' into custom/钱智
|
2025-09-16 14:21:26 +08:00 |
|
钱涛
|
b7ecb9a239
|
1、批量申报
|
2025-09-16 11:51:08 +08:00 |
|
钱涛
|
3d948a431e
|
Merge branch 'release/个税版本' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2025-09-16 11:49:35 +08:00 |
|
钱涛
|
07cdf2063a
|
1、批量申报
|
2025-09-16 11:41:33 +08:00 |
|
钱涛
|
943ce95ccc
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/SalaryAcctRecordService.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/web/TaxDeclarationController.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2025-09-16 11:21:28 +08:00 |
|
钱涛
|
4c61714069
|
1、批量申报
|
2025-09-16 11:12:34 +08:00 |
|
钱涛
|
82b6c2f072
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/service/SalaryAcctRecordService.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/web/TaxDeclarationController.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2025-09-16 11:04:00 +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 |
|
钱涛
|
2767114bfb
|
社保台账：
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
薪资核算：
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
工资单：
1、批量发放
2、批量撤回
申报表：
1、批量申报
|
2025-09-16 10:07:15 +08:00 |
|
钱涛
|
490e6ab0fe
|
Merge branch 'release/个税&业务线' into custom/钱智
|
2025-06-19 11:05:53 +08:00 |
Harryxzy
|
d8d46cd932
|
薪资核算记录 批量新建并核算
|
2025-06-09 10:42:23 +08:00 |
|
钱涛
|
4755d51d2d
|
社保台账：
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
薪资核算：
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
工资单：
1、批量发放
2、批量撤回
申报表：
1、批量申报
|
2025-06-03 14:30:46 +08:00 |
|
钱涛
|
35f8368715
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java
# src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
# src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
# src/com/engine/salary/web/TaxDeclarationController.java
|
2025-04-24 09:15:35 +08:00 |
|
钱涛
|
ac2143080f
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java
# src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
# src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
# src/com/engine/salary/web/TaxDeclarationController.java
|
2025-04-23 18:10:26 +08:00 |
|
钱涛
|
2fe958f5db
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
|
2025-04-23 17:42:08 +08:00 |
|
钱涛
|
7a7030a91c
|
申报表税款所属期检索和申报
|
2025-04-23 17:39:30 +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 |
|
钱涛
|
110cec1b33
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-04-21 14:27:00 +08:00 |
|
钱涛
|
61beec603e
|
创建推送记录接口；
推送接口；
撤回接口；
|
2025-04-14 17:00:16 +08:00 |
|
钱涛
|
47ba860cc6
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-04-08 16:39:27 +08:00 |
|
钱涛
|
ed15911067
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-04-08 16:38:45 +08:00 |
|
钱涛
|
0777f99870
|
创建推送记录接口；
重推接口；
|
2025-04-01 17:35:29 +08:00 |
|
钱涛
|
590046b0a3
|
Merge branch 'feature/个税云6万扣除名单' into release/个税版本
|
2025-03-31 17:40:13 +08:00 |
|
钱涛
|
6ade625a39
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
|
2025-03-31 13:31:33 +08:00 |
|
钱涛
|
b1c1587344
|
Merge branch 'release/3.0.1.2503.01' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/service/SalaryAcctResultService.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/wrapper/SalarySobWrapper.java
|
2025-03-26 15:48:02 +08:00 |
|
钱涛
|
77df0f4c58
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01
|
2025-03-24 15:03:27 +08:00 |
|
钱涛
|
eea9093cfd
|
Merge branch 'release/2.17.1.2411.01' into release/2.19.1.2501.01
|
2025-03-24 15:03:09 +08:00 |
|
钱涛
|
b128f219f7
|
处理敏感信息泄露
|
2025-03-24 14:57:00 +08:00 |
|
钱涛
|
d7702d7cae
|
扣除名单编辑接口
|
2025-03-19 16:25:42 +08:00 |
|
钱涛
|
47dbfeb8db
|
确认名单反馈
|
2025-03-19 15:26:06 +08:00 |
|
钱涛
|
660a2718a1
|
扣减确认和反馈
|
2025-03-17 18:59:16 +08:00 |
|
钱涛
|
bad6928f34
|
删除确认名单
|
2025-03-14 15:56:28 +08:00 |
|
钱涛
|
a119e7c7cd
|
扣除确认接口
|
2025-03-12 13:55:59 +08:00 |
|
钱涛
|
894b9cd1fc
|
1、扣除名单查询
2、扣除名单确认
|
2025-03-10 15:31:33 +08:00 |
|
Harryxzy
|
ef28618db4
|
社保福利台账增减人员
|
2025-03-04 16:48:00 +08:00 |
|
Harryxzy
|
09b358f5b2
|
钱智 特殊人员社保福利台账计算
|
2025-02-13 13:34:22 +08:00 |
|
钱涛
|
f3577d3ddd
|
Merge branch 'feature/数据推送' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/constant/SalaryDefaultTenantConstant.java
# src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java
# src/com/engine/salary/entity/salarysob/param/SalarySobListQueryParam.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
# src/com/engine/salary/service/AddUpDeductionService.java
# src/com/engine/salary/service/OtherDeductionService.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalarySobWrapper.java
|
2025-02-12 14:00:43 +08:00 |
|
钱涛
|
c17a566443
|
Merge branch 'release/2.19.1.2501.01' into feature/数据推送
|
2025-02-12 13:31:54 +08:00 |