From 6957c75b6681b7d12bcdeee6d1084e332970a5b7 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 28 Apr 2022 09:35:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/IcNeighborHoodDao.java |  8 ++++++++
 .../epmet/service/impl/IcNeighborHoodServiceImpl.java  |  7 ++++++-
 .../src/main/resources/mapper/IcNeighborHoodDao.xml    | 10 ++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
index 25dfd0c23e..6238d0f303 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
@@ -79,4 +79,12 @@ public interface IcNeighborHoodDao extends BaseDao<IcNeighborHoodEntity> {
     void neighborHoodPropertyUpdate(@Param("list")List<NeighborHoodAndManagementDTO> updateNeighborHoodAndManagement);
 
     List<IcNeighborHoodDTO> selectNeighborList(@Param("gridId")String gridId);
+
+    /**
+     * Desc: 删除物业关系
+     * @param neighborHoodIds
+     * @author zxc
+     * @date 2022/4/28 09:10
+     */
+    void delProperty(@Param("neighborHoodIds")List<String> neighborHoodIds);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
index 7805f82e1a..d31076f571 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
@@ -760,7 +760,12 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
     @Transactional
     public void neighborHoodPropertyUpdate(List<NeighborHoodAndManagementDTO> updateNeighborHoodAndManagement) {
         if (CollectionUtils.isNotEmpty(updateNeighborHoodAndManagement)){
-            baseDao.neighborHoodPropertyUpdate(updateNeighborHoodAndManagement);
+            baseDao.delProperty(updateNeighborHoodAndManagement.stream().map(m -> m.getNeighborHoodId()).collect(Collectors.toList()));
+            List<IcNeighborHoodPropertyEntity> entities = ConvertUtils.sourceToTarget(updateNeighborHoodAndManagement, IcNeighborHoodPropertyEntity.class);
+            List<IcNeighborHoodPropertyEntity> collect = entities.stream().filter(e -> StringUtils.isNotBlank(e.getPropertyId())).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(collect)){
+                neighborHoodPropertyService.insertBatch(collect);
+            }
         }
     }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
index 4d29dbe1d3..564f0e9d8d 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
@@ -68,6 +68,16 @@
         )
     </update>
 
+    <!-- 删除物业关系 -->
+    <delete id="delProperty">
+        DELETE FROM ic_neighbor_hood_property
+        WHERE NEIGHBOR_HOOD_ID IN (
+            <foreach collection="neighborHoodIds" item="n" separator=",">
+                #{n}
+            </foreach>
+            )
+    </delete>
+
     <!--<select id="searchNeighborhoodByPage" resultType="map">
         select
             a.id as neighborHoodId,