From 2b1f4bf9e951a5965f081bf20ed0fa4c20f62533 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 22 Mar 2022 09:06:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9C=AA=E7=BB=93=E6=A1=88?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ProjectDao.xml  | 47 +++++++++----------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
index f4ead24b22..d1b227b040 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
@@ -42,30 +42,6 @@
         LIMIT #{pageNo}, #{pageSize}
     </select>
 
-    <!-- 待处理项目列表 -->
-    <select id="selectPendListByUserIds" resultType="com.epmet.dto.ProjectDTO" parameterType="com.epmet.dto.form.ProjectListUserIdsFromDTO">
-        SELECT distinct
-        p.ID,
-        p.TITLE,
-        p.CREATED_TIME,
-        psp.CREATED_TIME AS UPDATED_TIME
-        FROM project p
-        INNER JOIN (SELECT
-            ps.PROJECT_ID,
-            MAX(ps.CREATED_TIME) AS CREATED_TIME
-            FROM project_staff ps
-            WHERE ps.DEL_FLAG = '0'
-            AND ps.IS_HANDLE = 'unhandled'
-            AND ps.STAFF_ID IN (
-                <foreach collection="userIds" item="userId" separator=",">
-                    #{userId}
-                </foreach>
-        )
-            GROUP BY ps.PROJECT_ID) psp ON p.ID = psp.PROJECT_ID
-        WHERE p.DEL_FLAG = '0'
-        AND p.status = 'pending'
-        ORDER BY psp.created_time, p.created_time ASC<!-- 先按滞留时间降序再按创建时间升序 -->
-    </select>
 
     <select id="selectCreatedList" resultType="com.epmet.dto.ProjectDTO" parameterType="com.epmet.dto.form.ProjectListFromDTO">
         SELECT distinct
@@ -565,4 +541,27 @@
           AND audit_status  = 'auto_passed'
           AND GRID_ID = #{gridId}
     </select>
+    <select id="selectPendListByUserIds" resultType="com.epmet.dto.ProjectDTO">
+        SELECT distinct
+        p.ID,
+        p.TITLE,
+        p.CREATED_TIME,
+        psp.CREATED_TIME AS UPDATED_TIME
+        FROM project p
+        INNER JOIN (SELECT
+        ps.PROJECT_ID,
+        MAX(ps.CREATED_TIME) AS CREATED_TIME
+        FROM project_staff ps
+        WHERE ps.DEL_FLAG = '0'
+        AND ps.IS_HANDLE = 'unhandled'
+        AND ps.STAFF_ID IN (
+        <foreach collection="userIds" item="userId" separator=",">
+            #{userId}
+        </foreach>
+        )
+        GROUP BY ps.PROJECT_ID) psp ON p.ID = psp.PROJECT_ID
+        WHERE p.DEL_FLAG = '0'
+        AND p.status = 'pending'
+        ORDER BY psp.created_time, p.created_time ASC<!-- 先按滞留时间降序再按创建时间升序 -->
+    </select>
 </mapper>
\ No newline at end of file