From eff9db54d75fdeb1299647b397b81e428a53f5f0 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 11 Jan 2024 17:22:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2080504=20=E4=BC=81=E6=A0=87=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E4=BC=9A=E8=AE=B0=E5=BD=95--=E5=88=97=E8=A1=A8--?=
 =?UTF-8?q?=E5=B9=B3=E5=9D=87=E6=80=BB=E5=88=86=E6=8E=92=E5=BA=8F=E6=9C=AA?=
 =?UTF-8?q?=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enterprise/entity/dto/ESQueryCommonDTO.java    | 10 ++++++++++
 ...EnterpriseStandardReviewMeetingRecordMapper.xml | 14 ++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESQueryCommonDTO.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESQueryCommonDTO.java
index 5d582121..c4a9dc8d 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESQueryCommonDTO.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESQueryCommonDTO.java
@@ -59,11 +59,21 @@ public class ESQueryCommonDTO {
     @ApiModelProperty(value = "评审会-评审开始日期")
     private Date reviewStartDate;
 
+    public String getOrder() {
+        if (StrUtil.isBlank(order)) {
+            return "desc";
+        }
+        return order;
+    }
+
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "评审会-评审结束日期")
     private Date reviewEndDate;
 
+    @ApiModelProperty(value = "评审会-列表排序规则")
+    private String order;
+
     // 稽查
 
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
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 7174dd22..935e8e2d 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
@@ -75,10 +75,16 @@
         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;
+            <!--排序规则-->
+            <if test="param.order != null and param.order != ''">
+                <if test="param.order == 'asc'">
+                    avgScore,
+                </if>
+                <if test="param.order == 'desc'">
+                    avgScore DESC,
+                </if>
+            </if>
+            rmr.create_time DESC
     </select>
 
     <select id="getAvgScore" resultType="java.lang.String">