From d76c9782a646eb0e1408e7b1b10e12dcec59943e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 28 Dec 2023 17:42:17 +0800
Subject: [PATCH] 网格导入修改
---
src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java b/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java
index cc77240..a21006d 100644
--- a/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java
+++ b/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java
@@ -78,18 +78,18 @@
* @param isCovered
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public void importGrid(List<GridExcel> data, Boolean isCovered) {
List<GridEntity> list = new ArrayList<>();
// 遍历
for (GridExcel gridExcel : data) {
// 取出名称分隔
- String[] split = gridExcel.getGridName().split("居民委员会");
+ String[] split = gridExcel.getGridName().split("第");
GridEntity gridEntity = new GridEntity();
- String communityName = split[0] + "居民委员会";
-// gridEntity.setCommunityName(communityName);
// 通过社区名称查询对应的社区编号
QueryWrapper<Region> wrapper = new QueryWrapper<>();
- wrapper.eq("name",split[0]);
+ wrapper.like("name",split[0]);
+ System.out.println("社区名称 = " + split[0]);
Region region = regionService.getOne(wrapper);
if (null!=region){
gridEntity.setCommunityCode(region.getCode());
@@ -97,12 +97,12 @@
// 比对网格是否存在，如果已存在则更新，否则则新增
QueryWrapper<GridEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_deleted",0)
- .eq("grid_name",split[1])
+ .eq("grid_name","第" + split[1])
.eq("community_code",region.getCode());
GridEntity one = getOne(queryWrapper);
if (null!=one){
one.setGridCode(gridExcel.getGridCode());
- one.setGridName(split[1]);
+ one.setGridName("第" + split[1]);
one.setGeom(gridExcel.getGeom());
one.setUpdateUser(AuthUtil.getUserId());
one.setUpdateTime(new Date());
@@ -111,7 +111,7 @@
}else {
// 设置网格数据
gridEntity.setGridCode(gridExcel.getGridCode());
- gridEntity.setGridName(split[1]);
+ gridEntity.setGridName("第" + split[1]);
gridEntity.setGeom(gridExcel.getGeom());
gridEntity.setCreateUser(AuthUtil.getUserId());
gridEntity.setCreateTime(new Date());
--
Gitblit v1.9.3