Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.epmet.dataaggre.dao.govproject.ProjectDao">
 
     <select id="getAllProject" resultType="com.epmet.dataaggre.dto.govproject.result.ProjectInfoDTO">
-        SELECT
+        SELECT DISTINCT
             p.ID AS projectId,
             p.TITLE AS projectTitle,
             p.`STATUS` AS projectStatus,
@@ -19,12 +19,12 @@
             IFNULL( pp.PUBLIC_REPLY, '' ) AS publicReply
         FROM
             project p
-                INNER JOIN ( SELECT PROJECT_ID, GRID_ID FROM project_related_personnel WHERE DEL_FLAG = '0' AND SOURCE_TYPE = 'issue' ) prp ON p.ID = prp.PROJECT_ID
+                LEFT JOIN ( SELECT PROJECT_ID, GRID_ID FROM project_related_personnel WHERE DEL_FLAG = '0' AND SOURCE_TYPE = 'issue' ) prp ON p.ID = prp.PROJECT_ID
                 INNER JOIN ( SELECT PROJECT_ID, MAX( CREATED_TIME ) AS updateTime FROM project_process ppro GROUP BY PROJECT_ID ) ppro ON p.ID = ppro.PROJECT_ID
                 INNER JOIN ( SELECT PROJECT_ID, COUNT( DISTINCT DEPARTMENT_NAME ) AS departmentCount FROM project_staff GROUP BY PROJECT_ID ) ps ON ps.PROJECT_ID = p.ID
                 LEFT JOIN ( SELECT PROJECT_ID, COUNT( ID ) AS processCount FROM project_process WHERE DEL_FLAG = '0' AND OPERATION != 'created' GROUP BY PROJECT_ID ) ppc ON ppc.PROJECT_ID = p.ID
                 LEFT JOIN project_process pp ON p.ID = pp.PROJECT_ID
-                AND pp.OPERATION = 'close'
+                AND pp.OPERATION = 'close' AND pp.DEL_FLAG = '0'
         WHERE
             p.DEL_FLAG = '0'
         AND p.ORG_ID_PATH LIKE concat('%', #{agencyId}, '%')