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 78acdcbd..5a5c7b0d 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 @@ -149,8 +149,7 @@ public class ProcessESInitChangeController { public Result getESPList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, ESPlanQueryDTO esPlanQueryDTO, - @RequestParam("projectType") String projectType, - @RequestParam(name="revisionType", required = false) String revisionType) { - return Result.OK(espService.getESPList(pageNo, pageSize, esPlanQueryDTO, projectType, revisionType)); + @RequestParam("projectType") String projectType) { + return Result.OK(espService.getESPList(pageNo, pageSize, esPlanQueryDTO, projectType)); } } 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 115792b7..e966429f 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 @@ -53,8 +53,7 @@ public interface EnterpriseStandardPlanService extends IService getESPList(Integer pageNo, Integer pageSize, ESPlanQueryDTO esPlanQueryDTO, String projectType, String revisionType); + IPage getESPList(Integer pageNo, Integer pageSize, ESPlanQueryDTO esPlanQueryDTO, String projectType); } 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 dad89ffb..6a2c2ea6 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 @@ -76,24 +76,20 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl getESPList(Integer pageNo, Integer pageSize, ESPlanQueryDTO esPlanQueryDTO, String projectType, String revisionType) { + public IPage getESPList(Integer pageNo, Integer pageSize, ESPlanQueryDTO esPlanQueryDTO, String projectType) { + List projectStatusList = new ArrayList<>(); // 构建查询参数 - if (!ESPProjectType.MERGE.getValue().equals(projectType)) { + if (ESPProjectType.MERGE.getValue().equals(projectType)) { + // 合并 未开始 修订+修订 制定+制定 + projectStatusList.add(ESPProjectStatus.NOT_STARTED.getValue()); + esPlanQueryDTO.setProjectStatusList(projectStatusList); + } else { // 完成时间变更 未开始/进行中 // 工作中止 未开始/进行中 // 责任部门变更 未开始/进行中 - List projectStatusList = new ArrayList<>(); projectStatusList.add(ESPProjectStatus.NOT_STARTED.getValue()); projectStatusList.add(ESPProjectStatus.IN_PROGRESS.getValue()); esPlanQueryDTO.setProjectStatusList(projectStatusList); - } else { - // 合并 未开始 修订+修订 制定+制定 - esPlanQueryDTO.setProjectStatus(ESPProjectStatus.NOT_STARTED.getValue()); - if (ESPRevisionType.ENACT.getValue().equals(revisionType)) { - esPlanQueryDTO.setRevisionType(ESPRevisionType.ENACT.getValue()); - } else { - esPlanQueryDTO.setRevisionType(ESPRevisionType.MODIFY.getValue()); - } } IPage page = new Page<>(pageNo, pageSize); esPlanMapper.page(page, esPlanQueryDTO);