From cb49be18886f91a002c8891b3f45a87a2835e101 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 17 Feb 2022 17:53:52 +0800
Subject: [PATCH 1/2] emm

---
 .../model/ImportBuildingInfoListener.java     |  2 +-
 .../epmet/model/ImportHouseInfoListener.java  | 22 ++++++++++---------
 2 files changed, 13 insertions(+), 11 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 768f41ad5b..594b64e672 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
@@ -72,7 +72,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
         dto.setNum(num);
         dto.setCustomerId(formDTO.getCustomerId());
         // 应产品要求添加
-        if (StringUtils.isNotBlank(dto.getType()) && (!dto.getType().equals("商品房") || !dto.getType().equals("自建房")) || !dto.getType().equals("别墅")){
+        if (StringUtils.isNotBlank(dto.getType()) && (!dto.getType().equals("商品房") && !dto.getType().equals("自建房")) && !dto.getType().equals("别墅")){
             nums.add(num);
             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 4d4b4ea592..a432741869 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
@@ -78,24 +78,26 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         dto.setNum(num);
         dto.setCustomerId(formDTO.getCustomerId());
         // 应产品要求
-        if (StringUtils.isNotBlank(dto.getHouseType()) && ( !dto.getHouseType().equals("楼房") || !dto.getHouseType().equals("平房") || !dto.getHouseType().equals("别墅") ) ){
-            nums.add(num);
-            return;
+        if (StringUtils.isNotBlank(dto.getHouseType()) ){
+            if( !"楼房".equals(dto.getHouseType()) && !dto.getHouseType().equals("平房") && !dto.getHouseType().equals("别墅") ){
+                nums.add(num);
+                return;
+            }
         }
         dto.setHouseType(HouseTypeEnums.getKeyByValue(dto.getHouseType()));
 
-        if (StringUtils.isNotBlank(dto.getPurpose()) && (!dto.getPurpose().equals("住宅") ||
-                !dto.getPurpose().equals("商业") ||
-                !dto.getPurpose().equals("办公") ||
-                !dto.getPurpose().equals("工业") ||
-                !dto.getPurpose().equals("仓储") ||
-                !dto.getPurpose().equals("商住混用") ||
+        if (StringUtils.isNotBlank(dto.getPurpose()) && (!dto.getPurpose().equals("住宅") &&
+                !dto.getPurpose().equals("商业") &&
+                !dto.getPurpose().equals("办公") &&
+                !dto.getPurpose().equals("工业") &&
+                !dto.getPurpose().equals("仓储") &&
+                !dto.getPurpose().equals("商住混用") &&
                 !dto.getPurpose().equals("其他")) ){
             nums.add(num);
             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("未出租"))){
             nums.add(num);
             return;
         }

From 85b43acd987593fe16424d04a5fbad1a8841533b Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 17 Feb 2022 17:54:40 +0800
Subject: [PATCH 2/2] emm

---
 .../src/main/java/com/epmet/model/ImportHouseInfoListener.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a432741869..bcac2e5a4b 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
@@ -97,7 +97,7 @@ 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("否"))){
             nums.add(num);
             return;
         }