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

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

@@ -87,7 +87,7 @@ public class ImportGeneralDTO implements Serializable {
     private String purpose;
 
     /**
-     * 是否出租
+     * 房屋状态 1：出租 0：自住  2：闲置
      */
     private String rentFlagString;
     private Integer rentFlag;

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

@@ -134,7 +134,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         }
         if(StringUtils.isBlank(data.getRentFlagString())){
             nums.add(num);
-            disposeErrorMsg(info, "是否出租的值未填写");
+            disposeErrorMsg(info, "房屋状态的值未填写");
             return;
         }
         if(StringUtils.isBlank(data.getDoorName())){
@@ -183,9 +183,9 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             return;
         }
         dto.setPurpose(HousePurposeEnums.getKeyByValue(dto.getPurpose()));
-        if (StringUtils.isNotBlank(dto.getRentFlagString()) && (!dto.getRentFlagString().equals("是") && !dto.getRentFlagString().equals("否"))){
+        if (StringUtils.isNotBlank(dto.getRentFlagString()) && (!dto.getRentFlagString().equals("自住") && !dto.getRentFlagString().equals("出租") && !dto.getRentFlagString().equals("闲置"))){
             nums.add(num);
-            disposeErrorMsg(info,"是否出租的值未填写或者所填写信息在系统中未找到");
+            disposeErrorMsg(info,"房屋状态的值未填写或者所填写信息在系统中未找到");
             return;
         }
         dto.setRentFlag(HouseRentFlagEnums.getCodeByName(dto.getRentFlagString()));