Harryxzy
|
e2ac113378
|
fix 个税申报报错
|
2025-03-13 17:20:05 +08:00 |
|
Harryxzy
|
d0ec44c7b1
|
Merge branch 'feature/250301_社保福利台账增减人员' into release/3.0.1.2503.01
|
2025-03-13 16:59:11 +08:00 |
 钱涛
|
ccb0dcd8d5
|
修复数值类型判断
|
2025-03-13 16:02:00 +08:00 |
|
钱涛
|
9c3bb5f956
|
处理未开启分权的情况
|
2025-03-13 10:06:23 +08:00 |
|
Harryxzy
|
3fb29b2c3d
|
停薪action 增加日志
|
2025-03-12 18:21:04 +08:00 |
|
钱涛
|
a119e7c7cd
|
扣除确认接口
|
2025-03-12 13:55:59 +08:00 |
|
Harryxzy
|
25723af00a
|
社保福利台账增减人员
|
2025-03-11 15:18:05 +08:00 |
|
钱涛
|
12bbfeceae
|
增加扣除名单
|
2025-03-11 11:15:08 +08:00 |
|
钱涛
|
0eb2b140e9
|
修改申报反馈数据请求体
|
2025-03-10 17:46:40 +08:00 |
|
Harryxzy
|
5b66efa3cc
|
社保福利台账增减人员
|
2025-03-10 16:47:48 +08:00 |
|
Harryxzy
|
7da3e9262a
|
社保福利台账增减人员
|
2025-03-10 16:08:12 +08:00 |
|
钱涛
|
894b9cd1fc
|
1、扣除名单查询
2、扣除名单确认
|
2025-03-10 15:31:33 +08:00 |
|
钱涛
|
521907d6f6
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.0.2502.01
|
2025-03-06 17:38:09 +08:00 |
|
钱涛
|
9cee19397d
|
记录核算具体操作日志
|
2025-03-06 17:35:25 +08:00 |
|
钱涛
|
165a775074
|
刷新账套和扣缴义务人自关联
|
2025-03-05 16:42:13 +08:00 |
|
Harryxzy
|
671e2dd2da
|
其他免税扣除导入bug
|
2025-03-05 15:06:01 +08:00 |
|
Harryxzy
|
3339178ac5
|
钱智 建模带出固定值
|
2025-03-05 09:35:48 +08:00 |
|
Harryxzy
|
ef28618db4
|
社保福利台账增减人员
|
2025-03-04 16:48:00 +08:00 |
|
钱涛
|
cb38a3fa9b
|
浮动薪资权限改进
|
2025-02-27 17:44:23 +08:00 |
|
钱涛
|
7382345dd5
|
修复退差人员添加
|
2025-02-27 15:47:59 +08:00 |
|
钱涛
|
b37610dd13
|
Merge remote-tracking branch 'origin/release/3.0.0.2502.01' into release/3.0.0.2502.01
|
2025-02-27 10:29:21 +08:00 |
|
钱涛
|
1b77352301
|
处理冲突，禁用map
|
2025-02-27 10:29:11 +08:00 |
|
Harryxzy
|
bf57c66fc1
|
修复 定薪超过1000日志报错bug
|
2025-02-26 15:13:39 +08:00 |
|
钱涛
|
93b98ce583
|
版本
|
2025-02-20 10:54:52 +08:00 |
|
钱涛
|
2f9822aeef
|
修复导出社保档案失败问题
|
2025-02-20 10:53:27 +08:00 |
|
钱涛
|
d220833512
|
修复导出非系统人员报表文件失败
|
2025-02-19 16:38:49 +08:00 |
|
钱涛
|
cac3c11fa3
|
处理获取上月数据变量大于1000可能带来的异常
|
2025-02-19 10:07:01 +08:00 |
|
钱涛
|
85eaa6e2a2
|
修复获取上月数据时人员边界值混乱问题
|
2025-02-17 16:34:35 +08:00 |
|
钱涛
|
291cd426fe
|
公式变量支持获取上月数据
|
2025-02-17 15:54:35 +08:00 |
|
Harryxzy
|
35db0c3ea8
|
钱智
|
2025-02-17 11:37:31 +08:00 |
|
钱涛
|
22077f431e
|
权限改造
|
2025-02-17 09:49:01 +08:00 |
|
Harryxzy
|
6cb2b2e677
|
钱智 社保核算需求变更
|
2025-02-14 16:47:20 +08:00 |
|
钱涛
|
05690a81fa
|
替换listAllTaxAgentsAsAdmin方法
|
2025-02-14 15:13:40 +08:00 |
|
钱涛
|
32be67e022
|
替换listAllTaxAgents方法
|
2025-02-14 14:50:54 +08:00 |
|
钱涛
|
3d0aff3f1d
|
薪资档案字段管理业务线分权
|
2025-02-14 14:05:18 +08:00 |
|
Harryxzy
|
27d0f2f452
|
钱智 特殊人员社保福利台账计算
|
2025-02-13 16:15:20 +08:00 |
|
钱涛
|
9c6e7f46b5
|
业务线分权;
|
2025-02-13 15:17:06 +08:00 |
|
钱涛
|
a688ca8b52
|
业务线分权;
调薪记录多语言;
|
2025-02-13 14:23:58 +08:00 |
|
Harryxzy
|
09b358f5b2
|
钱智 特殊人员社保福利台账计算
|
2025-02-13 13:34:22 +08:00 |
|
钱涛
|
c0dbce4786
|
业务线分权
|
2025-02-13 11:27:13 +08:00 |
|
钱涛
|
a8dc1d4010
|
Merge branch 'feature/减免附表' into release/个税版本
|
2025-02-12 15:59:53 +08:00 |
|
钱涛
|
f26d96d56e
|
处理冲突
|
2025-02-12 14:16:17 +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 |
|
钱涛
|
e905bfacf4
|
申报没有线上数据做出提示
|
2025-02-11 15:36:15 +08:00 |
|
Harryxzy
|
9c419f09bf
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-02-11 09:23:15 +08:00 |
|
钱涛
|
b572bd19d0
|
处理获取累计专项附加错误日志记录
|
2025-02-08 17:37:47 +08:00 |
|
钱涛
|
b19e71a5f9
|
处理冲突
|
2025-02-08 15:55:40 +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 |