From 5a7b9382114d37b7533026c62bf99b9dc4ef3a3d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 29 Dec 2023 18:30:03 +0800
Subject: [PATCH] 场所数据操作去除任务绑定，新增初始数据处理，住户查询修改
---
src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java | 70 +++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 23 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
index 5d59302..4f040df 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.logging.log4j.util.Strings;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.house.entity.HouseTenantEntity;
@@ -102,6 +103,8 @@
boolean removeFlag = true;
//更新自身
boolean update = updateById(placeExt);
+ // 更新场所place 表信息
+ updatePlaceInfo(placeExt);
// 查询对应已存在的从业人员
QueryWrapper<PlacePractitionerEntity> wrapper = new QueryWrapper<>();
wrapper.eq("place_id",placeExt.getPlaceId());
@@ -153,6 +156,27 @@
}
/**
+ * 更新场所表信息
+ * @param placeExt
+ */
+ public void updatePlaceInfo(PlaceExtVO placeExt) {
+ PlaceEntity placeEntity = new PlaceEntity();
+ placeEntity.setId(placeExt.getPlaceId());
+ placeEntity.setPlaceName(placeExt.getPlaceName());
+ if (!Strings.isBlank(placeExt.getLng())) {
+ placeEntity.setLng(placeExt.getLng());
+ }
+ if (!Strings.isBlank(placeExt.getLat())) {
+ placeEntity.setLat(placeExt.getLat());
+ }
+ if (!Strings.isBlank(placeExt.getLocation())) {
+ placeEntity.setLocation(placeExt.getLocation());
+ }
+ // 更新
+ placeService.updateById(placeEntity);
+ }
+
+ /**
* 场所详情表 审核
* @param placeExt
* @return
@@ -165,15 +189,15 @@
placeExt.setConfirmTime(new Date());
placeExt.setConfirmUserId(AuthUtil.getUserId());
// 更新数据
- boolean b = updateById(placeExt);
- if (b) {
- PlaceExtEntity entity = getById(placeExt.getId());
- // 更新任务表状态
- TaskEntity taskEntity = new TaskEntity();
- taskEntity.setId(entity.getTaskId());
- taskEntity.setStatus(placeExt.getConfirmFlag());
- flag = taskService.updateById(taskEntity);
- }
+ flag = updateById(placeExt);
+// if (b) {
+// PlaceExtEntity entity = getById(placeExt.getId());
+// // 更新任务表状态
+// TaskEntity taskEntity = new TaskEntity();
+// taskEntity.setId(entity.getTaskId());
+// taskEntity.setStatus(placeExt.getConfirmFlag());
+// flag = taskService.updateById(taskEntity);
+// }
// 返回
return flag;
}
@@ -185,26 +209,26 @@
*/
@Override
public boolean savePlaceExt(PlaceExtEntity placeExt) {
- PlaceEntity placeEntity = placeService.getById(placeExt.getPlaceId());
- TaskEntity taskEntity = new TaskEntity();
- taskEntity.setId(placeExt.getTaskId());
- taskEntity.setStatus(placeExt.getConfirmFlag());
- taskEntity.setType(1);
- taskEntity.setFrequency(1);
- taskEntity.setName(placeEntity.getPlaceName() + "信息完善");
- // 新增任务
- boolean save = taskService.save(taskEntity);
- if (save){
- placeExt.setTaskId(taskEntity.getId());
+// PlaceEntity placeEntity = placeService.getById(placeExt.getPlaceId());
+// TaskEntity taskEntity = new TaskEntity();
+// taskEntity.setId(placeExt.getTaskId());
+// taskEntity.setStatus(placeExt.getConfirmFlag());
+// taskEntity.setType(1);
+// taskEntity.setFrequency(1);
+// taskEntity.setName(placeEntity.getPlaceName() + "信息完善");
+// // 新增任务
+// boolean save = taskService.save(taskEntity);
+// if (save){
+// placeExt.setTaskId(taskEntity.getId());
placeExt.setConfirmFlag(1);
placeExt.setCreateTime(new Date());
placeExt.setUpdateTime(new Date());
placeExt.setCreateUser(AuthUtil.getUserId());
placeExt.setUpdateUser(AuthUtil.getUserId());
// 新增场所详情
- save(placeExt);
- }
- return false;
+ boolean save = save(placeExt);
+// }
+ return save;
}
/**
--
Gitblit v1.9.3