diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java index c5c95256..6aa80a45 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java @@ -148,7 +148,7 @@ public class ProcessESInitChangeController { public Result getESPList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam("projectType") String projectType, - @RequestParam(name="espApplicationCategory", required = false) String espApplicationCategory) { - return Result.OK(espService.getESPList(pageNo, pageSize, projectType, espApplicationCategory)); + @RequestParam(name="revisionType", required = false) String revisionType) { + return Result.OK(espService.getESPList(pageNo, pageSize, projectType, revisionType)); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/enums/ESPRevisionType.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/enums/ESPRevisionType.java new file mode 100644 index 00000000..47851656 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/enums/ESPRevisionType.java @@ -0,0 +1,31 @@ +package com.jero.modules.activiti.process.esInitChange.entity.enums; + +/** + * @author: Mzaxd + * @Date: 2023/10/13 15:14 + */ +public enum ESPRevisionType { + + /** 立项 **/ + ENACT("制定", "1"), + MODIFY("修订", "2"), + ; + + private final String name; + + private final String value; + + public String getName() { + return name; + } + + public String getValue() { + return value; + } + + ESPRevisionType(String name, String value) { + this.name = name; + this.value = value; + } + +} 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 61c6ce1f..e4cc8d2e 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 @@ -52,8 +52,8 @@ public interface EnterpriseStandardPlanService extends IService getESPList(Integer pageNo, Integer pageSize, String projectType, String espApplicationCategory); + IPage getESPList(Integer pageNo, Integer pageSize, String projectType, String revisionType); } 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 38c3f696..5109b008 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 @@ -9,6 +9,7 @@ import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.vo.DictModel; 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.entity.enums.ESPRevisionType; import com.jero.modules.laws.enterprise.entity.dto.ESPlanQueryDTO; import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardPlanVo; import com.jero.common.exception.JeroBootException; @@ -75,7 +76,7 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl getESPList(Integer pageNo, Integer pageSize, String projectType, String espApplicationCategory) { + public IPage getESPList(Integer pageNo, Integer pageSize, String projectType, String revisionType) { // 构建查询参数 ESPlanQueryDTO esPlanQueryDTO = new ESPlanQueryDTO(); @@ -90,10 +91,10 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl page = new Page<>(pageNo, pageSize);