Commit Graph

3752 Commits

Author SHA1 Message Date
钱涛 fe7481d753 核算精准使用附表 2025-07-02 20:02:05 +08:00
钱涛 b2507306e5 附表导入导出功能 2025-07-02 15:46:32 +08:00
钱涛 cabaed627b 其他附加扣除增加申报类型 2025-07-02 13:42:41 +08:00
钱涛 de713c820d 附表填写 2025-07-02 11:37:16 +08:00
钱涛 cb02136ff6 免税收入 2025-07-01 18:37:50 +08:00
钱涛 f5b1768438 利息股息红利所得sql 2025-06-19 10:49:29 +08:00
钱涛 c7e295e1d2 Merge branch 'release/2.19.1.2501.01' into release/个税版本 2025-06-18 17:21:51 +08:00
钱涛 f7cba636b3 修复默认值保留位数 2025-06-18 17:21:22 +08:00
钱涛 c27105aa21 Merge branch 'release/2.19.1.2501.01' into release/个税版本 2025-06-18 13:33:02 +08:00
钱涛 919ade5715 Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01 2025-06-18 13:32:17 +08:00
钱涛 de5caded9e 修复工资单性别问题 2025-06-18 13:32:12 +08:00
钱涛 c3d6ac8b66 分类所得-上市公司股息红利所得(沪市、深市、创业板)
分类所得-其他利息股息红利所得
2025-06-17 17:25:27 +08:00
钱涛 d4ff9af8b7 分类所得-上市公司股息红利所得(沪市、深市、创业板)
分类所得-其他利息股息红利所得
2025-06-17 11:23:30 +08:00
Harryxzy c2f2390013 修复薪资明细导出,合计行统计文本字段 2025-06-16 16:41:38 +08:00
Harryxzy 447d682b4e Merge branch 'release/2.19.1.2501.01' into release/个税版本 2025-06-13 09:32:11 +08:00
钱涛 adbdb64b4c 补偿金自动生成免税附表 2025-06-06 11:07:33 +08:00
钱涛 9af6178636 对“是否雇员”字段为“其他”时的场景做了调整。新增了一个字段 ”其他情况说明“ 2025-06-06 10:27:16 +08:00
Harryxzy aff5dbf185 Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01 2025-05-29 10:39:32 +08:00
Harryxzy 578842aa39 修复数据穿透过滤条件 2025-05-29 10:39:06 +08:00
钱涛 1026ff1aae fix邮件中数据为null 2025-05-27 15:56:33 +08:00
钱涛 d9982d2508 fix邮件中数据为null 2025-05-27 10:46:11 +08:00
钱涛 93dc70de26 fix邮件中数据为null 2025-05-26 10:36:38 +08:00
钱涛 c6633005aa 个税版本取消系统算税 2025-05-21 11:37:25 +08:00
钱涛 9c06f080c5 Merge branch 'release/2.19.1.2501.01' into release/个税版本
# Conflicts:
#	src/com/engine/salary/util/excel/ExcelUtilPlus.java
2025-05-20 16:47:54 +08:00
钱涛 81e87ec9ce 优化,导出时过滤空字符串 2025-05-20 16:44:46 +08:00
钱涛 4a2821d793 离职日期允许导入清空 2025-05-15 14:08:12 +08:00
Harryxzy 05e92add4a 修复明细导出 2025-05-13 16:07:46 +08:00
钱涛 7de3dca2a3 撤回的工资单不允许查看 2025-05-13 13:14:30 +08:00
钱涛 48712d7d37 打印人员报送反馈 2025-05-12 15:24:21 +08:00
钱涛 24e7cbb32e 处理申报人次 2025-05-09 19:46:32 +08:00
钱涛 f6428be044 Merge branch 'release/2.19.1.2501.01' into release/个税版本 2025-05-09 16:23:53 +08:00
钱涛 8c4fbf7919 拼接错误信息 2025-05-09 11:45:06 +08:00
钱涛 ca75a5f403 fix导出明细 2025-04-29 16:57:33 +08:00
钱涛 bc8e80b4e6 增加SUBSTR拦截处理 2025-04-28 18:14:17 +08:00
Harryxzy 25c8479d53 修复社保福利台账线下对比和核算人数不匹配问题 2025-04-24 17:48:54 +08:00
钱涛 ee3fd8da8e 修复按照扣缴义务人名称检索 2025-04-24 16:19:23 +08:00
钱涛 9b9b47de88 Merge branch 'release/2.19.1.2501.01' into release/个税版本 2025-04-24 16:08:39 +08:00
钱涛 22f494fe12 修复按照扣缴义务人名称检索 2025-04-24 16:02:34 +08:00
钱涛 0bdc48f1c2 修复归档后查看拓扑图 2025-04-24 11:03:13 +08:00
钱涛 ac2143080f Merge branch 'release/2.19.1.2501.01' into release/个税版本
# Conflicts:
#	src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java
#	src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
#	src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
#	src/com/engine/salary/web/TaxDeclarationController.java
2025-04-23 18:10:26 +08:00
钱涛 7a7030a91c 申报表税款所属期检索和申报 2025-04-23 17:39:30 +08:00
钱涛 6532bfdd07 拓扑图显示非薪资项目数据 2025-04-22 15:33:28 +08:00
钱涛 6b90c8c45c Merge branch 'release/2.19.1.2501.01' into release/个税版本 2025-04-21 15:50:00 +08:00
钱涛 552cee8a6f 修复合并计税问题 2025-04-21 15:49:28 +08:00
钱涛 0e93cbab04 t 2025-04-21 10:37:44 +08:00
钱涛 d01c9bf06f 增加扣缴义务人搜索核算列表 2025-04-17 11:06:02 +08:00
钱涛 da6364a511 Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01 2025-04-16 14:06:53 +08:00
钱涛 37445cdd58 fix部分发放 2025-04-16 14:06:46 +08:00
Harryxzy 99a0c3facc 2100bug修复 2025-04-16 13:26:36 +08:00
钱涛 b0fb2b3866 部分发放 2025-04-15 17:49:38 +08:00