Merge remote-tracking branch 'origin/dev_addcate_and_import' into develop

# Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java

@@ -36,6 +36,10 @@ import com.epmet.model.HouseInfoModel;
 import com.epmet.model.ImportBuildingInfoListener;
 import com.epmet.redis.IcHouseRedis;
 import com.epmet.service.*;
+import com.epmet.service.BuildingService;
+import com.epmet.service.IcBuildingService;
+import com.epmet.service.IcBuildingUnitService;
+import com.epmet.service.IcHouseService;
 import com.epmet.util.ExcelPoiUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java

@@ -514,6 +514,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         wrapper.eq(IcNeighborHoodEntity::getNeighborHoodName, info.getNeighborHoodName());
         IcNeighborHoodEntity entity = baseDao.selectOne(wrapper);
         if (null != entity) {
+            info.setNeighborHoodExistStatus(true);
             return entity.getId();
         }
         entity = new IcNeighborHoodEntity();
@@ -539,6 +540,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         //根据小区ID和楼栋名获取楼栋信息
         IcBuildingDTO building = icBuildingService.getBuildingInfo(info.getNeighborHoodId(), info.getBuildingName());
         if (null != building) {
+            info.setBuildingExistStatus(true);
             return building.getId();
         }
         IcBuildingEntity buildingEntity = new IcBuildingEntity();