From 0453a08e8be0ee199538e64e25ab16b3ff212310 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 6 Aug 2021 13:28:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ResiEventDao.xml     | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index 6b0faf49c0..0c1808eae9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -18,7 +18,15 @@
         SELECT IFNULL(rea.ATTACHMENT_URL,'') AS img,t.* FROM
         (SELECT
         re.EVENT_CONTENT AS eventContent,
-        IFNULL(DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i'),'') AS eventTime,
+        <if test='eventType == "undisposed" '>
+            IFNULL(DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i'),'') AS eventTime,
+        </if>
+        <if test='eventType == "processed" '>
+            IFNULL(DATE_FORMAT(re.LATEST_OPERATED_TIME,'%Y-%m-%d %H:%i'),'') AS eventTime,
+        </if>
+        <if test='eventType == "transferred" '>
+            IFNULL(DATE_FORMAT(re.CLOSE_CASE_TIME,'%Y-%m-%d %H:%i'),'') AS eventTime,
+        </if>
         re.ID AS eventId,
         (CASE WHEN re.SHIFT_PROJECT = 1 THEN TRUE ELSE FALSE END) AS isProject,
         (CASE WHEN ro.RED_DOT = 1 THEN TRUE ELSE FALSE END) AS redDot
@@ -33,12 +41,12 @@
         <if test='eventType == "processed" '>
             AND ro.ORG_READ = 'read'
             AND re.`STATUS` = 'processing'
-            ORDER BY re.LATEST_OPERATED_TIME
+            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
+            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 = 0 OR rea.SORT = 1 OR rea.SORT = 2))