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 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