Commit Graph

17 Commits

Author SHA1 Message Date
钱涛 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
钱涛 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
钱涛 18bd6509db 导入功能 2024-12-25 16:28:21 +08:00
钱涛 cf253ecfb0 个人养老金附表 2024-12-23 16:41:42 +08:00
钱涛 fe8910f2c5 减免税额附表 2024-12-19 10:46:04 +08:00
钱涛 4a9a001311 几个附表列表 2024-12-19 09:53:56 +08:00
钱涛 d14ac4bda3 免税收入附表 2024-12-17 14:05:05 +08:00
钱涛 8c83e8ed6c 新增免税收入、商业健康保险、税延养老保险、准予扣除的捐赠额、减免税额、其他附表 2024-12-16 17:48:03 +08:00
钱涛 619af1a76a 其他免税扣除模块 2024-09-20 16:45:35 +08:00
钱涛 836947725f 切换了elog位置 2024-03-12 14:34:44 +08:00
Harryxzy dee20149bb 日志 2024-02-21 18:19:02 +08:00
钱涛 44fe9203ab 个人养老金 2023-04-04 14:21:25 +08:00
fcli d3de862d11 feat: 加密统一,薪资项目&社保档案详情... 2022-12-13 17:14:27 +08:00
钱涛 cd8df85e54 公式字段 2022-04-21 20:29:11 +08:00
钱涛 36d65de007 fix 2022-04-21 14:15:56 +08:00
钱涛 98c49db986 其他扣除项接口 2022-03-10 17:57:46 +08:00