From 334197c2f176795e78c46baa1271bb9a3c3bf302 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 29 十一月 2024 10:39:01 +0800
Subject: [PATCH] 项目库分类bug

---
 business/src/main/resources/mapper/ProjectInfoMapper.xml                |    3 +++
 business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java |    3 ++-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
index 060e8cf..08b62f6 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -156,13 +156,14 @@
             query.setProjectEndTime(DateUtils.getDayEnd(query.getProjectEndTime()));
         }
         String projectCategory = query.getProjectCategory();
+        //瀹炴柦闃舵鏈変袱涓�兼斁鍦╯ql澶勭悊
         if (ProjectCategoryEnum.RESERVE.getType().equals(projectCategory)) {
             query.setProjectStatus(ProjectCategoryEnum.RESERVE.getStatus());
             query.setReserveOrPrevious(ProjectCategoryEnum.RESERVE.getCode());
         } else if (ProjectCategoryEnum.PREVIOUS.getType().equals(projectCategory)) {
             query.setProjectStatus(ProjectCategoryEnum.PREVIOUS.getStatus());
             query.setReserveOrPrevious(ProjectCategoryEnum.PREVIOUS.getCode());
-        } else if (ProjectCategoryEnum.FINISH.getType().equals(projectCategory)) {
+        }  else if (ProjectCategoryEnum.FINISH.getType().equals(projectCategory)) {
             query.setProjectStatus(ProjectCategoryEnum.FINISH.getStatus());
         } else if (ProjectCategoryEnum.EXCEPTION.getType().equals(projectCategory)) {
             //TODO
diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index 5fbff88..f5f8b3b 100644
--- a/business/src/main/resources/mapper/ProjectInfoMapper.xml
+++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -149,6 +149,9 @@
             <if test="query.reserveOrPrevious != null and query.reserveOrPrevious == 'previous'">
                 and TPP.process_instance_id is not null
             </if>
+            <if test="query.projectCategory == 3">
+                and (TPI.project_status = 'working' or TPI.project_status = 'stop')
+            </if>
         </where>
         order by TPI.gmt_create
     </select>

--
Gitblit v1.8.0