优化代码

java110-bean/src/main/java/com/java110/vo/api/ApiUnitVo.java

@@ -41,6 +41,8 @@ public class ApiUnitVo implements Serializable {
     //创建时间
     private String createTime;
 
+    private int seq;
+
 
     public String getUnitId() {
         return unitId;
@@ -121,4 +123,12 @@ public class ApiUnitVo implements Serializable {
     public void setFloorNum(String floorNum) {
         this.floorNum = floorNum;
     }
+
+    public int getSeq() {
+        return seq;
+    }
+
+    public void setSeq(int seq) {
+        this.seq = seq;
+    }
 }

java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml

@@ -244,7 +244,7 @@
     <!-- 查询小区单元信息 add by wuxw 2018-07-03 -->
     <select id="queryFloorAndUnits" parameterType="Map" resultType="Map">
         select t.floor_id,t.floor_id floorId,bu.layer_count,bu.layer_count layerCount,bu.unit_id,bu.unit_id
-        unitId,bu.unit_num,bu.unit_num unitNum,bu.lift,bu.remark,bu.unit_area,bu.unit_area unitArea,t.floor_num floorNum
+        unitId,bu.unit_num,bu.unit_num unitNum,bu.lift,bu.remark,bu.unit_area,bu.unit_area unitArea,t.floor_num floorNum,t.seq
         from f_floor t
         left join building_unit bu on t.`floor_id` = bu.`floor_id` and bu.status_cd = '0'
         where 1 =1
@@ -267,7 +267,7 @@
         <if test="lift !=null and lift != ''">
             and bu.lift= #{lift}
         </if>
-        order by t.seq,unitNum asc
+        order by t.seq,bu.unit_num asc
         <!-- <if test="page != -1 and page != null ">
              limit #{page}, #{row}
          </if>limit 10;-->

java110-db/src/main/resources/mapper/community/UnitServiceDaoImplMapper.xml

@@ -127,7 +127,7 @@
         <if test="userId !=null and userId != ''">
             and t.user_id= #{userId}
         </if>
-        order by unitNum asc
+        order by ff.seq,t.unit_id asc
        <!-- <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>limit 10;-->