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

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingErrorInfoModel.java

@@ -12,6 +12,9 @@ import lombok.Data;
 @Data
 public class BuildingErrorInfoModel {
 
+    @Excel(name = "行号", width = 20)
+    private Integer num;
+
     @Excel(name = "小区名称" , width = 20)
     private String neighborHoodName;
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java

@@ -1,5 +1,6 @@
 package com.epmet.model;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
@@ -35,4 +36,7 @@ public class BuildingInfoModel {
     @ExcelProperty(value = "户数")
     private Integer totalHouseNum;
 
+    @ExcelIgnore
+    private Integer num;
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseErrorInfoModel.java

@@ -13,7 +13,7 @@ import org.hibernate.validator.constraints.Length;
 @Data
 public class HouseErrorInfoModel {
 
-    @Excel(name = "行号(不计算表头)", width = 20)
+    @Excel(name = "行号", width = 20)
     private Integer num;
 
     @Excel(name = "所属小区", width = 20)

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java

@@ -86,6 +86,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
         ImportGeneralDTO dto = ConvertUtils.sourceToTarget(data, ImportGeneralDTO.class);
         dto.setNum(num);
         dto.setCustomerId(formDTO.getCustomerId());
+        info.setNum(num);
         if(StringUtils.isBlank(data.getAgencyName())){
             nums.add(num);
             disposeErrorMsg(info, "所属组织的值未填写");
@@ -384,6 +385,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
     public void disposeErrorMsg(BuildingInfoModel data,String msg){
         BuildingErrorInfoModel err = ConvertUtils.sourceToTarget(data, BuildingErrorInfoModel.class);
         err.setErrorMsg(msg);
+        err.setNum(err.getNum() + NumConstant.ONE);
         errorInfos.add(err);
     }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java

@@ -208,6 +208,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
     public void disposeErrorMsg(HouseInfoModel data,String msg){
         HouseErrorInfoModel err = ConvertUtils.sourceToTarget(data, HouseErrorInfoModel.class);
         err.setErrorMsg(msg);
+        err.setNum(err.getNum() + NumConstant.ONE);
         errorInfos.add(err);
     }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java

@@ -86,6 +86,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
         }
         info = data;
         num = num + NumConstant.ONE;
+        info.setNum(num);
         if (StringUtils.isBlank(data.getNeighborHoodName()) ||
                 StringUtils.isBlank(data.getGridName()) || StringUtils.isBlank(data.getAgencyName()) || StringUtils.isBlank(data.getAddress())){
             nums.add(num);
@@ -333,6 +334,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
     public void disposeErrorMsg(NeighborHoodInfoModel data,String msg){
         NeighborHoodErrorInfoModel err = ConvertUtils.sourceToTarget(data, NeighborHoodErrorInfoModel.class);
         err.setErrorMsg(msg);
+        err.setNum(err.getNum() + NumConstant.ONE);
         errorInfos.add(err);
     }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodErrorInfoModel.java

@@ -12,6 +12,9 @@ import lombok.Data;
 @Data
 public class NeighborHoodErrorInfoModel {
 
+    @Excel(name = "行号", width = 20)
+    private Integer num;
+
     @Excel(name = "小区名称", width = 20)
     private String neighborHoodName;
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java

@@ -1,5 +1,6 @@
 package com.epmet.model;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
@@ -29,4 +30,7 @@ public class NeighborHoodInfoModel {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    @ExcelIgnore
+    private Integer num;
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java

@@ -181,7 +181,7 @@ public class BuildingServiceImpl implements BuildingService {
         List<String> gridIdList = customerGridList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList());
         LambdaQueryWrapper<IcNeighborHoodEntity> queryWrapper = new QueryWrapper<IcNeighborHoodEntity>().lambda()
                 .in(IcNeighborHoodEntity::getGridId, gridIdList)
-                .last("ORDER BY CAST(NEIGHBOR_HOOD_NAME AS SIGNED), CONVERT(NEIGHBOR_HOOD_NAME using gbk)");
+                .orderByAsc(IcNeighborHoodEntity::getCreatedTime);
         List<IcNeighborHoodEntity> icNeighborHoodList = icNeighborHoodDao.selectList(queryWrapper);
         if(CollectionUtils.isEmpty(icNeighborHoodList)){
             agencyList.addAll(gridList);
@@ -205,8 +205,7 @@ public class BuildingServiceImpl implements BuildingService {
         List<String> neighborHoodIdList = icNeighborHoodList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList());
         LambdaQueryWrapper<IcBuildingEntity> buildingQueryWrapper = new QueryWrapper<IcBuildingEntity>().lambda()
                 .in(IcBuildingEntity::getNeighborHoodId, neighborHoodIdList)
-                .last("ORDER BY CAST(BUILDING_NAME AS SIGNED), CONVERT(BUILDING_NAME using gbk)");
-                //.orderByAsc(IcBuildingEntity::getCreatedTime,IcBuildingEntity::getBuildingName);
+                .orderByAsc(IcBuildingEntity::getCreatedTime,IcBuildingEntity::getBuildingName);
         List<IcBuildingEntity> icBuildingList = icBuildingDao.selectList(buildingQueryWrapper);
 
         if(CollectionUtils.isEmpty(neighborHoodIdList)){

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java

@@ -120,7 +120,7 @@ public class IcBuildingServiceImpl extends BaseServiceImpl<IcBuildingDao, IcBuil
         }
         LambdaQueryWrapper<IcBuildingEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IcBuildingEntity::getNeighborHoodId, neighborHoodId);
-        wrapper.last("ORDER BY CAST(BUILDING_NAME AS SIGNED),CONVERT ( BUILDING_NAME USING gbk ) ASC");
+        wrapper.last("ORDER BY CONVERT ( BUILDING_NAME USING gbk ) ASC");
         List<IcBuildingEntity> list = baseDao.selectList(wrapper);
         if(CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();
@@ -153,4 +153,4 @@ public class IcBuildingServiceImpl extends BaseServiceImpl<IcBuildingDao, IcBuil
         return ConvertUtils.sourceToTarget(entity, IcBuildingDTO.class);
     }
 
-}
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java

@@ -118,7 +118,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         LambdaQueryWrapper<IcHouseEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(formDTO.getBuildingId()), IcHouseEntity::getBuildingId, formDTO.getBuildingId());
         wrapper.eq(StringUtils.isNotBlank(formDTO.getUnitId()), IcHouseEntity::getBuildingUnitId, formDTO.getUnitId());
-        wrapper.last("ORDER BY CAST(DOOR_NAME AS SIGNED), CONVERT (DOOR_NAME USING gbk )");
+        wrapper.last("ORDER BY CONVERT ( HOUSE_NAME USING gbk ) ASC");
         List<IcHouseEntity> list = baseDao.selectList(wrapper);
         if(CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();
@@ -160,7 +160,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         //查询楼栋下房屋列表
         LambdaQueryWrapper<IcHouseEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IcHouseEntity::getBuildingId, formDTO.getBuildingId());
-        wrapper.last("ORDER BY ORDER BY CAST(DOOR_NAME AS SIGNED), CONVERT (DOOR_NAME USING gbk ), CONVERT ( HOUSE_NAME USING gbk ) ASC");
+        wrapper.last("ORDER BY CONVERT ( HOUSE_NAME USING gbk ) ASC");
         List<IcHouseEntity> list = baseDao.selectList(wrapper);
         if(CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();
@@ -246,4 +246,4 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         return baseDao.getHousesNameByIdCards(idCards);
     }
 
-}
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java

@@ -195,7 +195,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         LambdaQueryWrapper<IcNeighborHoodEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(agencyId),IcNeighborHoodEntity::getAgencyId, agencyId);
         wrapper.eq(StringUtils.isNotBlank(gridId), IcNeighborHoodEntity::getGridId, gridId);
-        wrapper.last("ORDER BY CAST(NEIGHBOR_HOOD_NAME AS SIGNED), CONVERT(NEIGHBOR_HOOD_NAME using gbk)");
+        wrapper.last("ORDER BY CONVERT ( NEIGHBOR_HOOD_NAME USING gbk ) ASC");
         List<IcNeighborHoodEntity> list = baseDao.selectList(wrapper);
         if(CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();

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

@@ -106,9 +106,7 @@
             </if>
             AND a.DEL_FLAG = '0'
         </where>
-        order by
-            CAST(a.BUILDING_NAME AS SIGNED),
-            CONVERT(a.BUILDING_NAME using gbk)
+        order by a.CREATED_TIME, a.BUILDING_NAME
     </select>
     <select id="searchAllBuilding" resultType="com.epmet.excel.IcBuildingExcel">
         select

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

@@ -142,8 +142,7 @@
         </where>
        #排序规则：根据小区、楼栋、单元、门牌号(分别按照数字和中文)分别升序排序
         ORDER BY CONVERT(c.NEIGHBOR_HOOD_NAME using gbk),
-        CAST(b.BUILDING_NAME AS SIGNED),
-        CONVERT(b.BUILDING_NAME using gbk),
+        CONVERT(b.BUILDING_NAME USING gbk),
         CONVERT(d.UNIT_NAME USING gbk),
         CAST(a.DOOR_NAME AS SIGNED),
         CONVERT(a.DOOR_NAME using gbk)