From a1d8ea1a72cddf7651742b87f042602ab006c879 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 11 Nov 2023 17:17:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 38 insertions(+), 16 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 4197cd7..ea3f411 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
@@ -40,6 +40,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -67,9 +68,23 @@
@Autowired
private IGridService gridService;
+ /**
+ * 自定义列表查询
+ * @param page
+ * @param place
+ * @return
+ */
@Override
public IPage<PlaceVO> selectPlacePage(IPage<PlaceVO> page, PlaceVO place) {
- return page.setRecords(baseMapper.selectPlacePage(page, place));
+ List<String> list = new ArrayList<>();
+ if (null!=place.getRoleName() && !place.getRoleName().equals("")){
+ if (place.getRoleName().equals("网格员")){
+ // 查询对应的房屋地址code
+ list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
+ }
+ }
+ place.setCreateUser(AuthUtil.getUserId());
+ return page.setRecords(baseMapper.selectPlacePage(page, place,list));
}
/**
@@ -99,6 +114,8 @@
bindUserHandle(placeVO);
// 新增场所信息
boolean save = save(placeVO);
+ // 保存场所详情及任务信息
+ savePlaceExtAndTaskInfo(placeVO);
// 场所标签信息绑定
placeLabelBind(placeVO);
// 返回结果
@@ -137,7 +154,6 @@
if (user != null) {
//如果用户存在，则该用户id绑定场所
placeVO.setPrincipalUserId(user.getId());
- return user;
} else {
//如果用户不存在，则新增一个用户
newUser.setAccount(placeVO.getPhone());
@@ -153,26 +169,32 @@
placeVO.setPrincipalUserId(newUser.getId());
//给人员打上场所负责人的标签
baseMapper.saveUserLabel(newUser.getId(),1002);
- // 用户插入后同时给场所详情表插入一条该场所信息
- if (submit){
- PlaceExtEntity placeExtEntity = new PlaceExtEntity();
- placeExtEntity.setPlaceId(placeVO.getId());
- // 判断是否已存在，已存在则不新增
- QueryWrapper<PlaceExtEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("is_deleted",0)
- .eq("place_id",placeVO.getId());
- PlaceExtEntity one = placeExtService.getOne(wrapper);
- if (null == one) {
- //新增
- placeExtService.savePlaceExt(placeExtEntity);
- }
- }
}
}
return newUser;
}
/**
+ * 保存场所详情及任务信息
+ * @param placeVO
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void savePlaceExtAndTaskInfo(PlaceVO placeVO) {
+ PlaceExtEntity placeExtEntity = new PlaceExtEntity();
+ placeExtEntity.setPlaceId(placeVO.getId());
+ // 判断是否已存在，已存在则不新增
+ QueryWrapper<PlaceExtEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("is_deleted",0)
+ .eq("place_id",placeVO.getId());
+ PlaceExtEntity one = placeExtService.getOne(wrapper);
+ if (null == one) {
+ placeExtEntity.setPlaceId(placeVO.getId());
+ //新增
+ placeExtService.savePlaceExt(placeExtEntity);
+ }
+ }
+
+ /**
* 历史场所挂接处理-临时
* @param place
* @return
--
Gitblit v1.9.3