From 9b0e939ad7597e358ce5ab02775f33409dafe236 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Wed, 8 Jun 2022 18:12:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=92=E5=BA=8F=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/opendata/service/impl/CaLoudongServiceImpl.java | 4 ++--
 .../epmet/opendata/service/impl/CaPingfangServiceImpl.java    | 4 ++--
 .../com/epmet/opendata/service/impl/CaRentalServiceImpl.java  | 4 ++--
 .../epmet/opendata/service/impl/CaRotatorsServiceImpl.java    | 4 ++--
 .../src/main/resources/mapper/CaLoudongDao.xml                | 3 ++-
 .../src/main/resources/mapper/CaPingfangDao.xml               | 3 ++-
 .../src/main/resources/mapper/CaRentalDao.xml                 | 3 ++-
 .../src/main/resources/mapper/CaResidentDao.xml               | 3 ++-
 .../src/main/resources/mapper/CaRotatorsDao.xml               | 3 ++-
 9 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java
index bd2f41b004..1a6635ce15 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java
@@ -142,7 +142,7 @@ public class CaLoudongServiceImpl extends BaseServiceImpl<CaLoudongDao, CaLoudon
         dto.setTableName(CaWghDataConstant.UNICOM_LOUDONG);
 
         dto.setWhereCase("delete_flag = 'normal'");
-        dto.setOrderBy("grid_id,update_date desc");
+        dto.setOrderBy("grid_id,update_date,building_id desc");
 
         int pageNo = 1;
 
@@ -199,4 +199,4 @@ public class CaLoudongServiceImpl extends BaseServiceImpl<CaLoudongDao, CaLoudon
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java
index 541726c478..0548e945b2 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java
@@ -122,7 +122,7 @@ public class CaPingfangServiceImpl extends BaseServiceImpl<CaPingfangDao, CaPing
         dto.setTableName(CaWghDataConstant.UNICOM_PINGFANG);
 
         dto.setWhereCase("delete_flag = 'normal'");
-        dto.setOrderBy("grid_id,update_date desc");
+        dto.setOrderBy("grid_id,update_date,building_id desc");
 
         int pageNo = 1;
 
@@ -185,4 +185,4 @@ public class CaPingfangServiceImpl extends BaseServiceImpl<CaPingfangDao, CaPing
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java
index 6cb0e53410..bed5bf44aa 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java
@@ -127,7 +127,7 @@ public class CaRentalServiceImpl extends BaseServiceImpl<CaRentalDao, CaRentalEn
         dto.setTableName(CaWghDataConstant.UNICOM_RENTAL);
 
         dto.setWhereCase("delete_flag = 'normal'");
-        dto.setOrderBy("grid_id,update_date desc");
+        dto.setOrderBy("grid_id,update_date,rental_id desc");
 
         int pageNo = 1;
 
@@ -191,4 +191,4 @@ public class CaRentalServiceImpl extends BaseServiceImpl<CaRentalDao, CaRentalEn
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java
index 71ebb9a3da..31da98c142 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java
@@ -129,7 +129,7 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl<CaRotatorsDao, CaRota
         dto.setTableName(CaWghDataConstant.UNICOM_ROTATORS);
 
         dto.setWhereCase("delete_flag = 'normal'");
-        dto.setOrderBy("grid_id,update_date desc");
+        dto.setOrderBy("grid_id,update_date,rotators_id desc");
 
         int pageNo = 1;
 
@@ -217,4 +217,4 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl<CaRotatorsDao, CaRota
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml
index 613665cd44..a29a8929a0 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml
@@ -94,6 +94,7 @@
                 AND building_name like '%${buildingName}%'
             </if>
         </where>
+        order by grid_id,building_id,community_id desc
     </select>
     <select id="getLouDongDetails" resultType="com.epmet.opendata.dto.result.CaLoudongDetailsResultDTO">
     SELECT
@@ -109,4 +110,4 @@
     </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml
index 9bf92f78ab..99c8195b49 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml
@@ -91,6 +91,7 @@
                 AND community_name like '%${communityName}%'
             </if>
         </where>
+        order by grid_id,building_id,community_id desc
     </select>
     <select id="getPingFangDetails" resultType="com.epmet.opendata.dto.result.CaPingFangDetailsResultDTO">
         select
@@ -106,4 +107,4 @@
     </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml
index c7dda007dc..280159ef30 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml
@@ -86,6 +86,7 @@
                 AND renter_name like '%${renterName}%'
             </if>
         </where>
+        order by grid_id,rental_id,id_card desc
     </select>
     <select id="getRentalDetails" resultType="com.epmet.opendata.dto.result.CaRentalDetailsResultDTO">
         SELECT
@@ -101,4 +102,4 @@
     </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml
index 33041e3a96..233e2cea5f 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml
@@ -114,6 +114,7 @@
                     AND telephone like '%${telephone}%'
                 </if>
             </where>
+            order by grid_id,resident_id,id_card desc
     </select>
     <select id="getResidentDetails" resultType="com.epmet.opendata.dto.result.CaResidentDetailsResultDTO">
         select
@@ -129,4 +130,4 @@
     </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml
index d54fe39738..77146469c5 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml
@@ -118,6 +118,7 @@
                     AND telephone like '%${telephone}%'
                 </if>
             </where>
+            order by grid_id,rotators_id,id_card desc
     </select>
     <select id="getRotatorsDetails" resultType="com.epmet.opendata.dto.result.CaRotatorsDetailsResultDTO">
         select
@@ -133,4 +134,4 @@
     </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>