From b0e4264deeb35670a775691ba2ea51ea75f94816 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 13 Oct 2023 15:34:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=B8=8D=E5=81=9A=E7=94=B3=E8=AF=B7=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessESInitChangeController.java         |  5 ++---
 .../service/EnterpriseStandardPlanService.java |  3 +--
 .../EnterpriseStandardPlanServiceImpl.java     | 18 +++++++-----------
 3 files changed, 10 insertions(+), 16 deletions(-)

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<EnterpriseStanda
      * @param pageSize
      * @param esPlanQueryDTO
      * @param projectType
-     * @param revisionType
      * @return
      */
-    IPage<EnterpriseStandardPlanVo> getESPList(Integer pageNo, Integer pageSize, ESPlanQueryDTO esPlanQueryDTO, String projectType, String revisionType);
+    IPage<EnterpriseStandardPlanVo> 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<EnterpriseSta
 
 
     @Override
-    public IPage<EnterpriseStandardPlanVo> getESPList(Integer pageNo, Integer pageSize, ESPlanQueryDTO esPlanQueryDTO, String projectType, String revisionType) {
+    public IPage<EnterpriseStandardPlanVo> getESPList(Integer pageNo, Integer pageSize, ESPlanQueryDTO esPlanQueryDTO, String projectType) {
+        List<String> 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<String> 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<EnterpriseStandardPlanVo> page = new Page<>(pageNo, pageSize);
         esPlanMapper.page(page, esPlanQueryDTO);