Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet/epmet-cloud-lingshan

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

@@ -546,9 +546,12 @@
         FROM
             ic_event_reply r
         <where>
-            r.DEL_FLAG = 0 AND r.MANAGE_STATUS = #{manageType}
-            <if test="null != manageType and manageType != '' and manageType == 2">
-                OR r.MANAGE_STATUS = 3 OR r.MANAGE_STATUS = 4
+            r.DEL_FLAG = 0
+            <if test="null != manageType and manageType != '' and manageType != '2'">
+                AND r.MANAGE_STATUS = #{manageType}
+            </if>
+            <if test="null != manageType and manageType != '' and manageType == '2'">
+                AND (r.MANAGE_STATUS = #{manageType} OR r.MANAGE_STATUS = 3 OR r.MANAGE_STATUS = 4)
             </if>
             AND r.IC_EVENT_ID IN (
                 SELECT e.id from ic_event e
@@ -563,6 +566,7 @@
                 </where>
             )
         </where>
+        GROUP BY r.id
     </select>
 
     <select id="getEventBySourceTypeCount" resultType="com.epmet.dto.result.EventAnalysisResultDTO">
@@ -679,7 +683,7 @@
                 SELECT count( r.id ) AS total FROM ic_event_reply r
                 <where>
                     r.DEL_FLAG = 0
-                    AND r.MANAGE_STATUS = 2 OR r.MANAGE_STATUS = 3 OR r.MANAGE_STATUS = 4 OR r.MANAGE_STATUS = 5
+                    AND r.MANAGE_STATUS = 2 OR r.MANAGE_STATUS = 3 OR r.MANAGE_STATUS = 4
                     AND r.IC_EVENT_ID IN (
                         SELECT e.id AS id FROM ic_event e
                         <where>