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/PlaceExtServiceImpl.java | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 102 insertions(+), 6 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 2279d91..41b1cd4 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
@@ -16,10 +16,16 @@
*/
package org.springblade.modules.place.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.modules.grid.service.IGridService;
+import org.springblade.modules.house.entity.HouseTenantEntity;
+import org.springblade.modules.house.vo.HouseTenantVO;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.entity.PlaceExtEntity;
+import org.springblade.modules.place.entity.PlacePractitionerEntity;
+import org.springblade.modules.place.service.IPlacePractitionerService;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.place.vo.PlaceExtVO;
import org.springblade.modules.place.mapper.PlaceExtMapper;
@@ -32,7 +38,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* 场所详情表 服务实现类
@@ -49,6 +58,12 @@
@Autowired
private IPlaceService placeService;
+ @Autowired
+ private IPlacePractitionerService placePractitionerService;
+
+ @Autowired
+ private IGridService gridService;
+
/**
* 自定义查询
* @param page
@@ -57,7 +72,15 @@
*/
@Override
public IPage<PlaceExtVO> selectPlaceExtPage(IPage<PlaceExtVO> page, PlaceExtVO placeExt) {
- return page.setRecords(baseMapper.selectPlaceExtPage(page, placeExt));
+ List<String> list = new ArrayList<>();
+ if (null!=placeExt.getRoleName() && !placeExt.getRoleName().equals("")){
+ if (placeExt.getRoleName().equals("网格员")){
+ // 查询对应的房屋地址code
+ list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
+ }
+ }
+ placeExt.setCreateUser(AuthUtil.getUserId());
+ return page.setRecords(baseMapper.selectPlaceExtPage(page, placeExt,list));
}
/**
@@ -66,12 +89,65 @@
* @return
*/
@Override
- public boolean updatePlaceExt(PlaceExtEntity placeExt) {
+ @Transactional(rollbackFor = Exception.class)
+ public boolean updatePlaceExt(PlaceExtVO placeExt) {
// 设置参数
placeExt.setUpdateTime(new Date());
placeExt.setUpdateUser(AuthUtil.getUserId());
- // 更新
- return updateById(placeExt);
+ // 更新从业人员信息
+ boolean addFlag = true;
+ boolean updateFlag = true;
+ boolean removeFlag = true;
+ //更新自身
+ boolean update = updateById(placeExt);
+ // 查询对应已存在的从业人员
+ QueryWrapper<PlacePractitionerEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("place_id",placeExt.getPlaceId());
+ List<PlacePractitionerEntity> oldList = placePractitionerService.list(wrapper);
+ List<PlacePractitionerEntity> list = placeExt.getPlacePractitioner();
+ // 申明新增，修改，删除集合
+ List<PlacePractitionerEntity> newList = new ArrayList<>();
+ List<PlacePractitionerEntity> addList = new ArrayList<>();
+ List<PlacePractitionerEntity> updateList = new ArrayList<>();
+ List<PlacePractitionerEntity> removeList = new ArrayList<>();
+ // 找出需要新增的，否则组成新集合进行比对
+ for (PlacePractitionerEntity practitionerEntity : list) {
+ practitionerEntity.setPlaceId(placeExt.getPlaceId());
+ if (null==practitionerEntity.getId()){
+ // 新增
+ PlacePractitionerEntity placePractitionerEntity= new PlacePractitionerEntity();
+
+ placePractitionerEntity.setPlaceId(placeExt.getPlaceId());
+ placePractitionerEntity.setName(practitionerEntity.getName());
+ placePractitionerEntity.setTelephone(practitionerEntity.getTelephone());
+ placePractitionerEntity.setTempAddress(practitionerEntity.getTempAddress());
+ addList.add(placePractitionerEntity);
+ }else {
+ newList.add(practitionerEntity);
+ }
+ }
+ // 遍历去差集，判断是新增还是删除还是更新
+ // 取旧数据和新提交数据差集--删除
+ removeList = oldList.stream().filter(vo -> !newList.stream().map(e ->
+ e.getId()).collect(Collectors.toList()).contains(vo.getId())).collect(Collectors.toList());
+ // 取旧数据和新提交数据交集--更新
+ updateList = newList.stream().filter(vo -> oldList.stream().map(e ->
+ e.getId()).collect(Collectors.toList()).contains(vo.getId())).collect(Collectors.toList());
+
+ // 批量新增
+ if (addList.size()>0) {
+ addFlag = placePractitionerService.saveBatch(addList);
+ }
+ // 批量修改
+ if (updateList.size()>0) {
+ updateFlag = placePractitionerService.updateBatchById(updateList);
+ }
+ // 批量删除
+ if (removeList.size()>0) {
+ removeFlag = placePractitionerService.removeBatchByIds(removeList);
+ }
+ // 返回
+ return update && addFlag && updateFlag && removeFlag;
}
/**
@@ -85,12 +161,14 @@
boolean flag = false;
// 设置更新时间
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(placeExt.getTaskId());
+ taskEntity.setId(entity.getTaskId());
taskEntity.setStatus(placeExt.getConfirmFlag());
flag = taskService.updateById(taskEntity);
}
@@ -111,7 +189,7 @@
taskEntity.setStatus(placeExt.getConfirmFlag());
taskEntity.setType(1);
taskEntity.setFrequency(3);
- taskEntity.setName(placeEntity.getPlaceName() + "信息完善任务" + System.currentTimeMillis());
+ taskEntity.setName(placeEntity.getPlaceName() + "信息完善");
// 新增任务
boolean save = taskService.save(taskEntity);
if (save){
@@ -126,4 +204,22 @@
}
return false;
}
+
+ /**
+ * 场所详情表 自定义详情
+ * @param placeExt
+ * @return
+ */
+ @Override
+ public PlaceExtVO getDetail(PlaceExtVO placeExt) {
+ PlaceExtVO detail = baseMapper.getDetail(placeExt);
+ if (null!=detail) {
+ // 查询从业人员信息
+ QueryWrapper<PlacePractitionerEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("place_id", placeExt.getPlaceId());
+ detail.setPlacePractitioner(placePractitionerService.list(queryWrapper));
+ }
+ // 返回
+ return detail;
+ }
}
--
Gitblit v1.9.3