wang_xy 1 год назад
Родитель
Сommit
e4e589f234

+ 2 - 1
ruoyi-zdsz/src/main/resources/mapper/zdsz/ZAreaMapper.xml

@@ -32,7 +32,8 @@
     <select id="getArea" resultType="com.ruoyi.zdsz.domain.vo.ZAreaVo">
         select
         a.id,
-        a.name
+        a.name,
+        a.administrative
         from z_area a
         where a.del_flag = '0'
         <if test="district != null and district != ''">

+ 2 - 2
ruoyi-zdsz/src/main/resources/mapper/zdsz/ZBuildingMapper.xml

@@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="areaId != null and areaId != ''">
             and a.area_id = #{areaId}
         </if>
-        order by a.name asc
+        order by CONVERT(REPLACE(a.name,'栋',''),UNSIGNED) asc
     </select>
 
     <select id="getPageList" resultType="com.ruoyi.zdsz.domain.vo.ZBuildingVo">
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and a.area_id = #{p.areaId}
             </if>
         </where>
-        order by b.name,a.name asc
+        order by b.name,CONVERT(REPLACE(a.name,'栋',''),UNSIGNED) asc
     </select>
 
 </mapper>

+ 2 - 2
ruoyi-zdsz/src/main/resources/mapper/zdsz/ZHouseMapper.xml

@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and a.source = #{p.source}
             </if>
         </where>
-        order by b.name,c.name,d.name,a.name asc
+        order by b.name,CONVERT(REPLACE(c.name,'栋',''),UNSIGNED),CONVERT(REPLACE(d.name,'单元',''),UNSIGNED),CONVERT(REPLACE(a.name,'号',''),UNSIGNED) asc
     </select>
 
 
@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="unitId != null  and unitId != ''">
             and a.unit_id = #{unitId}
         </if>
-        order by a.name asc
+        order by CONVERT(REPLACE(a.name,'号',''),UNSIGNED) asc
     </select>
     <select id="selectHouseId" resultType="com.ruoyi.zdsz.domain.ZHouse">
         select

+ 2 - 2
ruoyi-zdsz/src/main/resources/mapper/zdsz/ZUnitMapper.xml

@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="buildingId != null and buildingId != ''">
             and a.building_id = #{buildingId}
         </if>
-        order by a.name asc
+        order by CONVERT(REPLACE(a.name,'单元',''),UNSIGNED) asc
     </select>
 
     <select id="getPageList" resultType="com.ruoyi.zdsz.domain.vo.ZUnitVo">
@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and a.building_id = #{p.buildingId}
             </if>
         </where>
-        order by b.name,c.name,a.name asc
+        order by b.name,CONVERT(REPLACE(c.name,'栋',''),UNSIGNED),CONVERT(REPLACE(a.name,'单元',''),UNSIGNED) asc
     </select>
 
 </mapper>