Commit Graph

53 Commits

Author SHA1 Message Date
钱涛 2a692b13b4 外籍人员v1 2024-03-29 10:44:55 +08:00
钱涛 72861b9a93 Merge branch 'release/3.0.0.2403.01' into release/个税版本 2024-03-07 16:57:03 +08:00
钱涛 729c6c7d3a 处理空指针 2024-03-07 14:12:16 +08:00
Harryxzy bcfcd1de9a 个税申报-在线对比显示列定制 2024-03-01 13:52:27 +08:00
钱涛 079b7de258 合并240101 2024-02-21 15:35:08 +08:00
钱涛 53806d9262 Merge branch 'release/2.10.1.2401.01' into release/个税版本
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
#	src/com/engine/salary/util/excel/ExcelUtil.java
2024-02-21 15:28:33 +08:00
钱涛 6fc8d8fdee 去除达梦驱动 2024-01-25 11:38:38 +08:00
钱涛 2670236f9c 暂存 2024-01-08 09:52:04 +08:00
钱涛 13f310e9e4 记录申报表数据来源 2023-12-27 17:33:53 +08:00
钱涛 c581c8d74d 导出申报表明细 2023-12-20 17:21:46 +08:00
钱涛 d9c952e80c 申报表明细新增、编辑 2023-12-14 17:55:48 +08:00
钱涛 328158204d 个税调差累计字段对应 2023-10-23 10:03:04 +08:00
钱涛 665dc7b36a fix重新核算bug 2023-10-11 19:55:09 +08:00
钱涛 83e0b1668e 往期累计 2023-09-07 18:21:22 +08:00
钱涛 02100c2ee3 有向无环拓扑排序 2023-09-07 15:15:59 +08:00
钱涛 9e416123dd 账套薪资项目添加code 2023-08-23 16:49:45 +08:00
钱涛 bb2d2d64e6 在线申报接口 2023-08-21 19:35:14 +08:00
钱涛 2f59f8283a 人员报送接口 2023-08-20 14:03:43 +08:00
钱涛 0d8606c956 在线申报接口 2023-08-17 19:04:20 +08:00
钱涛 b1817142b0 个税对接,个税申报接口 2023-08-14 20:07:29 +08:00
钱涛 dc63897165 个税对接,个税申报接口 2023-08-11 14:20:14 +08:00
钱涛 38f3461c64 v1 2023-07-20 14:05:19 +08:00
钱涛 e75d5ab427 v1 2023-07-20 10:36:29 +08:00
钱涛 77ce806b37 sysadmin不显示申报记录 2023-04-25 10:43:40 +08:00
钱涛 a87c344581 个人养老金 2023-04-13 17:14:58 +08:00
钱涛 59a38954bc Merge branch 'feature/个人养老金' into release/2.7.3.2304.01
# Conflicts:
#	src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java
2023-04-13 09:35:29 +08:00
钱涛 a4a829d201 年终奖数据 2023-04-11 17:24:31 +08:00
sy add7051759 薪酬系统, 适配金仓-个税申报单逻辑优化、薪资部分发放逻辑优化、删除initserviceimpl文件 2023-04-04 16:28:15 +08:00
钱涛 0f9222e1e4 fix年终奖申报备注为0 2023-02-09 19:03:53 +08:00
钱涛 f76ac415ba 修复年终奖备注字符不对应 2023-02-01 10:05:02 +08:00
钱涛 9bedcf6d38 年终奖 2023-01-31 14:15:27 +08:00
钱涛 857c39bd2d 年终奖 2023-01-30 17:32:58 +08:00
钱涛 d881b63327 年终奖 2023-01-29 14:58:51 +08:00
fcli d3de862d11 feat: 加密统一,薪资项目&社保档案详情... 2022-12-13 17:14:27 +08:00
钱涛 a13d56063b fix累计已预扣预缴税额,带入个税调差 2022-08-29 16:06:56 +08:00
钱涛 e0a031e197 oracle异常 2022-08-18 15:02:04 +08:00
钱涛 ab87e5cf08 劳务申报表列表 2022-08-02 10:59:12 +08:00
钱涛 cfe2d3c1dc fix申报表 2022-06-15 11:02:44 +08:00
钱涛 7955d67da6 fix申报表 2022-06-15 10:24:46 +08:00
钱涛 1aee6f7ef0 往期累计 2022-06-10 18:16:11 +08:00
钱涛 33914eae1d 解密 2022-06-10 18:07:25 +08:00
钱涛 e83714ba4f Merge branch 'feature/encrypt' into release
# Conflicts:
#	src/com/engine/salary/biz/AddUpSituationBiz.java
#	src/com/engine/salary/biz/SIArchivesBiz.java
#	src/com/engine/salary/cmd/datacollection/OtherDeductionGetDetailListCmd.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java
#	src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java
#	src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java
#	src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.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/SISchemeServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
#	src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
#	src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
2022-06-10 15:26:43 +08:00
钱涛 ec3838a292 申报表 2022-06-10 13:33:48 +08:00
钱涛 382620c589 申报表 2022-06-09 19:02:18 +08:00
钱涛 61346f139b 申报和往期异常 2022-06-08 17:59:30 +08:00
钱涛 860c89b560 申报和往期异常 2022-06-08 16:36:50 +08:00
MustangDeng bfcb9a78f8 bug修改 2022-06-06 21:21:10 +08:00
钱涛 3f958d2886 暂存 2022-05-31 18:27:33 +08:00
钱涛 6f3d8e85c0 个税申报bug 2022-05-09 17:47:19 +08:00
18895359881@163.com d15cccca8d 申报表生成 2022-04-20 21:36:27 +08:00