项目问题修改

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java

@@ -44,6 +44,13 @@ public interface ProjectProcessDao extends BaseDao<ProjectProcessEntity> {
      **/
     List<ProcesslistResultDTO> getProcessListByProjectId(@Param("projectId") String projectId);
 
+    /**
+     * 可退回节点
+     * @author zhaoqifeng
+     * @date 2020/5/15 17:24
+     * @param projectId
+     * @return java.util.List<com.epmet.entity.ProjectProcessEntity>
+     */
     List<ProjectProcessEntity> selectReturnableList(@Param("projectId") String projectId);
 
     /**

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@@ -50,17 +50,15 @@
             p.CREATED_TIME,
             ps.CREATED_TIME AS UPDATED_TIME
         FROM project p
-        INNER JOIN (SELECT DISTINCT
-                     ps.PROJECT_ID
+        INNER JOIN (SELECT
+                        PROJECT_ID
                     FROM
-                     project_staff ps
-                 INNER JOIN  project_process pp ON ps.PROCESS_ID = pp.ID AND pp.DEL_FLAG = '0'
-                            AND pp.OPERATION = 'created'
+                        project_process
                    WHERE
-                     ps.DEL_FLAG = '0'
-                   AND ps.IS_HANDLE = 'handle'
-                   AND ps.STAFF_ID = #{userId}
-                 GROUP BY ps.PROJECT_ID) psp ON p.ID = psp.PROJECT_ID
+                         DEL_FLAG = '0'
+                        AND OPERATION = 'created'
+                   AND STAFF_ID = #{userId}
+                 ) psp ON p.ID = psp.PROJECT_ID
         LEFT JOIN (
             SELECT DISTINCT
                 PROJECT_ID,
@@ -72,18 +70,7 @@
             GROUP BY PROJECT_ID) ps ON p.ID = ps.PROJECT_ID
         LEFT JOIN project_process pp ON p.ID = pp.PROJECT_ID AND pp.OPERATION = 'close'
         WHERE
-            NOT EXISTS (
-                    SELECT
-                        PROJECT_ID
-                    FROM
-                        project_staff
-                    WHERE
-                        DEL_FLAG = '0'
-                      AND PROJECT_ID = p.ID
-                      AND STAFF_ID = #{userId}
-                      AND IS_HANDLE = 'unhandled'
-                )
-            AND p.DEL_FLAG = '0'
+             p.DEL_FLAG = '0'
         ORDER BY p.CREATED_TIME ASC
         LIMIT #{pageNo}, #{pageSize}
     </select>

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml

@@ -27,6 +27,7 @@
         WHERE
             DEL_FLAG = '0'
           AND PROJECT_ID = #{projectId}
+          AND OPERATION = 'transfer'
         ORDER BY CREATED_TIME DESC
     </select>