Merge branch 'dev_abandon_grid' into develop

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>