From 02f3b2a577143724b09a70cd13cd3e9256f5fc21 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 12 Mar 2024 18:00:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
index 0f557d0..9211288 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -738,6 +738,33 @@
}
/**
+ * 保存场所详情信息
+ *
+ * @param placeEntity
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void savePlaceExtInfo(PlaceEntity placeEntity) {
+ PlaceExtEntity placeExtEntity = new PlaceExtEntity();
+ placeExtEntity.setPlaceId(placeEntity.getId());
+ // 判断是否已存在，已存在则不新增
+ QueryWrapper<PlaceExtEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("is_deleted", 0)
+ .eq("place_id", placeEntity.getId());
+ PlaceExtEntity one = placeExtService.getOne(wrapper);
+ if (null == one) {
+ placeExtEntity.setPlaceId(placeEntity.getId());
+ // 默认给待完善状态
+ placeExtEntity.setConfirmFlag(4);
+ placeExtEntity.setCreateTime(new Date());
+ placeExtEntity.setUpdateTime(new Date());
+ placeExtEntity.setCreateUser(AuthUtil.getUserId());
+ placeExtEntity.setUpdateUser(AuthUtil.getUserId());
+ // 新增场所详情
+ placeExtService.save(placeExtEntity);
+ }
+ }
+
+ /**
* 历史场所挂接处理-临时
*
* @param place
@@ -825,6 +852,8 @@
QueryWrapper<PlaceExtEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_deleted", 0).eq("place_id", placeVO.getId());
placeVO.setPlaceExtEntity(placeExtService.getOne(queryWrapper));
+ // 查询绑定的房屋
+ placeVO.setHouseBindList(baseMapper.getHouseBindMap(placeVO.getHouseCodeBinds()));
}
} else {
// 查询地址编码信息（社区派出所相关信息）
@@ -950,6 +979,8 @@
placeEntity.setSource(3);
//一个一个插入，防止同一个表中有相同的数据
save(placeEntity);
+ // 插入详情
+ savePlaceExtInfo(placeEntity);
// 插入标签关系表
savPlaceLabelBind(placeExcel, placeEntity);
// 插入关联数据表
@@ -988,6 +1019,8 @@
placeEntity.setUpdateUser(AuthUtil.getUserId());
//一个一个插入，防止同一个表中有相同的数据
updateById(placeEntity);
+ // 插入详情
+ savePlaceExtInfo(placeEntity);
}
}
}
--
Gitblit v1.9.3