Commit Graph

3394 Commits

Author SHA1 Message Date
Harryxzy 8be3ababa9 汇通调整 2025-10-15 17:52:16 +08:00
Harryxzy 422681e448 汇通调整 2025-09-24 16:33:13 +08:00
Harryxzy c746ab8a40 汇通调整 2025-09-03 18:08:49 +08:00
Harryxzy e199408ec8 汇通修复 2025-08-14 11:03:54 +08:00
Harryxzy cf03a36835 汇通批量核算调整 2025-07-16 14:19:37 +08:00
Harryxzy d24f9bf0a6 汇通二期 2025-07-14 11:17:48 +08:00
Harryxzy 684d5bc9a8 Merge branch 'release/2.19.1.2501.01' into custom/汇通建设集团 2025-07-14 09:40:06 +08:00
Harryxzy fb239f34ed 修复薪资核算筛选为空时导出报错 2025-07-09 10:08:27 +08:00
钱涛 8168a42b61 日志 2025-07-07 10:20:53 +08:00
Harryxzy d2663fe4ca 汇通批量核算改为同步 2025-06-20 09:55:30 +08:00
Harryxzy bfd953d082 水印单独配置分部不显示 2025-06-19 17:28:09 +08:00
Harryxzy e402029f6c Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01 2025-06-19 11:38:40 +08:00
Harryxzy 63c9558331 修复社保上下限校验 漏掉只开启了公司没开启个人的场景 2025-06-19 11:38:05 +08:00
钱涛 f7cba636b3 修复默认值保留位数 2025-06-18 17:21:22 +08:00
Harryxzy cf3d070892 汇通bug修复 2025-06-18 16:56:16 +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
Harryxzy c4fdf0f34e Merge branch 'release/2.19.1.2501.01' into custom/汇通建设集团 2025-06-16 16:42:46 +08:00
Harryxzy c2f2390013 修复薪资明细导出,合计行统计文本字段 2025-06-16 16:41:38 +08:00
钱涛 1e2d464703 按照人员ID进行社保抓取 2025-06-10 16:20:37 +08:00
钱涛 21b83eb092 Merge branch 'feature/批量操作' into custom/汇通建设集团
# Conflicts:
#	src/com/engine/salary/service/SIAccountService.java
#	src/com/engine/salary/service/impl/SIAccountServiceImpl.java
2025-06-10 15:53:26 +08:00
Harryxzy 0bd518f6e7 批量核算 2025-06-10 10:59:25 +08:00
Harryxzy 5c2ede9736 sql 2025-06-10 10:52:24 +08:00
Harryxzy d8d46cd932 薪资核算记录 批量新建并核算 2025-06-09 10:42:23 +08:00
钱涛 e9e3483c8b 修复社保批量核算 2025-06-04 15:05:44 +08:00
钱涛 9e6ab0c155 社保台账:
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
薪资核算:
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
工资单:
1、批量发放
2、批量撤回
申报表:
1、批量申报
2025-06-04 13:23:29 +08:00
钱涛 4755d51d2d 社保台账:
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
薪资核算:
1、批量新建核算记录并核算。
2、批量归档
3、批量重新核算
工资单:
1、批量发放
2、批量撤回
申报表:
1、批量申报
2025-06-03 14:30:46 +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
Harryxzy f49b2bf95b Merge branch 'release/2.19.1.2501.01' into custom/汇通建设集团
# Conflicts:
#	src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
2025-05-23 14:12:55 +08:00
钱涛 81e87ec9ce 优化,导出时过滤空字符串 2025-05-20 16:44:46 +08:00
Harryxzy 05e92add4a 修复明细导出 2025-05-13 16:07:46 +08:00
钱涛 7de3dca2a3 撤回的工资单不允许查看 2025-05-13 13:14:30 +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
钱涛 22f494fe12 修复按照扣缴义务人名称检索 2025-04-24 16:02:34 +08:00
钱涛 7a7030a91c 申报表税款所属期检索和申报 2025-04-23 17:39:30 +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
钱涛 eea9093cfd Merge branch 'release/2.17.1.2411.01' into release/2.19.1.2501.01 2025-03-24 15:03:09 +08:00
钱涛 b128f219f7 处理敏感信息泄露 2025-03-24 14:57:00 +08:00