Merge branch 'dev_import_edit' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_resi_export

Conflicts: epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
3 years ago · d036bad723
13 changed files with 275 additions and 23 deletions
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java
@ -159,6 +159,11 @@ public class ImportGeneralDTO implements Serializable {
     */
    private Boolean buildingExistStatus = false;

+    /**
+     * 楼栋单元数小于当前值时为true
+     */
+    private Boolean buildingUnitNumStatus = false;
+
    /**
     * 小区重复状态
     */
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java
@ -8,6 +8,7 @@ package com.epmet.constant;
 public interface ImportErrorMsgConstants {

    String EXIST_ERROR = "数据已存在";
+    String UNIT_ERROR = "暂不支持单元数减小";

    String DOCUMENT_EXIST_ERROR = "文件中存在重复数据";

--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java
@ -180,4 +180,20 @@ public interface IcBuildingDao extends BaseDao<IcBuildingEntity> {
     */
    void allUpdateHouseNum(@Param("nums") List<UpdateBuildingHouseNumResultDTO> nums);

+    /**
+     * Desc: 更新楼栋信息
+     * @param info
+     * @author zxc
+     * @date 2022/4/27 13:29
+     */
+    void updateBuilding(ImportGeneralDTO info);
+
+    /**
+     * Desc: 查询楼栋下单元数
+     * @param buildingId
+     * @author zxc
+     * @date 2022/4/27 14:41
+     */
+    Integer selectUnitCount(@Param("buildingId")String buildingId);
+
 }
--- 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
@ -18,6 +18,8 @@
 package com.epmet.dao;

 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.ImportGeneralDTO;
+import com.epmet.dto.NeighborHoodAndManagementDTO;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.form.IcNeighborHoodListFormDTO;
 import com.epmet.dto.result.IcNeighborHoodResultDTO;
@ -60,5 +62,29 @@ public interface IcNeighborHoodDao extends BaseDao<IcNeighborHoodEntity> {
     */
    List<String> selectNeighborhoodNameByNames(@Param("names")List<String> names,@Param("customerId") String customerId);

+    /**
+     * Desc: 更新小区详细地址和备注
+     * @param needUpdateList
+     * @author zxc
+     * @date 2022/4/27 09:59
+     */
+    void updateNeighborHood(@Param("list") List<ImportGeneralDTO> needUpdateList);
+
+    /**
+     * Desc: 更新小区关系表
+     * @param updateNeighborHoodAndManagement
+     * @author zxc
+     * @date 2022/4/27 10:33
+     */
+    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);
 }
--- 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
@ -179,14 +179,16 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
        List<ImportGeneralDTO> importGeneralDTOS = groupByStatus.get(false);
        if (!CollectionUtils.isEmpty(importGeneralDTOS)){
            List<ImportGeneralDTO> importInfo = neighborHoodService.getImportInfo(formDTO, importGeneralDTOS);
-            Map<Boolean, List<ImportGeneralDTO>> groupByBuildingExistStatus = importInfo.stream().collect(Collectors.groupingBy(ImportGeneralDTO::getBuildingExistStatus));
-            List<ImportGeneralDTO> existList = groupByBuildingExistStatus.get(true);
-            if (!CollectionUtils.isEmpty(existList)){
-                existList.forEach(e -> {
+            /*Map<Boolean, List<ImportGeneralDTO>> groupByBuildingExistStatus = importInfo.stream().collect(Collectors.groupingBy(ImportGeneralDTO::getBuildingExistStatus));
+            List<ImportGeneralDTO> existList = groupByBuildingExistStatus.get(true);*/
+            Map<Boolean, List<ImportGeneralDTO>> collect = importInfo.stream().collect(Collectors.groupingBy(ImportGeneralDTO::getBuildingUnitNumStatus));
+            List<ImportGeneralDTO> unitNumList = collect.get(true);
+            if (!CollectionUtils.isEmpty(unitNumList)){
+                unitNumList.forEach(e -> {
                    if (!e.getAddStatus()){
                        nums.add(e.getNum());
                        BuildingInfoModel buildingInfoModel = ConvertUtils.sourceToTarget(e, BuildingInfoModel.class);
-                        disposeErrorMsg(buildingInfoModel,ImportErrorMsgConstants.EXIST_ERROR);
+                        disposeErrorMsg(buildingInfoModel,ImportErrorMsgConstants.UNIT_ERROR);
                        e.setAddStatus(true);
                    }
                });
--- 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
@ -51,6 +51,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb

    List<ImportGeneralDTO> needDisposeList = new ArrayList<>();
    List<ImportGeneralDTO> needInsertList = new ArrayList<>();
+    List<ImportGeneralDTO> needUpdateList = new ArrayList<>();

    String gridName = null;
    String agencyName = null;
@ -128,7 +129,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
    }

    public void finalDispose(){
-        if (CollectionUtils.isEmpty(needDisposeList)){
+        if (CollectionUtils.isEmpty(needDisposeList) && CollectionUtils.isEmpty(needUpdateList)){
            return;
        }
        Map<String, Long> groupByAllName = needDisposeList.stream().collect(Collectors.groupingBy(
@ -151,8 +152,11 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
        });
        Map<Boolean, List<ImportGeneralDTO>> groupByStatus = needDisposeList.stream().collect(Collectors.groupingBy(ImportGeneralDTO::getExistStatus));
        List<ImportGeneralDTO> importGeneralDTOS = groupByStatus.get(false);
-        if (!CollectionUtils.isEmpty(importGeneralDTOS)){
-            List<ImportGeneralDTO> importInfo = neighborHoodService.getImportInfo(formDTO, importGeneralDTOS);
+        if (!CollectionUtils.isEmpty(importGeneralDTOS) || !CollectionUtils.isEmpty(needUpdateList)){
+            List<ImportGeneralDTO> importInfo = new ArrayList<>();
+            if (!CollectionUtils.isEmpty(importGeneralDTOS)){
+                importInfo = neighborHoodService.getImportInfo(formDTO, importGeneralDTOS);
+            }
            Map<Boolean, List<ImportGeneralDTO>> groupByBuildingExistStatus = importInfo.stream().collect(Collectors.groupingBy(ImportGeneralDTO::getNeighborHoodExistStatus));
            List<ImportGeneralDTO> existList = groupByBuildingExistStatus.get(true);
            if (!CollectionUtils.isEmpty(existList)){
@ -165,7 +169,16 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
                    }
                });
            }
-            List<ImportGeneralDTO> notExistList = groupByBuildingExistStatus.get(false);
+            List<ImportGeneralDTO> notExistList = new ArrayList<>();
+            List<ImportGeneralDTO> notExistListFalse = groupByBuildingExistStatus.get(false);
+            if (!CollectionUtils.isEmpty(notExistListFalse)){
+                notExistList.addAll(notExistListFalse);
+            }
+            if (!CollectionUtils.isEmpty(needUpdateList)){
+                notExistList.addAll(needUpdateList);
+                // 更新详细地址和备注
+                neighborHoodService.updateNeighborHood(needUpdateList);
+            }
            if (!CollectionUtils.isEmpty(notExistList)){
                // 物业表插入
                List<String> propertyNames = notExistList.stream().filter(n -> StringUtils.isNotBlank(n.getPropertyName())).map(m -> m.getPropertyName()).distinct().collect(Collectors.toList());
@ -184,15 +197,26 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
                    neighborHoodService.insertPropertyManagement(propertyManagementEntities);

                    // 小区物业关系表插入
-                    List<NeighborHoodAndManagementDTO> neighborHoodAndManagementDTOS = ConvertUtils.sourceToTarget(notExistList, NeighborHoodAndManagementDTO.class);
+                    List<NeighborHoodAndManagementDTO> neighborHoodAndManagementDTOS = ConvertUtils.sourceToTarget(notExistListFalse, NeighborHoodAndManagementDTO.class);
+                    List<NeighborHoodAndManagementDTO> updateNeighborHoodAndManagement = ConvertUtils.sourceToTarget(needUpdateList, NeighborHoodAndManagementDTO.class);
                    List<IcPropertyManagementEntity> propertyManagementInfos = propertyManagementDao.selectIdByName(propertyNames);
-                    neighborHoodAndManagementDTOS.forEach(n -> propertyManagementInfos.stream().filter(p -> p.getName().equals(n.getPropertyName()))
-                            .forEach(p -> {
-                                n.setPropertyId(p.getId());
-                                n.setNeighborHoodId(n.getNeighborHoodId());
-                            }));
+                    if (!CollectionUtils.isEmpty(neighborHoodAndManagementDTOS)){
+                        neighborHoodAndManagementDTOS.forEach(n -> propertyManagementInfos.stream().filter(p -> p.getName().equals(n.getPropertyName()))
+                                .forEach(p -> {
+                                    n.setPropertyId(p.getId());
+                                    n.setNeighborHoodId(n.getNeighborHoodId());
+                                }));
+                    }
+                    if (!CollectionUtils.isEmpty(updateNeighborHoodAndManagement)){
+                        updateNeighborHoodAndManagement.forEach(n -> propertyManagementInfos.stream().filter(p -> p.getName().equals(n.getPropertyName()))
+                                .forEach(p -> {
+                                    n.setPropertyId(p.getId());
+                                    n.setNeighborHoodId(n.getNeighborHoodId());
+                                }));
+                    }
                    List<IcNeighborHoodPropertyEntity> icNeighborHoodPropertyEntities = ConvertUtils.sourceToTarget(neighborHoodAndManagementDTOS, IcNeighborHoodPropertyEntity.class);
                    neighborHoodService.neighborHoodPropertyInsert(icNeighborHoodPropertyEntities);
+                    neighborHoodService.neighborHoodPropertyUpdate(updateNeighborHoodAndManagement);
                }
            }
        }
@ -200,6 +224,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
        // 清除
        needDisposeList = new ArrayList<>();
        needInsertList = new ArrayList<>();
+        needUpdateList = new ArrayList<>();
        gridName = null;
        agencyName = null;
        gridInfos = null;
@ -297,9 +322,13 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
        // 赋值小区ID
        dto.setNeighborHoodId(null == cacheNeighBorHood ? "" : cacheNeighBorHood.toString());
        if (StringUtils.isNotBlank(dto.getNeighborHoodId())){
+            /**
+             * 2022-04-27 新增需求，存在小区进行更改 更新物业、详细地址、备注信息
+             */
            // 小区已存在
-            nums.add(dto.getNum());
-            disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+            /*nums.add(dto.getNum());
+            disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);*/
+            needUpdateList.add(dto);
        }else {
            needDisposeList.add(dto);
        }
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java
@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcBuildingDTO;
+import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.entity.IcBuildingEntity;

 import java.util.List;
@ -113,4 +114,12 @@ public interface IcBuildingService extends BaseService<IcBuildingEntity> {
     * @Date 2022/2/14 15:19
     */
    IcBuildingDTO getBuildingInfo(String neighborHoodId, String buildingName);
+
+    /**
+     * Desc: 更新楼栋信息
+     * @param info
+     * @author zxc
+     * @date 2022/4/27 13:29
+     */
+    void updateBuilding(ImportGeneralDTO info);
 }
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java
@ -23,6 +23,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.ImportGeneralDTO;
+import com.epmet.dto.NeighborHoodAndManagementDTO;
 import com.epmet.dto.form.IcNeighborHoodAddFormDTO;
 import com.epmet.dto.form.ImportInfoFormDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
@ -155,4 +156,20 @@ public interface IcNeighborHoodService extends BaseService<IcNeighborHoodEntity>
     * @return
     */
    PageData<IcNeighborHoodDTO> openPage(IcNeighborHoodAddFormDTO params);
+
+    /**
+     * Desc: 更新小区
+     * @param needUpdateList
+     * @author zxc
+     * @date 2022/4/27 09:59
+     */
+    void updateNeighborHood(List<ImportGeneralDTO> needUpdateList);
+
+    /**
+     * Desc: 更新小区关系表
+     * @param updateNeighborHoodAndManagement
+     * @author zxc
+     * @date 2022/4/27 10:33
+     */
+    void neighborHoodPropertyUpdate(List<NeighborHoodAndManagementDTO> updateNeighborHoodAndManagement);
 }
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
@ -25,6 +25,11 @@ import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IcHouseEntity;
+import com.epmet.dto.result.HouseInfoDTO;
+import com.epmet.dto.result.IcHouseListResultDTO;
+import com.epmet.dto.result.ImportTaskCommonResultDTO;
+import com.epmet.dto.result.NeighborHoodManageDelResultDTO;
+import com.epmet.entity.IcHouseEntity;
 import com.epmet.enums.HousePurposeEnums;
 import com.epmet.enums.HouseTypeEnums;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java
@ -27,6 +27,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.IcBuildingDao;
 import com.epmet.dto.IcBuildingDTO;
+import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.entity.IcBuildingEntity;
 import com.epmet.service.IcBuildingService;
 import lombok.extern.slf4j.Slf4j;
@ -153,4 +154,16 @@ public class IcBuildingServiceImpl extends BaseServiceImpl<IcBuildingDao, IcBuil
        return ConvertUtils.sourceToTarget(entity, IcBuildingDTO.class);
    }

+    /**
+     * Desc: 更新楼栋信息
+     * @param info
+     * @author zxc
+     * @date 2022/4/27 13:29
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateBuilding(ImportGeneralDTO info) {
+        baseDao.updateBuilding(info);
+    }
+
 }
--- 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
@ -26,6 +26,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
@ -496,10 +497,12 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void neighborHoodPropertyInsert(List<IcNeighborHoodPropertyEntity> entities){
-        List<List<IcNeighborHoodPropertyEntity>> partition = ListUtils.partition(entities, NumConstant.ONE_HUNDRED);
-        partition.forEach(p -> {
-            neighborHoodPropertyService.insertBatch(p);
-        });
+        if (CollectionUtils.isNotEmpty(entities)){
+            List<List<IcNeighborHoodPropertyEntity>> partition = ListUtils.partition(entities, NumConstant.ONE_HUNDRED);
+            partition.forEach(p -> {
+                neighborHoodPropertyService.insertBatch(p);
+            });
+        }
    }

    /**
@ -521,7 +524,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
                String neighborHoodId = getNeighborHoodId(formDTO.getCustomerId(), item);
                item.setNeighborHoodId(neighborHoodId);
                //2.获取楼栋ID，判断楼栋是否存在，不存在则添加楼栋，存在则直接获取楼栋ID
-                if (StringUtils.isEmpty(item.getBuildingId()) && StringUtils.isNotEmpty(item.getBuildingName())) {
+                if (StringUtils.isNotEmpty(item.getBuildingName())) {
                    String buildingId = getBuildingId(formDTO.getCustomerId(), item);
                    item.setBuildingId(buildingId);
                }
@ -530,7 +533,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
                    String unitId = getUnitId(formDTO.getCustomerId(), item);
                    item.setBuildingUnitId(unitId);
                }
-            } else if (StringUtils.isNotEmpty(item.getNeighborHoodId()) && StringUtils.isEmpty(item.getBuildingId())) {
+            } else if (StringUtils.isNotEmpty(item.getNeighborHoodId())) {
                //获取楼栋ID，判断楼栋是否存在，不存在则添加楼栋，存在则直接获取楼栋ID
                String buildingId = getBuildingId(formDTO.getCustomerId(), item);
                item.setBuildingId(buildingId);
@ -590,6 +593,29 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
        IcBuildingDTO building = icBuildingService.getBuildingInfo(info.getNeighborHoodId(), info.getBuildingName());
        if (null != building) {
            info.setBuildingExistStatus(true);
+            if (info.getTotalUnitNum() < building.getTotalUnitNum()){
+                info.setBuildingUnitNumStatus(true);
+            }else {
+                info.setBuildingId(building.getId());
+                icBuildingService.updateBuilding(info);
+                //新增单元
+                List<OptionResultDTO> units = icBuildingUnitService.getUnitOptions(building.getId());
+                Map<String, String> unitMap = units.stream().collect(Collectors.toMap(OptionResultDTO::getCode, OptionResultDTO::getLabel));
+                List<IcBuildingUnitEntity> unitList = new ArrayList<>();
+                for (int i = 1; i <= info.getTotalUnitNum(); i++) {
+                    String unitNum = String.valueOf(i);
+                    if (!unitMap.containsKey(unitNum)) {
+                        IcBuildingUnitEntity icBuildingUnit = new IcBuildingUnitEntity();
+                        icBuildingUnit.setId(IdWorker.getIdStr());
+                        icBuildingUnit.setBuildingId(building.getId());
+                        icBuildingUnit.setCustomerId(customerId);
+                        icBuildingUnit.setUnitName(unitNum + "单元");
+                        icBuildingUnit.setUnitNum(unitNum);
+                        unitList.add(icBuildingUnit);
+                    }
+                }
+                icBuildingUnitService.insertBatch(unitList, NumConstant.ONE_HUNDRED);
+            }
            return building.getId();
        }
        IcBuildingEntity buildingEntity = new IcBuildingEntity();
@ -710,4 +736,37 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
        return result;
    }

+    /**
+     * Desc: 更新小区
+     * @param needUpdateList
+     * @author zxc
+     * @date 2022/4/27 09:59
+     */
+    @Override
+    @Transactional
+    public void updateNeighborHood(List<ImportGeneralDTO> needUpdateList) {
+        if (CollectionUtils.isNotEmpty(needUpdateList)){
+            baseDao.updateNeighborHood(needUpdateList);
+        }
+    }
+
+    /**
+     * Desc: 更新小区关系表
+     * @param updateNeighborHoodAndManagement
+     * @author zxc
+     * @date 2022/4/27 10:33
+     */
+    @Override
+    @Transactional
+    public void neighborHoodPropertyUpdate(List<NeighborHoodAndManagementDTO> updateNeighborHoodAndManagement) {
+        if (CollectionUtils.isNotEmpty(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);
+            }
+        }
+    }
+
 }
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
@ -42,6 +42,18 @@
        )
    </update>

+    <!-- 更新楼栋信息 -->
+    <update id="updateBuilding">
+        UPDATE ic_building
+        SET TOTAL_UNIT_NUM = #{totalUnitNum},
+            TOTAL_FLOOR_NUM = #{totalFloorNum},
+            TOTAL_HOUSE_NUM = #{totalHouseNum},
+            BUILDING_LEADER_NAME = #{buildingLeaderName},
+            BUILDING_LEADER_MOBILE = #{buildingLeaderMobile},
+            UPDATED_TIME = NOW()
+        WHERE ID = #{buildingId}
+    </update>
+
    <!--<select id="searchBuildingByPage" resultType="map">
        select
        a.ID as buildingId,
@ -371,4 +383,9 @@
            BUILDING_ID
    </select>

+    <!-- 查询楼栋下单元数 -->
+    <select id="selectUnitCount" resultType="java.lang.Integer">
+        SELECT COUNT(ID) FROM ic_building_unit WHERE BUILDING_ID = #{buildingId} AND DEL_FLAG = '0'
+    </select>
+
 </mapper>
--- 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
@ -25,6 +25,59 @@
        <result property="updatedTime" column="UPDATED_TIME"/>
    </resultMap>

+    <!-- 更新小区详细地址和备注 -->
+    <update id="updateNeighborHood">
+        update ic_neighbor_hood
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="ADDRESS =(case" suffix="end),">
+                <foreach collection="list" item="l">
+                    when id = #{l.neighborHoodId} then #{l.address}
+                </foreach>
+            </trim>
+            <trim prefix="REMARK =(case" suffix="end),">
+                <foreach collection="list" item="l">
+                    when id = #{l.neighborHoodId} then #{l.remark}
+                </foreach>
+            </trim>
+            UPDATED_TIME = NOW()
+        </trim>
+        WHERE DEL_FLAG = '0'
+        AND ID IN (
+        <foreach collection="list" item="l" separator=",">
+            #{l.neighborHoodId}
+        </foreach>
+        )
+    </update>
+
+    <!-- 更新小区关系表 -->
+    <update id="neighborHoodPropertyUpdate">
+        update ic_neighbor_hood_property
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="PROPERTY_ID =(case" suffix="end),">
+                <foreach collection="list" item="l">
+                    when NEIGHBOR_HOOD_ID = #{l.neighborHoodId} then #{l.propertyId}
+                </foreach>
+            </trim>
+            UPDATED_TIME = NOW()
+        </trim>
+        WHERE DEL_FLAG = '0'
+        AND NEIGHBOR_HOOD_ID IN (
+        <foreach collection="list" item="l" separator=",">
+            #{l.neighborHoodId}
+        </foreach>
+        )
+    </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,