楼栋导出排序调整

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml

@@ -169,7 +169,11 @@
                 AND a.DEL_FLAG = #{building.delFlag}
             </if>
         </where>
-        order by a.CREATED_TIME, a.BUILDING_NAME
+        <if test='sortType == null '>a.sort,</if>
+        <if test='sortType != null and sortType == "asc" '>a.sort,</if>
+        <if test='sortType != null and 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>
 
     <select id="selectAgencyChildrenList" resultType="com.epmet.entity.CustomerAgencyEntity">