From 2a44fc0d2ed89166ac5b94f297273ca292212b1b Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 24 Jul 2024 18:16:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E7=8A=B6=E6=80=81=E5=92=8C=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/esInitChange/entity/enums/ESPChangeType.java | 7 ++++--- .../listener/ProcessESInitChangeEndListener.java | 9 ++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/enums/ESPChangeType.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/enums/ESPChangeType.java index f4ba0da6..0ce270b1 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/enums/ESPChangeType.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/enums/ESPChangeType.java @@ -7,11 +7,12 @@ package com.jero.modules.activiti.process.esInitChange.entity.enums; public enum ESPChangeType { ADD("新增", "1", "新增计划入库时"), - CHANGE("变更", "2", "变更类型为完成时间变更、责任部门变更、"), - CANCEL("取消", "3", "项目类型为工作终止为取消"), - ; + COMPLETE_TIME_CHANGE("完成时间变更", "4", "变更类型为完成时间变更"), + WORK_TERMINATE("工作中止", "5", "变更类型为工作中止"), + RESPONSIBLE_DEPT_CHANGE("责任部门变更", "6", "变更类型为责任部门变更"), + MERGE("合并", "7", "变更类型为合并"); private final String name; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/listener/ProcessESInitChangeEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/listener/ProcessESInitChangeEndListener.java index a6ad39a4..ca2f19e6 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/listener/ProcessESInitChangeEndListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/listener/ProcessESInitChangeEndListener.java @@ -22,7 +22,6 @@ import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; import com.jero.modules.laws.enterprise.util.BeanCopyUtils; import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil; import lombok.extern.slf4j.Slf4j; -import org.activiti.engine.ActivitiObjectNotFoundException; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.ExecutionListener; import org.springframework.stereotype.Component; @@ -112,7 +111,7 @@ public class ProcessESInitChangeEndListener implements ExecutionListener { if (ESPProjectType.COMPLETE_TIME_CHANGE.getValue().equals(projectType)) { // 将企标计划变更状态设为取消 for (ProcessEsInitChange processEsInitChange : processEsInitChanges) { - processEsInitChange.setChangeStatus(ESPChangeType.CHANGE.getValue()); + processEsInitChange.setChangeStatus(ESPChangeType.COMPLETE_TIME_CHANGE.getValue()); } enterpriseStandardPlans = BeanCopyUtils.copyBeanList(processEsInitChanges, EnterpriseStandardPlan.class); espService.updateBatchById(enterpriseStandardPlans); @@ -125,7 +124,7 @@ public class ProcessESInitChangeEndListener implements ExecutionListener { for (ProcessEsInitChange processEsInitChange : processEsInitChanges) { espWrapper.eq(EnterpriseStandardPlan::getId, processEsInitChange.getEspId()); espWrapper.set(EnterpriseStandardPlan::getProjectStatus, ESPProjectStatus.NOT_STARTED.getValue()); - espWrapper.set(EnterpriseStandardPlan::getChangeStatus, ESPChangeType.CANCEL.getValue()); + espWrapper.set(EnterpriseStandardPlan::getChangeStatus, ESPChangeType.WORK_TERMINATE.getValue()); espService.update(espWrapper); espWrapper.clear(); } @@ -135,7 +134,7 @@ public class ProcessESInitChangeEndListener implements ExecutionListener { if (ESPProjectType.RESPONSIBLE_DEPT_CHANGE.getValue().equals(projectType)) { // 将企标计划变更状态设为变更 for (ProcessEsInitChange processEsInitChange : processEsInitChanges) { - processEsInitChange.setChangeStatus(ESPChangeType.CHANGE.getValue()); + processEsInitChange.setChangeStatus(ESPChangeType.RESPONSIBLE_DEPT_CHANGE.getValue()); processEsInitChange.setMainDraftingUser(processEsInitChange.getNewMainDraftingUser()); processEsInitChange.setMainDraftingUnitResponsiblePerson(processEsInitChange.getNewMainDraftingUnitResponsiblePerson()); processEsInitChange.setMainDraftingUnit(processEsInitChange.getNewMainDraftingUnit()); @@ -149,7 +148,7 @@ public class ProcessESInitChangeEndListener implements ExecutionListener { for (ProcessEsInitChange processEsInitChange : processEsInitChanges) { processEsInitChange.setId(null); processEsInitChange.setProjectStatus(ESPProjectStatus.IN_PROGRESS.getValue()); - processEsInitChange.setChangeStatus(ESPChangeType.CHANGE.getValue()); + processEsInitChange.setChangeStatus(ESPChangeType.MERGE.getValue()); } ProcessEsInitChange processEsInitChange = processEsInitChanges.get(0); // 删除两个老企标计划