LAPTOP-FO2T5SIU\35838 6 månader sedan
förälder
incheckning
47b71dde3b

+ 3 - 3
pro-base/src/main/java/com/idea/buildManage/service/ParkInfoService.java

@@ -232,7 +232,7 @@ public class ParkInfoService implements BaseService<ParkInfo, ParkInfoExample> {
                     children.put("value", parkFloorDisc.getId());
                     //楼栋
                     MnpBuildingExample buildingExample = new MnpBuildingExample();
-                    buildingExample.setOrderByClause("created_at desc");
+                    buildingExample.setOrderByClause("build_num + 0");
                     buildingExample.createCriteria().andDiscIdEqualTo(parkFloorDisc.getId());
                     List<MnpBuilding> parkBuilds = mnpBuildingService.selectByExample(buildingExample);
                     if (null != parkBuilds && parkBuilds.size() > 0) {
@@ -244,7 +244,7 @@ public class ParkInfoService implements BaseService<ParkInfo, ParkInfoExample> {
                             parkBuildChildren.put("value", parkBuild.getId());
                             //房间
                             ParkRoomExample parkRoomExample = new ParkRoomExample();
-                            parkRoomExample.setOrderByClause("created_at desc");
+                            parkRoomExample.setOrderByClause("room_no + 0");
                             parkRoomExample.createCriteria().andBuildIdEqualTo(parkBuild.getId());
                             List<ParkRoom> parkRooms = parkRoomService.selectByExample(parkRoomExample);
                             if (null != parkRooms && parkRooms.size() > 0) {
@@ -291,7 +291,7 @@ public class ParkInfoService implements BaseService<ParkInfo, ParkInfoExample> {
                     children.put("value", parkFloorDisc.getId());
                     //楼栋
                     MnpBuildingExample buildingExample = new MnpBuildingExample();
-                    buildingExample.setOrderByClause("created_at desc");
+                    buildingExample.setOrderByClause("build_num + 0");
                     buildingExample.createCriteria().andDiscIdEqualTo(parkFloorDisc.getId());
                     List<MnpBuilding> parkBuilds = mnpBuildingService.selectByExample(buildingExample);
                     if (null != parkBuilds && parkBuilds.size() > 0) {

+ 1 - 1
pro-base/src/main/resources/mybatis/buildManage/MnpBuildingExtendMapper.xml

@@ -45,7 +45,7 @@
         and mnp_building.id = #{nodeId}
       </if>
     </where>
-    order by park_floor_disc.created_at desc,park_floor_disc.created_at desc,mnp_building.created_at desc
+    order by park_info.created_at desc,park_floor_disc.name,mnp_building.build_num + 0
   </select>
 
   <select id="selectByCompanyId" resultType="com.idea.buildManage.dto.MnpBuildingDto">

+ 1 - 1
pro-base/src/main/resources/mybatis/buildManage/ParkFloorDiscExtendMapper.xml

@@ -23,7 +23,7 @@
                 and d.id = #{nodeId}
             </if>
         </where>
-        order by created_at desc
+        order by i.created_at,d.name
     </select>
 
     <select id="selectByGroupId" resultType="com.idea.buildManage.model.ParkFloorDisc">

+ 1 - 1
pro-base/src/main/resources/mybatis/buildManage/ParkRoomExtendMapper.xml

@@ -49,7 +49,7 @@
         and r.id = #{nodeId}
       </if>
     </where>
-    order by p.created_at desc,d.created_at desc,b.created_at desc,r.created_at desc
+    order by p.created_at desc,d.name,b.build_num + 0,r.room_no + 0
 
   </select>