From 540f1b99c1e4572671696fe9cc7349916fb4a9b4 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 13 Apr 2024 11:55:49 +0800
Subject: [PATCH] 场所，房屋，人员导入调整
---
src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
index 2cdc4f3..ed8394d 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
@@ -17,6 +17,7 @@
package org.springblade.modules.house.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -49,6 +50,8 @@
import org.springblade.modules.label.entity.LabelEntity;
import org.springblade.modules.label.service.ILabelService;
import org.springblade.modules.label.vo.LabelVO;
+import org.springblade.modules.place.excel.PlaceExcel;
+import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.system.entity.Region;
@@ -285,6 +288,8 @@
houseEntity.setHouseCode(IdUtils.getIdBy36());
houseEntity.setSource(2);
}
+ // 网格处理
+ importGridHandle(houseAndHoldExcel,houseEntity);
// 新增
save(houseEntity);
}else {
@@ -300,6 +305,8 @@
one.setBuilding(houseAndHoldExcel.getBuilding());
one.setArea(houseAndHoldExcel.getArea());
one.setPropertyPrice(houseAndHoldExcel.getPropertyPrice());
+ // 网格处理
+ importGridHandle(houseAndHoldExcel,one);
// 更新
updateById(one);
}
@@ -551,6 +558,33 @@
}
}
+
+ /**
+ * 导入是网格数据绑定处理
+ * @param houseAndHoldExcel
+ * @param houseEntity
+ */
+ public void importGridHandle(HouseAndHoldExcel houseAndHoldExcel, HouseEntity houseEntity) {
+ if (!Strings.isBlank(houseAndHoldExcel.getCommunityName()) &&
+ !Strings.isBlank(houseAndHoldExcel.getGridName())){
+ // 查询对应的网格信息
+ GridEntity gridEntity = gridService.getGridInfoByParam(houseAndHoldExcel.getCommunityName(),houseAndHoldExcel.getGridName());
+ if (null!=gridEntity){
+ // 设置场所范围
+ houseEntity.setGridId(gridEntity.getId());
+ houseEntity.setGridCode(gridEntity.getGridCode());
+ // 更新网格范围绑定
+ GridRangeEntity gridRangeEntity = new GridRangeEntity();
+ gridRangeEntity.setGridId(gridEntity.getId());
+ gridRangeEntity.setGridCode(gridEntity.getGridCode());
+ gridRangeEntity.setHouseCode(houseEntity.getHouseCode());
+ UpdateWrapper<GridRangeEntity> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("house_code",houseEntity.getHouseCode());
+ gridRangeService.update(gridRangeEntity,updateWrapper);
+ }
+ }
+ }
+
/**
* 住户标签处理
* @param houseAndHoldExcel
--
Gitblit v1.9.3