From 5912c80e58df2526934204362a92ff92a52ac56f Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Sat, 14 Sep 2024 16:22:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E6=B5=81=E7=A8=8B=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esInitChange/entity/enums/ESPProjectStatus.java  | 11 +++--------
 .../service/impl/EsRevisionServiceImpl.java          |  7 +++----
 .../service/EnterpriseStandardPlanService.java       | 12 ++++++++++--
 .../impl/EnterpriseStandardPlanServiceImpl.java      |  7 +++++++
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/enums/ESPProjectStatus.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/enums/ESPProjectStatus.java
index 60136761..2e1bd63d 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/enums/ESPProjectStatus.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/enums/ESPProjectStatus.java
@@ -1,9 +1,12 @@
 package com.jero.modules.activiti.process.esInitChange.entity.enums;
 
+import lombok.Getter;
+
 /**
  * @author: Mzaxd
  * @Date: 2023/10/13 14:17
  */
+@Getter
 public enum ESPProjectStatus {
 
     NOT_STARTED("未开始", "1"),
@@ -23,14 +26,6 @@ public enum ESPProjectStatus {
         this.value = value;
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
     public static String getValueByName(String name) {
         for (ESPProjectStatus status : ESPProjectStatus.values()) {
             if (status.getName().equals(name)) {
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
index 5bdfb3f5..dc72beb0 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
@@ -234,8 +234,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
             throw new JeroBootException(ResultCommon.INVALID_ESP);
         }
         // 设置状态为运行中
-        esp.setProjectStatus(ESPProjectStatus.IN_PROGRESS.getValue());
-        espService.updateById(esp);
+        espService.changeProjectStatus(espId, ESPProjectStatus.IN_PROGRESS);
     }
 
     @Override
@@ -534,8 +533,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 List<String> adviceUserList = Arrays.asList(workGroup.split(","));
                 // 如果人员超过600则提示
                 if (adviceUserList.size() > 600) {
-                    log.error("当前提交部门人员超过600人");
-                    throw new JeroBootException("当前提交部门人员超过600人，请重新选择!");
+                    log.error("当前提交人员超过600人");
+                    throw new JeroBootException("当前提交人员超过600人，请重新选择!");
                 }
                 runtimeService.setVariableLocal(executionId, "adviceUserList", adviceUserList);
                 runtimeService.setVariable(executionId, executionId + "-adviceDeadline", adviceDeadline);
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardPlanService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardPlanService.java
index 16fd8d50..d2e4f8a1 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardPlanService.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardPlanService.java
@@ -1,10 +1,11 @@
 package com.jero.modules.laws.enterprise.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectStatus;
+import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan;
 import com.jero.modules.laws.enterprise.entity.dto.ESPlanQueryDTO;
 import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardPlanVo;
-import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan;
-import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -63,4 +64,11 @@ public interface EnterpriseStandardPlanService extends IService<EnterpriseStanda
      * 年度制修订计划导入
      */
     void importAnnualRevisionPlan(MultipartFile file, HttpServletResponse response) throws IOException;
+
+    /**
+     * 修改企标计划项目状态
+     * @param planId
+     * @param status
+     */
+    void changeProjectStatus(String planId, ESPProjectStatus status);
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java
index 39649726..c160758c 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java
@@ -271,6 +271,13 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl<EnterpriseSta
         log.info("年度制修订计划表数据导入结束");
     }
 
+    @Override
+    public void changeProjectStatus(String planId, ESPProjectStatus status) {
+        EnterpriseStandardPlan plan = this.getById(planId);
+        plan.setProjectStatus(status.getValue());
+        this.updateById(plan);
+    }
+
 }