Commit Graph

3562 Commits

Author SHA1 Message Date
钱涛 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
钱涛 6e6606f3ac Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-04-21 15:49:39 +08:00
钱涛 552cee8a6f 修复合并计税问题 2025-04-21 15:49:28 +08:00
钱涛 0e93cbab04 t 2025-04-21 10:37:44 +08:00
钱涛 64ad0a30d4 修复sql部署异常 2025-04-21 10:33:06 +08:00
钱涛 4d56cde7a9 版本 2025-04-17 15:34:29 +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
钱涛 b0fb2b3866 部分发放 2025-04-15 17:49:38 +08:00
钱涛 61beec603e 创建推送记录接口;
推送接口;
撤回接口;
2025-04-14 17:00:16 +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
钱涛 8e3c4bfacc 数据推送配置sql 2025-04-01 16:43:02 +08:00
钱涛 3511c18e31 数据推送配置 2025-04-01 15:12:36 +08:00
钱涛 97546393a4 上线版本 2025-03-27 16:31:40 +08:00
钱涛 8a49a2ef1b 上线版本 2025-03-27 16:13:19 +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
钱涛 93defb41cd 版本 2025-03-20 17:32:06 +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
钱涛 7de1062387 Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01 2025-03-19 10:09:28 +08:00
钱涛 c8f281613b 薪资明细增加人员浏览按钮多选搜索 2025-03-18 17:45:00 +08:00
钱涛 3b520fcf62 社保和档案执行标识 2025-03-18 17:31:32 +08:00
钱涛 4913398650 修复业务线分页问题 2025-03-18 11:10:27 +08:00
钱涛 d672dd8d61 Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01 2025-03-17 11:05:52 +08:00
钱涛 a29f8b3da9 薪资明细模板导出根据项目类型设置单元格格式 2025-03-17 11:03:42 +08:00
Harryxzy e2ac113378 fix 个税申报报错 2025-03-13 17:20:05 +08:00
Harryxzy d0ec44c7b1 Merge branch 'feature/250301_社保福利台账增减人员' into release/3.0.1.2503.01 2025-03-13 16:59:11 +08:00
钱涛 ccb0dcd8d5 修复数值类型判断 2025-03-13 16:02:00 +08:00
钱涛 9c3bb5f956 处理未开启分权的情况 2025-03-13 10:06:23 +08:00
Harryxzy 3fb29b2c3d 停薪action 增加日志 2025-03-12 18:21:04 +08:00