提示拆分

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

@@ -80,10 +80,34 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
         ImportGeneralDTO dto = ConvertUtils.sourceToTarget(data, ImportGeneralDTO.class);
         dto.setNum(num);
         dto.setCustomerId(formDTO.getCustomerId());
-        if (StringUtils.isBlank(data.getAgencyName()) || StringUtils.isBlank(data.getGridName()) || StringUtils.isBlank(data.getNeighborHoodName()) ||
+        if(StringUtils.isBlank(data.getAgencyName())){
-                StringUtils.isBlank(data.getBuildingName()) || StringUtils.isBlank(data.getType()) || null == data.getTotalUnitNum()){
             nums.add(num);
-            disposeErrorMsg(info,ImportErrorMsgConstants.BUILDING_ERROR);
+            disposeErrorMsg(info, "所属组织的值未填写");
+            return;
+        }
+        if(StringUtils.isBlank(data.getGridName())){
+            nums.add(num);
+            disposeErrorMsg(info, "所属网格的值未填写");
+            return;
+        }
+        if(StringUtils.isBlank(data.getNeighborHoodName())){
+            nums.add(num);
+            disposeErrorMsg(info,"小区名称的值未填写");
+            return;
+        }
+        if(StringUtils.isBlank(data.getBuildingName())){
+            nums.add(num);
+            disposeErrorMsg(info,"楼栋名称的值未填写");
+            return;
+        }
+        if(StringUtils.isBlank(data.getType())){
+            nums.add(num);
+            disposeErrorMsg(info,"楼栋类型的值未填写");
+            return;
+        }
+        if(null == data.getTotalUnitNum()){
+            nums.add(num);
+            disposeErrorMsg(info,"单元数的值未填写");
             return;
         }
         // 应产品要求添加

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

@@ -90,12 +90,64 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         ImportGeneralDTO dto = ConvertUtils.sourceToTarget(data, ImportGeneralDTO.class);
         dto.setNum(num);
         dto.setCustomerId(formDTO.getCustomerId());
-        if (StringUtils.isBlank(data.getAgencyName()) || StringUtils.isBlank(data.getGridName()) || StringUtils.isBlank(data.getNeighborHoodName()) ||
+        if(StringUtils.isBlank(data.getAgencyName())){
-                StringUtils.isBlank(data.getBuildingName()) || StringUtils.isBlank(data.getHouseType()) || StringUtils.isBlank(data.getPurpose()) ||
-                StringUtils.isBlank(data.getRentFlagString()) || StringUtils.isBlank(data.getOwnerIdCard()) || StringUtils.isBlank(data.getOwnerName()) ||
-                StringUtils.isBlank(data.getOwnerPhone()) || StringUtils.isBlank(data.getDoorName()) || null == data.getBuildingUnit()){
             nums.add(num);
-            disposeErrorMsg(info,ImportErrorMsgConstants.HOUSE_ERROR);
+            disposeErrorMsg(info, "所属组织的值未填写");
+            return;
+        }
+        if(StringUtils.isBlank(data.getGridName())){
+            nums.add(num);
+            disposeErrorMsg(info, "所属网格的值未填写");
+            return;
+        }
+        if(StringUtils.isBlank(data.getNeighborHoodName())){
+            nums.add(num);
+            disposeErrorMsg(info,"所属小区的值未填写");
+            return;
+        }
+        if(StringUtils.isBlank(data.getBuildingName())){
+            nums.add(num);
+            disposeErrorMsg(info,"所属楼栋的值未填写");
+            return;
+        }
+        if(StringUtils.isBlank(data.getHouseType())){
+            nums.add(num);
+            disposeErrorMsg(info, "房屋类型的值未填写");
+            return;
+        }
+        if(StringUtils.isBlank(data.getPurpose())){
+            nums.add(num);
+            disposeErrorMsg(info, "房屋用途的值未填写");
+            return;
+        }
+        if(StringUtils.isBlank(data.getRentFlagString())){
+            nums.add(num);
+            disposeErrorMsg(info, "是否出租的值未填写");
+            return;
+        }
+        if(StringUtils.isBlank(data.getOwnerIdCard())){
+            nums.add(num);
+            disposeErrorMsg(info, "房主身份证的值未填写");
+            return;
+        }
+        if(StringUtils.isBlank(data.getOwnerName())){
+            nums.add(num);
+            disposeErrorMsg(info, "房主姓名的值未填写");
+            return;
+        }
+        if(StringUtils.isBlank(data.getOwnerPhone())){
+            nums.add(num);
+            disposeErrorMsg(info, "房主电话的值未填写");
+            return;
+        }
+        if(StringUtils.isBlank(data.getDoorName())){
+            nums.add(num);
+            disposeErrorMsg(info, "门牌号的值未填写");
+            return;
+        }
+        if(null == data.getBuildingUnit()){
+            nums.add(num);
+            disposeErrorMsg(info, "单元号的值未填写");
             return;
         }
         // 应产品要求

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

@@ -89,6 +89,26 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
             disposeErrorMsg(info,ImportErrorMsgConstants.NEIGHBOR_HOOD_ERROR);
             return;
         }
+        if(StringUtils.isBlank(data.getAgencyName())){
+            nums.add(num);
+            disposeErrorMsg(info, "所属组织的值未填写");
+            return;
+        }
+        if(StringUtils.isBlank(data.getGridName())){
+            nums.add(num);
+            disposeErrorMsg(info, "所属网格的值未填写");
+            return;
+        }
+        if(StringUtils.isBlank(data.getNeighborHoodName())){
+            nums.add(num);
+            disposeErrorMsg(info,"小区名称的值未填写");
+            return;
+        }
+        if(StringUtils.isBlank(data.getNeighborHoodName())){
+            nums.add(num);
+            disposeErrorMsg(info,"详细地址的值未填写");
+            return;
+        }
         ImportGeneralDTO dto = ConvertUtils.sourceToTarget(data, ImportGeneralDTO.class);
         dto.setNum(num);
         dto.setCustomerId(formDTO.getCustomerId());