From 632e0e59716dd400ca54dcef50baad9e0787679d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com> Date: Wed, 28 Oct 2026 14:16:17 +0800 Subject: [PATCH] =?UTF-8?q?:feat:=20=E5=90=88=E5=90=8C=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E5=90=88=E8=A7=84=E6=8E=A8=E9=80=81=E5=A2=9E=E5=8A=A0=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E7=8A=B6=E6=80=81=E5=9B=9E=E5=86=99=E9=97=AD=E7=8E=AF?= =?UTF-8?q?=EF=BC=8C=E4=BB=85=E5=8E=9F=E5=90=88=E5=90=8C=E5=B7=B2=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E5=90=88=E8=A7=84=E7=9A=84=E5=8F=98=E6=9B=B4=E5=8D=95?= =?UTF-8?q?=E5=8F=82=E4=B8=8E=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ContractChangeController.java | 14 +++++-------- .../service/IContractChangeService.java | 9 +++++++++ .../impl/ContractChangeServiceImpl.java | 20 ++++++++++++++++++- .../support/hcs/HcsImmediatePushSupport.java | 7 +++++++ 4 files changed, 40 insertions(+), 10 deletions(-) diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ContractChangeController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ContractChangeController.java index 89ddf9e0..219be8a1 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ContractChangeController.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ContractChangeController.java @@ -33,6 +33,7 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.annotation.PreAuth; import org.springblade.core.tool.api.R; +import org.springblade.transport.constant.HcsSyncConstant; import org.springblade.transport.pojo.entity.ContractChange; import org.springblade.transport.pojo.vo.ContractChangeVO; import org.springblade.transport.service.IContractChangeService; @@ -110,17 +111,12 @@ public class ContractChangeController extends BladeController { hcsImmediatePushSupport.pushContractAndWait(contractId); String syncFailure = HcsImmediatePushSupport.pollSyncFailure(); if (syncFailure != null) { - ContractChange contractChange = contractChangeService.getById(id); - if (contractChange != null) { - contractChange.setSyncStatus("failed"); - contractChangeService.updateById(contractChange); - } + contractChangeService.writeBackSyncStatus(contractId, HcsSyncConstant.HCS_STATUS_FAILED); return R.data(Boolean.FALSE, "审批通过，但合规推送失败：" + syncFailure); } - ContractChange contractChange = contractChangeService.getById(id); - if (contractChange != null) { - contractChange.setSyncStatus("synced"); - contractChangeService.updateById(contractChange); + // 即时推送未开启时（开关关闭不触发推送）不标记已推送，待推送状态由定时扫描任务推送后闭环 + if (hcsImmediatePushSupport.isImmediateEnabled()) { + contractChangeService.writeBackSyncStatus(contractId, HcsSyncConstant.HCS_STATUS_SYNCED); } return R.success("审批通过"); } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IContractChangeService.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IContractChangeService.java index 8dab1de0..f715bcf7 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IContractChangeService.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IContractChangeService.java @@ -72,4 +72,13 @@ public interface IContractChangeService extends BaseService { */ boolean markSyncStatus(String ids, String syncStatus); + /** + * 按原合同回写最近一条待同步变更单的同步状态（审批即时推送/定时任务推送后调用） + * + * @param contractId 原合同ID + * @param syncStatus 同步状态（synced/failed） + * @return 是否回写成功（无待同步变更单时返回 false） + */ + boolean writeBackSyncStatus(Long contractId, String syncStatus); + } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractChangeServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractChangeServiceImpl.java index a663c015..ab043070 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractChangeServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractChangeServiceImpl.java @@ -190,7 +190,11 @@ public class ContractChangeServiceImpl extends BaseServiceImpllambdaUpdate() + .eq(ContractChange::getContractId, contractId) + .eq(ContractChange::getApprovalStatus, STATUS_APPROVED) + .in(ContractChange::getSyncStatus, List.of(HcsSyncConstant.HCS_STATUS_UNSYNCED, HcsSyncConstant.HCS_STATUS_FAILED)) + .set(ContractChange::getSyncStatus, syncStatus) + .last("order by approved_time desc limit 1")); + } + private LambdaQueryWrapper buildQuery(ContractChangeVO contractChange) { TransportBusinessSupport.validateAllDept(contractChange.getAllDept(), "合同变更"); LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery().eq(ContractChange::getIsDeleted, 0); diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsImmediatePushSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsImmediatePushSupport.java index cc0e6106..fc0339ce 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsImmediatePushSupport.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsImmediatePushSupport.java @@ -153,6 +153,13 @@ public class HcsImmediatePushSupport { this.pushWithLock(HcsSyncConstant.BIZ_TYPE_CONTRACT, id, () -> this.pushContractNow(id)); } + /** + * 即时推送开关（thirdParty.hcs.push.immediate-enabled）状态，供 Controller 判断审批响应是否实际等待过推送结果 + */ + public boolean isImmediateEnabled() { + return hcsProperties.getPush().isImmediateEnabled(); + } + /** * 项目立项"通过"按钮路径：在审批事务提交返回后由 Controller 同步调用，失败原因留在当前线程供其取走 *