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

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

@@ -5,8 +5,8 @@
 
     <!-- 查询报事列表 -->
     <resultMap id="eventUnDisposedListMap" type="com.epmet.dto.result.EventListResultDTO">
+        <id property="eventId" column="eventId"/>
         <result property="eventContent" column="eventContent"/>
-        <result property="eventId" column="eventId"/>
         <result property="eventTime" column="eventTime"/>
         <result property="isProject" column="isProject"/>
         <result property="redDot" column="redDot"/>
@@ -36,25 +36,29 @@
         and ro.ORG_ID = #{orgId}
         <if test='eventType == "undisposed" '>
             AND ro.ORG_READ = 'un_read'
-            ORDER BY re.CREATED_TIME
         </if>
         <if test='eventType == "processed" '>
             AND ro.ORG_READ = 'read'
             AND re.`STATUS` = 'processing'
-            ORDER BY re.LATEST_OPERATED_TIME DESC
         </if>
         <if test='eventType == "transferred" '>
             AND ro.ORG_READ = 'read'
             AND re.`STATUS` = 'closed_case'
-            ORDER BY re.CLOSE_CASE_TIME DESC
         </if>
         )t
         LEFT JOIN resi_event_attachment rea
-        ON (rea.RESI_EVENT_ID = t.eventId
-                AND rea.DEL_FLAG = '0'
-                AND rea.ATTACHMENT_TYPE = 'image'
-                AND (rea.SORT = 3 OR rea.SORT = 1 OR rea.SORT = 2))
-        order by rea.sort asc
+        ON (rea.RESI_EVENT_ID = t.eventId)
+        where  rea.DEL_FLAG = '0'
+        AND rea.ATTACHMENT_TYPE = 'image'
+        <if test='eventType == "undisposed" '>
+            ORDER BY t.eventTime,rea.sort asc
+        </if>
+        <if test='eventType == "processed" '>
+            ORDER BY t.eventTime DESC,rea.sort asc
+        </if>
+        <if test='eventType == "transferred" '>
+            ORDER BY t.eventTime DESC,rea.sort asc
+        </if>
     </select>