From 83809a98663c7f014fe81d6ce103656e4aab929f Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 31 Oct 2023 15:39:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E7=AB=8B=E9=A1=B9?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B=E5=90=8E=E7=9A=84=E5=A4=84?= =?UTF-8?q?=E7=90=86=E7=BC=BA=E5=A4=B1=E5=AD=97=E6=AE=B5BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esInitChange/entity/enums/ESPChangeType.java | 6 +++--- .../listener/ProcessESInitChangeEndListener.java | 16 ++++++++++++++-- 2 files changed, 17 insertions(+), 5 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 1eadd941..c3f31675 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 @@ -6,11 +6,11 @@ package com.jero.modules.activiti.process.esInitChange.entity.enums; */ public enum ESPChangeType { - ADD("新增", "add", "新增计划入库时"), + ADD("新增", "1", "新增计划入库时"), - CHANGE("变更", "change", "变更类型为完成时间变更、责任部门变更、"), + CHANGE("变更", "2", "变更类型为完成时间变更、责任部门变更、"), - CANCEL("取消", "cancel", "项目类型为工作终止为取消"), + CANCEL("取消", "3", "项目类型为工作终止为取消"), ; 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 9546e365..84e3e8e1 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 @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange; import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPApplicationCategoryEnum; import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPChangeType; +import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectStatus; import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectType; import com.jero.modules.activiti.process.esInitChange.service.ProcessEsInitChangeService; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan; @@ -51,6 +52,8 @@ public class ProcessESInitChangeEndListener implements ExecutionListener { // 立项新增-Id置空 for (ProcessEsInitChange processEsInitChange : processEsInitChanges) { processEsInitChange.setId(null); + processEsInitChange.setProjectStatus(ESPProjectStatus.IN_PROGRESS.getValue()); + processEsInitChange.setChangeStatus(ESPChangeType.ADD.getValue()); } // 转换为企标计划数据并入库 enterpriseStandardPlans = BeanCopyUtils.copyBeanList(processEsInitChanges, EnterpriseStandardPlan.class); @@ -63,6 +66,11 @@ public class ProcessESInitChangeEndListener implements ExecutionListener { // 完成时间变更 if (ESPProjectType.COMPLETE_TIME_CHANGE.getValue().equals(projectType)) { + // 将企标计划变更状态设为取消 + for (ProcessEsInitChange processEsInitChange : processEsInitChanges) { + processEsInitChange.setProjectStatus(ESPProjectStatus.IN_PROGRESS.getValue()); + processEsInitChange.setChangeStatus(ESPChangeType.CHANGE.getValue()); + } enterpriseStandardPlans = BeanCopyUtils.copyBeanList(processEsInitChanges, EnterpriseStandardPlan.class); espService.saveOrUpdateBatch(enterpriseStandardPlans); } @@ -71,7 +79,8 @@ public class ProcessESInitChangeEndListener implements ExecutionListener { if (ESPProjectType.WORK_TERMINATE.getValue().equals(projectType)) { // 将企标计划变更状态设为取消 for (ProcessEsInitChange processEsInitChange : processEsInitChanges) { - processEsInitChange.setProjectStatus(ESPChangeType.CANCEL.getValue()); + processEsInitChange.setProjectStatus(ESPProjectStatus.NOT_STARTED.getValue()); + processEsInitChange.setChangeStatus(ESPChangeType.CANCEL.getValue()); } enterpriseStandardPlans = BeanCopyUtils.copyBeanList(processEsInitChanges, EnterpriseStandardPlan.class); espService.saveOrUpdateBatch(enterpriseStandardPlans); @@ -81,7 +90,8 @@ public class ProcessESInitChangeEndListener implements ExecutionListener { if (ESPProjectType.RESPONSIBLE_DEPT_CHANGE.getValue().equals(projectType)) { // 将企标计划变更状态设为变更 for (ProcessEsInitChange processEsInitChange : processEsInitChanges) { - processEsInitChange.setProjectStatus(ESPChangeType.CHANGE.getValue()); + processEsInitChange.setProjectStatus(ESPProjectStatus.IN_PROGRESS.getValue()); + processEsInitChange.setProjectStatus(ESPChangeType.CANCEL.getValue()); } enterpriseStandardPlans = BeanCopyUtils.copyBeanList(processEsInitChanges, EnterpriseStandardPlan.class); espService.saveOrUpdateBatch(enterpriseStandardPlans); @@ -91,6 +101,8 @@ public class ProcessESInitChangeEndListener implements ExecutionListener { if (ESPProjectType.MERGE.getValue().equals(projectType)) { for (ProcessEsInitChange processEsInitChange : processEsInitChanges) { processEsInitChange.setId(null); + processEsInitChange.setProjectStatus(ESPProjectStatus.IN_PROGRESS.getValue()); + processEsInitChange.setChangeStatus(ESPChangeType.CHANGE.getValue()); } // 删除两个老企标计划 espService.deleteById(processEsInitChanges.get(0).getStandardIdOne());