Harryxzy
|
dd53bd861c
|
联特调整
|
2025-07-21 16:13:59 +08:00 |
|
Harryxzy
|
61af1d5c09
|
联特个税项目，默认只能从税局取，不合并计税
|
2025-07-17 17:18:37 +08:00 |
 钱涛
|
56e19ea9da
|
Merge branch 'release/个税&业务线' into custom/联特
# Conflicts:
# resource/WEB-INF/prop/hrmSalary.properties
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
|
2025-07-02 20:45:41 +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 |
|
Harryxzy
|
2bd545964a
|
联特 季度绩效分段计算
|
2025-04-28 10:14:11 +08:00 |
|
钱涛
|
70eb836906
|
Merge branch 'release/个税&业务线' into custom/联特
# Conflicts:
# src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java
|
2025-03-27 17:28:55 +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 |
|
Harryxzy
|
4776645a3d
|
联特 分段计算
|
2025-03-05 17:38:31 +08:00 |
|
钱涛
|
291cd426fe
|
公式变量支持获取上月数据
|
2025-02-17 15:54:35 +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 |
|
钱涛
|
f3994f852d
|
修复业务核算不了社保
|
2025-02-05 14:38:53 +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 |
|
钱涛
|
af7d51ac79
|
Merge branch 'release/2.16.1.2410.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
# src/com/engine/salary/web/SalaryCommonController.java
# src/com/engine/salary/wrapper/SalaryCommonWrapper.java
|
2024-11-12 18:01:22 +08:00 |
|
钱涛
|
7e235e112a
|
处理核算结果null插入问题
|
2024-11-08 16:20:30 +08:00 |
|
Harryxzy
|
15fe5044e8
|
修复先加锁 再核算时报错
|
2024-11-07 15:19:11 +08:00 |
|
钱涛
|
5271d2516a
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
# Conflicts:
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
|
2024-10-22 09:27:11 +08:00 |
|
钱涛
|
517d1e8d0b
|
Merge branch 'release/2.16.1.2410.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
|
2024-10-18 11:08:18 +08:00 |
|
钱涛
|
be2d6b693a
|
单元格锁定
|
2024-10-17 18:27:37 +08:00 |
|
钱涛
|
5d8cfbd169
|
Merge branch 'release/2.15.2.2409.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
|
2024-09-29 15:08:38 +08:00 |
|
钱涛
|
7584404bc1
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-20 10:27:42 +08:00 |
|
钱涛
|
91863b901f
|
增加核算日志
|
2024-09-19 14:17:47 +08:00 |
|
钱涛
|
a48d4cea11
|
浮动数据
|
2024-09-14 09:36:52 +08:00 |
|
钱涛
|
96ced6e934
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-13 17:32:58 +08:00 |
|
钱涛
|
ecfa6a4604
|
跨扣缴义务人核算
|
2024-09-02 17:36:41 +08:00 |
|
Harryxzy
|
5055a4801a
|
浮动薪酬增加义务人
|
2024-08-12 16:36:27 +08:00 |
|
Harryxzy
|
75fb15928a
|
浮动薪酬
|
2024-08-09 10:21:40 +08:00 |
|
钱涛
|
7db62ab647
|
Merge branch 'release/2.14.5.2406.03' into release/个税版本
# Conflicts:
# src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
|
2024-07-10 17:05:06 +08:00 |
|
钱涛
|
3f723d7750
|
记录日志
|
2024-07-02 19:13:14 +08:00 |
|
钱涛
|
39a2684196
|
升级缴款凭证作废接口
升级完税证明接口
|
2024-07-02 15:39:31 +08:00 |
|
钱涛
|
edddf5f557
|
处理8位小数问题
|
2024-06-28 14:42:23 +08:00 |
|
钱涛
|
02be1b9da4
|
Merge branch 'release/2.14.4.2406.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
# src/com/engine/salary/util/excel/ExcelUtil.java
|
2024-06-21 10:53:59 +08:00 |
|
钱涛
|
fe8dcd0ccd
|
核算默认值
|
2024-06-19 11:21:00 +08:00 |
|
钱涛
|
572b114f28
|
Merge branch 'release/2.14.3.2406.01' into release/个税版本2.14.3.2406.01
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
|
2024-06-03 11:18:01 +08:00 |
|
钱涛
|
2c79afa65e
|
锁定人员
|
2024-05-28 17:29:18 +08:00 |
|
钱涛
|
3dc8f6d57c
|
Merge branch 'release/2.14.1.2405.01' into release/个税版本
|
2024-05-20 09:56:12 +08:00 |
|
钱涛
|
c146537684
|
修改计时说明
|
2024-05-16 15:56:49 +08:00 |
|
钱涛
|
26bbc9c0ee
|
Merge branch 'release/2.9.6.2310.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
|
2023-10-08 14:21:25 +08:00 |
|
钱涛
|
a7e8498b98
|
取消核算报表数据
|
2023-09-26 17:18:27 +08:00 |
|
钱涛
|
f99bb21bab
|
修复核算效率
|
2023-09-26 14:29:12 +08:00 |
|
钱涛
|
02100c2ee3
|
有向无环拓扑排序
|
2023-09-07 15:15:59 +08:00 |
|
钱涛
|
283485929f
|
超时提醒
|
2023-08-31 15:31:34 +08:00 |
|
Harryxzy
|
da18b0f884
|
薪资账套项目页面改造temp
|
2023-07-25 16:46:57 +08:00 |
|
钱涛
|
aec6918c12
|
Merge branch 'release/2.9.1.2307.01' into feature/外部人员
# Conflicts:
# src/com/engine/salary/biz/EmployBiz.java
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/entity/salaryBill/dto/SalarySendDetailListDTO.java
# src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
# src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java
# src/com/engine/salary/service/SalaryEmployeeService.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/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java
# src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
# src/com/engine/salary/wrapper/SalarySendWrapper.java
# src/com/engine/salary/wrapper/TaxAgentSubAdminWrapper.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2023-07-11 16:08:15 +08:00 |
|
钱涛
|
82ab6c1e11
|
非系统算税功能
|
2023-07-04 09:32:12 +08:00 |
|
钱涛
|
993db67601
|
公共进度条功能
|
2023-06-06 10:30:49 +08:00 |
|
钱涛
|
74c4305b9d
|
优化核算异常提示
|
2023-05-23 15:15:55 +08:00 |
|
钱涛
|
ff8dcf1769
|
核算异常信息
|
2023-05-17 17:38:12 +08:00 |
|
钱涛
|
a7cc99fdd3
|
公式异常信息
|
2023-05-16 18:01:38 +08:00 |
|
钱涛
|
d51c89bb82
|
公式方法改造
|
2023-05-15 09:28:22 +08:00 |