From 91f85572a7ac27a5fe7ee1a878e1f3dfb18111e1 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Fri, 9 Aug 2024 14:31:43 +0800 Subject: [PATCH] =?UTF-8?q?fix(88286):=20=E6=A0=87=E5=87=86=E8=A7=A3?= =?UTF-8?q?=E8=AF=BB=E6=B5=81=E7=A8=8B=EF=BC=88=E6=A0=87=E5=87=86=E4=B8=BB?= =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E4=BA=BA=E5=AE=A1=E6=A0=B8=EF=BC=89=20--?= =?UTF-8?q?=E6=92=A4=E5=9B=9E=E7=9A=84=E6=B5=81=E7=A8=8B=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=BE=85=E5=8A=9E=E8=BF=98=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/StandardInterpretFlow.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlow.java index 1f22afa4..9d4a6548 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlow.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlow.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.jero.common.exception.JeroBootException; import com.jero.modules.activiti.entity.ProcessAll; import com.jero.modules.activiti.entity.ProcessApprovalRecord; +import com.jero.modules.activiti.enums.FinishFlagEnum; import com.jero.modules.activiti.process.standardinterpret.common.StandardInterpretCommon; import com.jero.modules.activiti.process.standardinterpret.dto.StandardInterpretDTO; import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpret; @@ -13,6 +14,7 @@ import com.jero.modules.activiti.process.standardinterpret.service.ProcessStanda import com.jero.modules.activiti.process.standardinterpret.service.ProcessStandardInterpretService; import com.jero.modules.activiti.process.standardinterpret.service.StandardInterpretFlowService; import com.jero.modules.activiti.service.ProcessAllService; +import com.jero.modules.activiti.service.ProcessApprovalRecordService; import com.jero.modules.activiti.service.WorkCenterService; import com.jero.modules.activiti.util.SpringContextUtil; import com.jero.modules.activiti.vo.DelegateTaskParam; @@ -42,6 +44,15 @@ public class StandardInterpretFlow implements WorkCenterService { // 删除业务表数据 ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); processAllService.physicalDeleteByProjectId("process_standard_interpret", processAll.getProjectId()); + + // 更新子流程进行中的为未处理 + ProcessApprovalRecordService processApprovalRecordService = + SpringContextUtil.getBean(ProcessApprovalRecordService.class); + processApprovalRecordService.update(new LambdaUpdateWrapper() + .eq(ProcessApprovalRecord::getProcessInstanceId, processAll.getProcessInstanceId()) + .eq(ProcessApprovalRecord::getProjectId, processAll.getProjectId()) + .eq(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.INCOMPLETE.getValue()) + .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.SUSPEND.getValue())); } /**