From 9d9db343dea154f8101a2ee70c7e41503fe78415 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Wed, 22 Jun 2022 14:49:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E7=AD=94=E6=9F=A5=E8=AF=A2=20?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../askQuestions/AskQuestionsMapper.xml       | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml
index 9496b060..bf96e138 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml
@@ -91,9 +91,9 @@
 
     <select id="getReplyDetails" resultType="com.adc.da.slrs.StandardQA.entity.AskQuestions">
             SELECT
-            DISTINCT
             aq.STANDARD_ID,aq.CLASSIFICATION,aq.STANDARD_ENCDOING,
-            aq.STANDARD_NAME
+            aq.STANDARD_NAME,
+            MAX(aq.QUESTION_TIME) as questionTime
             FROM ask_questions aq
             LEFT JOIN reply ON aq.ID = reply.ASK_ID AND reply.STATE = '0'
             LEFT JOIN ts_user t1 ON t1.USID = aq.QUESTIONER
@@ -107,6 +107,13 @@
                     AND aq.CLASSIFICATION = #{askQuestions.classification}
                 </if>
             </where>
+            GROUP BY
+            aq.STANDARD_ID,
+            aq.CLASSIFICATION,
+            aq.STANDARD_ENCDOING,
+            aq.STANDARD_NAME
+            ORDER BY
+            questionTime DESC
     </select>
 
     <select id="getReplyDetailsByStandId" resultType="com.adc.da.slrs.StandardQA.entity.AskQuestions">
@@ -127,8 +134,8 @@
 
     <select id="getAskQuestionsBySubscription" resultType="com.adc.da.slrs.StandardQA.entity.AskQuestions">
         SELECT
-        DISTINCT
-        aq.STANDARD_ID,aq.CLASSIFICATION,aq.STANDARD_ENCDOING,aq.STANDARD_NAME
+        aq.STANDARD_ID,aq.CLASSIFICATION,aq.STANDARD_ENCDOING,aq.STANDARD_NAME,
+        MAX(aq.QUESTION_TIME) as questionTime
         FROM ask_questions aq
         LEFT JOIN reply ON aq.ID = reply.ASK_ID
         LEFT JOIN ts_user t1 ON t1.USID = aq.QUESTIONER
@@ -142,6 +149,13 @@
                 AND aq.CLASSIFICATION = #{askQuestions.classification}
             </if>
         </where>
+        GROUP BY
+        aq.STANDARD_ID,
+        aq.CLASSIFICATION,
+        aq.STANDARD_ENCDOING,
+        aq.STANDARD_NAME
+        ORDER BY
+        questionTime DESC
     </select>
 
     <select id="retrieve" resultType="com.adc.da.slrs.StandardQA.entity.AskQuestions">