Commit Graph

62 Commits

Author SHA1 Message Date
钱涛 d096597a0a 申报添加附表 2024-12-26 18:56:33 +08:00
钱涛 39c536c7b4 申报功能 2024-12-26 15:16:24 +08:00
钱涛 2e4c3ddaff 删除接口 2024-12-25 10:36:37 +08:00
钱涛 9c99e53288 列表和保存接口 2024-12-24 15:52:36 +08:00
钱涛 412d3488d1 减免税额列表和保存接口 2024-12-24 10:54:57 +08:00
钱涛 cf253ecfb0 个人养老金附表 2024-12-23 16:41:42 +08:00
钱涛 4a9a001311 几个附表列表 2024-12-19 09:53:56 +08:00
钱涛 d14ac4bda3 免税收入附表 2024-12-17 14:05:05 +08:00
钱涛 47329fbcb9 累计专项附加扣除在线获取 2024-10-18 14:58:10 +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
Harryxzy 656236367a Merge branch 'release/2.15.1.2407.01' into release/个税版本
# Conflicts:
#	src/com/engine/salary/util/excel/ExcelUtilPlus.java
2024-08-16 15:42:50 +08:00
钱涛 e2b2b9071f Merge remote-tracking branch 'origin/feature/240801-浮动薪资' into feature/240801-浮动薪资 2024-08-16 14:04:31 +08:00
钱涛 659560550a Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资 2024-08-16 13:18:08 +08:00
Harryxzy 2ee605df44 浮动薪酬优化 2024-08-15 13:56:41 +08:00
Harryxzy 5055a4801a 浮动薪酬增加义务人 2024-08-12 16:36:27 +08:00
Harryxzy 75fb15928a 浮动薪酬 2024-08-09 10:21:40 +08:00
Harryxzy dd18cf5191 考勤引用多个账套 2024-08-06 16:54:19 +08:00
钱涛 ec27cf5a08 Merge branch 'release/2.13.1.2404.02' into release/个税版本
# Conflicts:
#	src/com/engine/salary/service/AddUpDeductionService.java
#	src/com/engine/salary/wrapper/AddUpDeductionWrapper.java
2024-05-08 11:17:40 +08:00
Harryxzy 4b474f864f 累计专项附加扣除一键累计,能根据义务人进行累计 2024-04-30 14:43:37 +08:00
钱涛 3a79ed9574 Merge branch 'release/2.11.2.2403.01' into release/个税版本
# Conflicts:
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
2024-03-15 15:44:15 +08:00
钱涛 29e81e03c2 优化公式不显示未启用的考勤字段 2024-03-14 16:08:16 +08:00
钱涛 417c9f703d 下载模板时带出数据 2024-03-14 15:28:14 +08:00
钱涛 83e0b1668e 往期累计 2023-09-07 18:21:22 +08:00
钱涛 9867728d2e 在线获取累计专项附加扣除 2023-09-04 16:18:02 +08:00
钱涛 c0c29b7472 在线获取累计专项附加扣除 2023-09-04 09:29:00 +08:00
钱涛 7c5e373b01 2 2023-09-01 09:23:43 +08:00
钱涛 a4a829d201 年终奖数据 2023-04-11 17:24:31 +08:00
钱涛 44fe9203ab 个人养老金 2023-04-04 14:21:25 +08:00
fcli 5743fa2162 feat: 其他附加扣除沿用上月功能完成 2022-11-17 14:28:10 +08:00
fcli bf75c3831f fix: 一键累计添加日期 2022-11-09 15:39:00 +08:00
fcli 9b77bf7139 feat: 专项附加扣除模块, 一键清空、分页bug等 2022-11-09 10:40:38 +08:00
fcli 92a6512dc8 feat: 专项附加扣除模块,去除月份,添加普通用户登录查看本人记录功能 2022-11-09 10:40:28 +08:00
fcli fafc157e63 feat: 专项附加扣除模块 2022-11-09 10:40:19 +08:00
Harryxzy 5d97954e48 往期累计情况一键清空和删除所选 2022-10-31 19:21:13 +08:00
Harryxzy e8ac395300 fix-专项附加扣除taxAgentId为空 2022-10-31 16:04:06 +08:00
Harryxzy e046b7e3fe fix 一键清空 2022-10-28 16:35:51 +08:00
Harryxzy 09d85bdab3 考勤引用=编辑 2022-10-28 16:15:51 +08:00
Harryxzy 1f29ac67eb 累计、其他免税、往期 新增、删除、一键清空、编辑功能 2022-10-28 14:08:27 +08:00
Harryxzy a406eed4b9 累计专项附加扣除-新增、删除所选、一键清空功能 2022-10-27 13:59:11 +08:00
Harryxzy c0bb94bf71 editDataCollection-2 2022-10-26 18:35:23 +08:00
钱涛 abdd87a005 fix 2022-06-24 18:05:08 +08:00
钱涛 b8972bcd43 分权v3 2022-06-09 17:45:28 +08:00
钱涛 cedc9f2644 考勤和申报表的分权 2022-06-07 15:43:22 +08:00
钱涛 be88b90f56 核算的分权 2022-06-02 17:10:54 +08:00
钱涛 8b14038b90 分权 2022-05-31 09:58:35 +08:00
钱涛 ad991954cd 暂存 2022-05-27 11:49:23 +08:00
钱涛 f6eb69e62a 暂存 2022-05-26 11:02:55 +08:00
钱涛 bf364a7639 暂存 2022-05-24 15:20:12 +08:00
钱涛 12efa69503 同步考勤字段值 2022-04-25 15:51:35 +08:00
钱涛 6b76829b39 考勤接口 2022-04-22 15:46:03 +08:00