From 5d8bed9af2a26ba23ed4eb7fa461e55b9fc0f420 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Wed, 18 Oct 2023 11:56:19 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E5=86=85=E5=A4=96=E9=83=A8=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E6=A8=A1=E5=9D=97=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/InsideOutsideMeetingVO.java                 |  4 ++--
 .../service/impl/InsideOutsideMeetingServiceImpl.java  | 10 ++++++++++
 .../InsideOntSideMeeting/InsideOntSideMeeting.xml      | 10 +++++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java
index 4195217c..7db87388 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java
@@ -63,9 +63,9 @@ public class InsideOutsideMeetingVO extends BasePage {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date modifyTime;
 
-    private String sortField;
+    private String sortField = "ID";
 
-    private String sortMode;
+    private String sortMode = "asc";
 
     private String meetingTimeOperator = "=";
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java
index 4a55507d..473cb233 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java
@@ -9,6 +9,7 @@ import com.adc.da.slrs.InsideOntSideMeeting.service.MeetingTopicService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang.WordUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -106,6 +107,15 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl<InsideOutsideMe
         if (StringUtils.isNotBlank(page.getParticipants())) {
             page.setParticipantsList(Arrays.asList(page.getParticipants().split(",")));
         }
+        // 设置排序字段
+        if (StringUtils.isNotBlank(page.getSortField())) {
+            // 小驼峰变成 ABC_DEF
+            String sortField = StringUtils.join(StringUtils.splitByCharacterTypeCamelCase(page.getSortField()),"_").toUpperCase();
+            page.setSortField(sortField);
+        } else {
+            page.setSortField("ID");
+            page.setSortMode("asc");
+        }
         Integer rowCount = this.baseMapper.queryByPageCount(page);
         page.getPager().setRowCount(rowCount);
         return this.baseMapper.queryByPage(page);
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml
index 42f3fbec..890f9489 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml
@@ -102,7 +102,15 @@
         where iom.VALID_FLAG = 0
         <include refid="Base_Where_Clause" />
         <include refid="MeetingTopic_where" />
-        order by #{sortField} #{sortMode}
+        order by
+        <choose>
+        <when test="sortField == 'AGENDA_NAME'">
+            mt.${sortField} ${sortMode}
+        </when>
+        <otherwise>
+            iom.${sortField} ${sortMode}
+        </otherwise>
+    </choose>
         limit ${pager.startIndex-1},${pageSize}
     </select>
 </mapper>
\ No newline at end of file