From 1caf1b92444329586e94aff76b0eb44efac4695f Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 6 May 2022 10:08:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=EF=BC=8C=E6=88=BF=E5=B1=8B?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=80=92=E5=BA=8F=E6=AD=A3?=
 =?UTF-8?q?=E5=BA=8F=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/form/IcBuildingListFormDTO.java  | 5 +++++
 .../src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java | 4 ++++
 .../src/main/resources/mapper/IcBuildingDao.xml              | 4 +++-
 .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml  | 4 +++-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBuildingListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBuildingListFormDTO.java
index 249a7d4c42..18aa756a8c 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBuildingListFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBuildingListFormDTO.java
@@ -26,4 +26,9 @@ public class IcBuildingListFormDTO extends PageFormDTO {
      * 房主电话
      */
     private String ownerPhone;
+
+    /**
+     * asc：正序，desc：倒序
+     */
+    private String sortType;
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java
index 7fdbf31cc5..b57f0bdadc 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java
@@ -65,5 +65,9 @@ public class IcHouseListFormDTO extends PageFormDTO {
      */
     private String keyword;
 
+    /**
+     * asc：正序，desc：倒序
+     */
+    private String sortType;
 
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
index 2f1659d4f4..482deeccea 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
@@ -121,7 +121,9 @@
             </if>
             AND a.DEL_FLAG = '0'
         </where>
-        ORDER BY a.sort,
+        ORDER BY
+        <if test='sortType == "asc" '>a.sort,</if>
+        <if test='sortType == "desc" '>a.sort DESC,</if>
         CAST(b.NEIGHBOR_HOOD_NAME AS SIGNED),CONVERT(b.NEIGHBOR_HOOD_NAME using gbk),
         CAST(a.BUILDING_NAME AS SIGNED),CONVERT(a.BUILDING_NAME USING gbk)
     </select>
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index d4662df72d..514b0629ac 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -158,7 +158,9 @@
            and a.del_flag = '0'
         </where>
        #排序规则：根据小区、楼栋、单元、门牌号(分别按照数字和中文)分别升序排序
-        ORDER BY a.sort,
+        ORDER BY
+        <if test='sortType == "asc" '>a.sort,</if>
+        <if test='sortType == "desc" '>a.sort DESC,</if>
         CONVERT(c.NEIGHBOR_HOOD_NAME using gbk),
         CONVERT(b.BUILDING_NAME USING gbk),
         CONVERT(d.UNIT_NAME USING gbk),