From b6488aa7b5e9ac24175fe3723ac9f3afd821327d Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 26 Jan 2024 14:54:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=92=A4=E5=9B=9E=E5=90=8E=20=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=8A=B6=E6=80=81=E4=B8=BA=E6=9C=AA=E5=BC=80=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activiti/service/ProcessAllService.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java index 12b30746..8a269fb7 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java @@ -25,11 +25,16 @@ import com.jero.modules.activiti.mapper.ProcessAllMapper; import com.jero.modules.activiti.process.common.common.DraftCommon; import com.jero.modules.activiti.process.common.entity.ProcessDraft; import com.jero.modules.activiti.process.common.service.ProcessDraftService; +import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectStatus; +import com.jero.modules.activiti.process.esRevision.entity.ProcessEsRevision; +import com.jero.modules.activiti.process.esRevision.service.EsRevisionService; import com.jero.modules.activiti.util.SpringContextUtil; import com.jero.modules.activiti.vo.DelegateTaskParam; import com.jero.modules.activiti.vo.ResolveTaskParam; import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon; import com.jero.modules.laws.common.util.CurrentUserUtil; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.HistoryService; import org.activiti.engine.RuntimeService; @@ -68,6 +73,11 @@ public class ProcessAllService extends ServiceImpl private SendMessageAPI sendMessageAPI; @Resource private ProcessDraftService processDraftService; + @Resource + private EsRevisionService revisionService; + + @Resource + private EnterpriseStandardPlanService espService; private static final List INSPECT_PROCESS = Arrays.asList( ProcessTypeEnum.FB_ENTRY_CHANGE.getValue(), @@ -175,9 +185,26 @@ public class ProcessAllService extends ServiceImpl processApprovalRecord.setFinishFlag(FinishFlagEnum.WITHDRAWN.getValue()); processApprovalRecord.setCreateTime(null); approvalRecordService.save(processApprovalRecord); + + // 制修订流程强制撤回后需要更改企标计划的项目状态为未开始 + if (Objects.equals(prcType, ProcessTypeEnum.ES_REVISION.getValue())) { + this.revisionForcedWithdrawalProcess(processInstanceId); + } //todo 同步删除操作到统一待办 } + private void revisionForcedWithdrawalProcess(String processInstanceId) { + ProcessEsRevision revision = revisionService.getOne(new LambdaQueryWrapper() + .eq(ProcessEsRevision::getProcessInstanceId, processInstanceId)); + String espId = revision.getEspId(); + if (StringUtils.isNotBlank(espId)) { + throw new JeroBootException("强制撤回企标制修订流程失败，找不到对应的企标计划"); + } + espService.update(new LambdaUpdateWrapper() + .eq(EnterpriseStandardPlan::getId, espId) + .set(EnterpriseStandardPlan::getProjectStatus, ESPProjectStatus.NOT_STARTED.getValue())); + } + public void delegateTask(DelegateTaskParam param) { String taskId = param.getTaskId(); String userId = param.getUserId();