Commit Graph

2083 Commits

Author SHA1 Message Date
Harryxzy 038b15db0f 万德隆调整 2025-07-23 21:06:17 +08:00
Harryxzy aa5aac7e48 万德隆调整 2025-07-22 17:17:47 +08:00
Harryxzy d3fc58a7e4 万德隆调整 2025-07-17 11:40:42 +08:00
Harryxzy db99e8239b 万德隆 动态薪资标准 2025-07-01 22:02:23 +08:00
Harryxzy f72d76540a Merge branch 'release/3.0.2.2504.01' into custom/万德隆 2025-06-30 14:26:28 +08:00
Harryxzy 3a1417b6a1 万德隆 动态薪资标准 2025-06-30 14:25:55 +08:00
Harryxzy 8399c61020 万德隆 2025-06-30 10:21:58 +08:00
Harryxzy 5cc0dda5f6 修复业务线版本个税申报bug 2025-06-27 13:45:57 +08:00
Harryxzy 5e634b1e79 Merge branch 'release/3.0.2.2504.01' into custom/万德隆 2025-06-25 16:04:28 +08:00
Harryxzy f0f90bce9e Merge branch 'feature/sql采用mybatis执行' into custom/万德隆 2025-06-25 15:28:17 +08:00
Harryxzy d0fdc7de2f 考勤天数=考勤次数/2 2025-06-25 15:26:26 +08:00
Harryxzy 71a3ba4569 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-06-19 11:39:25 +08:00
Harryxzy 63c9558331 修复社保上下限校验 漏掉只开启了公司没开启个人的场景 2025-06-19 11:38:05 +08:00
Harryxzy 5e0b9d2732 万德隆调薪流程支持停薪列表 2025-06-17 11:09:03 +08:00
Harryxzy 3b524dc87b 万德隆工资核算数据月度统计 2025-06-11 17:25:38 +08:00
Harryxzy 84339ab715 定时任务查询超1000bug 2025-06-10 17:35:44 +08:00
Harryxzy 8876d9b491 万德隆 定薪调薪 2025-05-30 15:02:54 +08:00
钱涛 a0f85ea367 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-05-13 13:14:54 +08:00
钱涛 7de3dca2a3 撤回的工资单不允许查看 2025-05-13 13:14:30 +08:00
钱涛 af89a43da7 修复业务线权限 2025-04-30 11:04:18 +08:00
Harryxzy 344571997f Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-04-24 17:50:17 +08:00
Harryxzy 25c8479d53 修复社保福利台账线下对比和核算人数不匹配问题 2025-04-24 17:48:54 +08:00
钱涛 508012c82b 修复数据推送查询问题 2025-04-24 17:35:22 +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
钱涛 491a746c75 申报表税款所属期检索和申报 2025-04-23 17:45:14 +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
钱涛 083f266a85 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-04-17 14:24:23 +08:00
钱涛 6e366bed5a fix账套列表检索问题 2025-04-17 14:20:14 +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
Harryxzy 0bcafd3934 修复个税申报 不同税款所属期校验bug 2025-04-09 17:20:48 +08:00
钱涛 c04dad0c4d 修改字段名 2025-04-09 14:23:38 +08:00
钱涛 c32dab5562 数据撤回功能 2025-04-07 13:50:34 +08:00
钱涛 f4c025e078 数据推送 2025-04-07 09:19:47 +08:00
钱涛 d4f45d5eb3 扩展排序字段 2025-04-03 10:49:10 +08:00
钱涛 0a78f17230 记录推送耗时 2025-04-02 17:05:04 +08:00
钱涛 ba650b9fe6 推送记录状态变更;
推送明细状态变更;
2025-04-02 14:59:32 +08:00
钱涛 0777f99870 创建推送记录接口;
重推接口;
2025-04-01 17:35:29 +08:00
钱涛 3511c18e31 数据推送配置 2025-04-01 15:12:36 +08:00
钱涛 77df0f4c58 Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01 2025-03-24 15:03:27 +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
钱涛 5673bba357 Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01 2025-03-19 18:08:31 +08:00
钱涛 8910183e7f 核算是否采用线程池配置 2025-03-19 18:08:19 +08:00
钱涛 a63d956da3 Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01 2025-03-19 17:55:41 +08:00
钱涛 fe4b8b1fb3 核算是否采用线程池配置 2025-03-19 17:18:09 +08:00