Merge remote-tracking branch 'origin/dev_resi_export' into develop

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

@@ -120,7 +120,10 @@
             </if>
             AND a.DEL_FLAG = '0'
         </where>
-        order by a.CREATED_TIME, a.BUILDING_NAME
+#         order by a.CREATED_TIME, a.BUILDING_NAME
+        #排序规则：根据小区、楼栋、单元、门牌号(分别按照数字和中文)分别升序排序
+        ORDER BY CONVERT(b.NEIGHBOR_HOOD_NAME using gbk),
+        CONVERT(a.BUILDING_NAME USING gbk)
     </select>
     <select id="searchAllBuilding" resultType="com.epmet.excel.IcBuildingExcel">
         select

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

@@ -143,7 +143,8 @@
             AND a.DEL_FLAG = '0'
 
         </where>
-        ORDER BY a.CREATED_TIME
+#         ORDER BY a.CREATED_TIME
+        ORDER BY CONVERT(a.NEIGHBOR_HOOD_NAME using gbk)
     </select>
     <select id="searchAllNeighborhood" resultType="com.epmet.excel.IcNeighborHoodExcel">
         select

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java

@@ -73,7 +73,7 @@ import java.util.stream.Collectors;
 
 /**
  * @ClassName IcResiUserImportServiceImpl
- * @Description TODO
+ * @Description 居民信息导入 服务实现类
  * @Author wangxianzhang
  * @Date 2021/11/4 8:53 下午
  * @Version 1.0