From ff38e2ba0350107cb645e7717c5fa7b2628e499f Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 4 Mar 2022 10:54:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/ImportBuildingInfoListener.java     | 30 ++++++++-
 .../epmet/model/ImportHouseInfoListener.java  | 62 +++++++++++++++++--
 .../model/ImportNeighborHoodInfoListener.java | 20 ++++++
 3 files changed, 104 insertions(+), 8 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java
index c0adc2ccad..27ab369129 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java
+++ b/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()) ||
-                StringUtils.isBlank(data.getBuildingName()) || StringUtils.isBlank(data.getType()) || null == data.getTotalUnitNum()){
+        if(StringUtils.isBlank(data.getAgencyName())){
             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;
         }
         // 应产品要求添加
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
index 956945f8ec..91de751dbe 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
+++ b/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()) ||
-                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()){
+        if(StringUtils.isBlank(data.getAgencyName())){
             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;
         }
         // 应产品要求
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java
index 75e5b8ba6f..4e85a407c1 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java
+++ b/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());