 钱涛
|
e9719bd012
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2026-02-10 16:56:59 +08:00 |
|
钱涛
|
e47d9eda1e
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2026-02-10 16:54:02 +08:00 |
|
钱涛
|
49738114fc
|
薪资档案初始化导入支持
|
2026-02-05 15:03:31 +08:00 |
|
钱涛
|
acfb8cbfe4
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2026-02-02 15:18:14 +08:00 |
|
钱涛
|
dee1ed1b9c
|
个税云升级
|
2026-02-02 15:17:38 +08:00 |
|
钱涛
|
84f186e665
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2026-01-26 14:34:27 +08:00 |
|
钱涛
|
9858d8e024
|
个税云升级
取消：不再需要填写“人员状态”（原“正常/非正常”选项）；
新增：是否离职后补发工资：员工有离职日期时可选择“是/否”；
|
2026-01-26 14:32:10 +08:00 |
|
钱涛
|
93708f5327
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2026-01-07 15:44:23 +08:00 |
|
钱涛
|
21035c30f4
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2026-01-07 15:10:09 +08:00 |
|
钱涛
|
bd4e0b14e8
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2026-01-07 15:07:50 +08:00 |
|
钱涛
|
eb35dddfbd
|
修复查询问题
|
2026-01-07 15:07:11 +08:00 |
|
钱涛
|
0ba4c40f45
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-12-19 13:31:04 +08:00 |
 dxfeng
|
0cea01300d
|
社保福利台账 导出功能增加筛选条件，工号、部门、分部
|
2025-12-17 10:05:29 +08:00 |
|
钱涛
|
2bd092ae11
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-07-11 17:19:10 +08:00 |
|
钱涛
|
ed5f6da8a6
|
缴款需要按照分类分别缴纳
|
2025-07-11 17:18:15 +08:00 |
|
钱涛
|
d6061fa059
|
申报
|
2025-07-02 20:43:53 +08:00 |
|
钱涛
|
2a883868ba
|
Merge branch 'release/个税版本' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
|
2025-07-02 20:08:08 +08:00 |
|
钱涛
|
fe7481d753
|
核算精准使用附表
|
2025-07-02 20:02:05 +08:00 |
|
钱涛
|
cabaed627b
|
其他附加扣除增加申报类型
|
2025-07-02 13:42:41 +08:00 |
|
钱涛
|
cb02136ff6
|
免税收入
|
2025-07-01 18:37:50 +08:00 |
|
钱涛
|
5f3c5f82b8
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-06-18 13:33:24 +08:00 |
|
钱涛
|
c27105aa21
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-06-18 13:33:02 +08:00 |
|
钱涛
|
a8c6e8e59e
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-06-18 13:32:41 +08:00 |
|
钱涛
|
de5caded9e
|
修复工资单性别问题
|
2025-06-18 13:32:12 +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 |
|
钱涛
|
cca13614e3
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-04-14 15:46:04 +08:00 |
Harryxzy
|
0bcafd3934
|
修复个税申报 不同税款所属期校验bug
|
2025-04-09 17:20:48 +08:00 |
|
钱涛
|
be8ede54df
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-04-09 14:25:43 +08:00 |
|
钱涛
|
c04dad0c4d
|
修改字段名
|
2025-04-09 14:23:38 +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 |
|
钱涛
|
f4c025e078
|
数据推送
|
2025-04-07 09:19:47 +08:00 |
|
钱涛
|
d4f45d5eb3
|
扩展排序字段
|
2025-04-03 10:49:10 +08:00 |
|
钱涛
|
0a78f17230
|
记录推送耗时
|
2025-04-02 17:05:04 +08:00 |
|
钱涛
|
ba650b9fe6
|
推送记录状态变更；
推送明细状态变更；
|
2025-04-02 14:59:32 +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 |
|
钱涛
|
c0ef81258b
|
Merge branch 'release/个税版本' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/service/OtherDeductionService.java
|
2025-03-26 15:45:20 +08:00 |
|
钱涛
|
47dbfeb8db
|
确认名单反馈
|
2025-03-19 15:26:06 +08:00 |
|
钱涛
|
a119e7c7cd
|
扣除确认接口
|
2025-03-12 13:55:59 +08:00 |
|
Harryxzy
|
7da3e9262a
|
社保福利台账增减人员
|
2025-03-10 16:08:12 +08:00 |
|
钱涛
|
894b9cd1fc
|
1、扣除名单查询
2、扣除名单确认
|
2025-03-10 15:31:33 +08:00 |
|
Harryxzy
|
671e2dd2da
|
其他免税扣除导入bug
|
2025-03-05 15:06:01 +08:00 |
|
Harryxzy
|
ef28618db4
|
社保福利台账增减人员
|
2025-03-04 16:48:00 +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 |
|
钱涛
|
73185785ed
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-02-12 13:31:19 +08:00 |
|
钱涛
|
9adafca446
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationSaveParam.java
# src/com/engine/salary/maintainer/datacollection/AddUpSituationManager.java
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
# src/com/engine/salary/wrapper/SalaryCommonWrapper.java
|
2025-02-08 15:50:39 +08:00 |