 钱涛
|
d1abbad832
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-11-28 17:48:21 +08:00 |
|
钱涛
|
00fc87ffd8
|
修复生成年终奖申报表null
|
2025-11-28 15:41:42 +08:00 |
|
钱涛
|
fd75e9fe54
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
# Conflicts:
# src/com/engine/salary/service/SIAccountService.java
|
2025-09-16 10:57:48 +08:00 |
|
钱涛
|
2767114bfb
|
社保台账：
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
薪资核算：
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
工资单：
1、批量发放
2、批量撤回
申报表：
1、批量申报
|
2025-09-16 10:07:15 +08:00 |
|
钱涛
|
99f6c43f25
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
|
2025-04-24 16:04:13 +08:00 |
|
钱涛
|
22f494fe12
|
修复按照扣缴义务人名称检索
|
2025-04-24 16:02:34 +08:00 |
|
钱涛
|
2fe958f5db
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
|
2025-04-23 17:42:08 +08:00 |
|
钱涛
|
7a7030a91c
|
申报表税款所属期检索和申报
|
2025-04-23 17:39:30 +08:00 |
|
钱涛
|
f2b71b1c38
|
Merge branch 'release/2.19.1.2501.01' into feature/数据推送
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
|
2025-02-08 09:59:44 +08:00 |
|
钱涛
|
5916cd63ef
|
支持根据税款所属期进行申报
|
2025-02-07 16:58:58 +08:00 |
|
钱涛
|
17afe87356
|
申报表权限规则
|
2024-09-05 18:14:02 +08:00 |
|
钱涛
|
5ccee97429
|
新建账套携带各扣缴义务人人员范围
|
2024-09-04 13:59:00 +08:00 |
|
钱涛
|
729c6c7d3a
|
处理空指针
|
2024-03-07 14:12:16 +08:00 |
|
钱涛
|
6fc8d8fdee
|
去除达梦驱动
|
2024-01-25 11:38:38 +08:00 |
|
钱涛
|
7e22711dcd
|
导入工具
|
2023-12-28 15:47:05 +08:00 |
Harryxzy
|
c37750b538
|
撤回个税申报
|
2023-06-12 10:40:01 +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 |
|
钱涛
|
58dbdb0d05
|
养老金
|
2023-04-12 09:39:53 +08:00 |
|
钱涛
|
a4a829d201
|
年终奖数据
|
2023-04-11 17:24:31 +08:00 |
sy
|
add7051759
|
薪酬系统, 适配金仓-个税申报单逻辑优化、薪资部分发放逻辑优化、删除initserviceimpl文件
|
2023-04-04 16:28:15 +08:00 |
|
钱涛
|
ff4dfe4dad
|
fix日期转换，申报表所属月不显示
|
2023-03-08 17:53:13 +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 |
|
钱涛
|
6e726366ad
|
排序
|
2022-09-26 18:51:17 +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 |
|
钱涛
|
b42586600a
|
fix申报表
|
2022-06-15 12:03:17 +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 |
|
钱涛
|
cedc9f2644
|
考勤和申报表的分权
|
2022-06-07 15:43:22 +08:00 |
MustangDeng
|
bfcb9a78f8
|
bug修改
|
2022-06-06 21:21:10 +08:00 |
|
钱涛
|
6646a2e481
|
申报表的分权
|
2022-06-02 18:02:27 +08:00 |
|
钱涛
|
3f958d2886
|
暂存
|
2022-05-31 18:27:33 +08:00 |
|
钱涛
|
6f3d8e85c0
|
个税申报bug
|
2022-05-09 17:47:19 +08:00 |
|
钱涛
|
11190ee37d
|
区时+8
|
2022-04-24 17:42:32 +08:00 |
18895359881@163.com
|
d15cccca8d
|
申报表生成
|
2022-04-20 21:36:27 +08:00 |