去除排序

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java

@@ -73,11 +73,6 @@ public class IcHouseDTO implements Serializable {
      */
 	private String doorName;
 
-    /**
-     * 排序
-     */
-    private Integer sort;
-
     /**
      * 房屋类型，这里存储字典value就可以
      */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java

@@ -73,11 +73,6 @@ public class IcHouseEntity extends BaseEpmetEntity {
      */
 	private String doorName;
 
-	/**
-	 * 排序
-	 */
-	private Integer sort;
-
     /**
      * 房屋类型，这里存储字典value就可以
      */

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

@@ -50,9 +50,6 @@ public class HouseInfoModel {
     @ExcelProperty(value = "房主身份证")
     private String ownerIdCard;
 
-    @ExcelProperty(value = "排序")
-    private Integer sort;
-
     @ExcelIgnore
     private Integer num;
 

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

@@ -154,11 +154,6 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             disposeErrorMsg(info, "房主身份证的长度超出限制");
             return;
         }
-        if (null != data.getSort() && !isNumber(data.getSort().toString())){
-            nums.add(num);
-            disposeErrorMsg(info, "排序格式不正确");
-            return;
-        }
         /**
          * 2022-03-29 需求改动，单元号修改 eg 1 改为 1单元
          * 做限制，此字段中必须带有 "单元"2字，不存在就不给导入
@@ -212,18 +207,6 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         }
     }
 
-    public boolean isNumber(String str) {
-        if(str.length()>0) {
-            Pattern pattern = Pattern.compile("[0-9]*");
-            Matcher isNum = pattern.matcher(str);
-            if (!isNum.matches()) {
-                return false;
-            }
-            return true;
-        }
-        return false;
-    }
-
     public void disposeErrorMsg(HouseInfoModel data,String msg){
         HouseErrorInfoModel err = ConvertUtils.sourceToTarget(data, HouseErrorInfoModel.class);
         err.setErrorMsg(msg);

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.17__edit_building_and_house.sql

@@ -1,3 +1,2 @@
 alter table ic_building add COLUMN BUILDING_LEADER_NAME VARCHAR(11) comment '楼长姓名' AFTER TOTAL_HOUSE_NUM;
 alter table ic_building add COLUMN BUILDING_LEADER_MOBILE VARCHAR(11) comment '楼长电话' AFTER BUILDING_LEADER_NAME;
-alter table ic_house add COLUMN SORT INT(11) comment '排序' DEFAULT 0 AFTER DOOR_NAME;