From 79bafbad28d734cb0f35ad7a839c4a343ceed4f2 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 3 Jan 2024 14:11:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E5=BA=93=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=8C=89=E7=85=A7=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=80=92=E5=BA=8F=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml     | 1 +
 .../mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml
index b9b84cae..c964f13e 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml
@@ -191,6 +191,7 @@
                     #{item}
                 </foreach>
             </if>
+        ORDER BY p.create_time DESC
     </select>
 
     <select id="getDetailById" resultType="com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan">
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml
index af5cc060..7174dd22 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml
@@ -72,9 +72,10 @@
         <if test="param.reviewStartDate != null and param.reviewEndDate != null">
             AND rmr.review_date BETWEEN #{param.reviewStartDate} AND #{param.reviewEndDate}
         </if>
-        GROUP BY rmr.id,
+        GROUP BY rmr.id, rmr.create_time,
                  rmr.review_date, esp.qualityFlag, score.avg_score_item1, score.avg_score_item2, score.avg_score_item3, score.avg_score_item4, score.avg_score_item5, score.avg_score_item6
         ORDER BY
+            rmr.create_time DESC,
             avgScore DESC,
             score.avg_score_item2 DESC,
             score.avg_score_item4 DESC;