From 9e2ec77ed560ecf691f8ed8e8f787fd2db69fb18 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 18 Jan 2024 10:55:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2080935=20=E4=BC=81=E6=A0=87=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=8F=98=E6=9B=B4--=E5=AE=8C=E6=88=90=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=8F=98=E6=9B=B4=E3=80=81=E5=B7=A5=E4=BD=9C=E7=BB=88?=
 =?UTF-8?q?=E6=AD=A2--=E9=80=89=E6=8B=A9=E8=AE=A1=E5=88=92=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E5=8F=AF=E9=80=89=E9=80=BE=E6=9C=9F=E7=9A=84=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EnterpriseStandardPlanServiceImpl.java       | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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 09641f8c..c979ce21 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
@@ -81,13 +81,18 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl<EnterpriseSta
             // 合并 未开始 修订+修订 制定+制定
             projectStatusList.add(ESPProjectStatus.NOT_STARTED.getValue());
             esPlanQueryDTO.setProjectStatusList(projectStatusList);
-        } else {
-            // 完成时间变更 未开始/进行中
-            // 工作中止 未开始/进行中
+        } else if (ESPProjectType.RESPONSIBLE_DEPT_CHANGE.getValue().equals(projectType)) {
             // 责任部门变更 未开始/进行中
             projectStatusList.add(ESPProjectStatus.NOT_STARTED.getValue());
             projectStatusList.add(ESPProjectStatus.IN_PROGRESS.getValue());
             esPlanQueryDTO.setProjectStatusList(projectStatusList);
+        } else {
+            // 完成时间变更 未开始/进行中/逾期
+            // 工作中止 未开始/进行中/逾期
+            projectStatusList.add(ESPProjectStatus.NOT_STARTED.getValue());
+            projectStatusList.add(ESPProjectStatus.IN_PROGRESS.getValue());
+            projectStatusList.add(ESPProjectStatus.OVERDUE.getValue());
+            esPlanQueryDTO.setProjectStatusList(projectStatusList);
         }
         IPage<EnterpriseStandardPlanVo> page = new Page<>(pageNo, pageSize);
         esPlanMapper.page(page, esPlanQueryDTO);