bug修复

linwei

2023-12-29 2137911cd6a0a20723356f3c0678cbf3556e7d7d

 src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java

@@ -17,7 +17,7 @@
package org.springblade.modules.place.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.node.TreeStringNode;
@@ -31,25 +31,30 @@
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.grid.service.IGridmanService;
import org.springblade.modules.grid.vo.GridVO;
import org.springblade.modules.place.entity.*;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.entity.PlaceExtEntity;
import org.springblade.modules.place.entity.PlacePoiLabel;
import org.springblade.modules.place.entity.PlaceRelEntity;
import org.springblade.modules.place.excel.PlaceAndRelExcel;
import org.springblade.modules.place.excel.PlaceExcel;
import org.springblade.modules.place.mapper.PlaceMapper;
import org.springblade.modules.place.service.IPlaceExtService;
import org.springblade.modules.place.service.IPlacePoiLabelService;
import org.springblade.modules.place.service.IPlaceRelService;
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.place.mapper.PlaceMapper;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;

import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;

/**
 * 场所表 服务实现类
@@ -198,7 +203,7 @@
      if (null!=placeVO.getGridId()){
         // 判断关联关系表是否存在
         QueryWrapper<GridRangeEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("grid_id",placeVO.getGridId()).eq("house_code",placeVO.getHouseCode());
         wrapper.eq("house_code",placeVO.getHouseCode());
         GridRangeEntity one = gridRangeService.getOne(wrapper);
         if (null==one){
            // 新增
@@ -207,6 +212,11 @@
            gridRangeEntity.setGridId(placeVO.getGridId());
            // 插入
            gridRangeService.save(gridRangeEntity);
         }else {
            // 修改绑定
            one.setGridId(placeVO.getGridId());
            // 修改
            gridRangeService.updateById(one);
         }
      }else {
         // 判断网格员，查询对应网格人对应的网格id
@@ -326,12 +336,12 @@
   @Transactional(rollbackFor = Exception.class)
   public User bindUserHandle(PlaceVO placeVO) {
      User newUser = new User();
      if (null!=placeVO.getPhone() && !placeVO.getPhone().equals("")) {
         placeVO.setPrincipal(placeVO.getUsername());
         placeVO.setPrincipalPhone(placeVO.getPhone());
      if (null!=placeVO.getPrincipalPhone() && !placeVO.getPrincipalPhone().equals("")) {
         placeVO.setPrincipal(placeVO.getPrincipal());
         placeVO.setPrincipalPhone(placeVO.getPrincipalPhone());
         //根据手机号查询库里的数据
         User userParams = new User();
         userParams.setPhone(placeVO.getPhone());
         userParams.setPhone(placeVO.getPrincipalPhone());
         User user = userService.getOne(Condition.getQueryWrapper(userParams));

         if (null!=user) {
@@ -346,10 +356,10 @@
            }
         } else {
            //如果用户不存在，则新增一个用户
            newUser.setAccount(placeVO.getPhone());
            newUser.setPhone(placeVO.getPhone());
            newUser.setName(placeVO.getUsername());
            newUser.setRealName(placeVO.getUsername());
            newUser.setAccount(placeVO.getPrincipalPhone());
            newUser.setPhone(placeVO.getPrincipalPhone());
            newUser.setName(placeVO.getPrincipal());
            newUser.setRealName(placeVO.getPrincipal());
            // 社区群众部门
            newUser.setDeptId("1727979636479037441");
            // 目前暂定居民角色，
@@ -383,7 +393,9 @@
      PlaceExtEntity one = placeExtService.getOne(wrapper);
      if (null == one) {
         placeExtEntity.setPlaceId(placeVO.getId());
         placeExtEntity.setLocaltion(placeVO.getLocaltion());
         placeExtEntity.setLocation(placeVO.getLocation());
         // TODO 后面需要把新增的参所设置为待完善
         // placeExtEntity.setConfirmFlag(0);
         //新增
         placeExtService.savePlaceExt(placeExtEntity);
      }
@@ -566,7 +578,7 @@
            // 插入场所
            PlaceEntity placeEntity = new PlaceEntity();
            placeEntity.setPlaceName(placeExcel.getPlaceName());
            placeEntity.setLocaltion(placeExcel.getAddress());
            placeEntity.setLocation(placeExcel.getAddress());
            placeEntity.setPrincipalUserId(userId);
            placeEntity.setPrincipal(placeExcel.getName());
            placeEntity.setPrincipalPhone(placeExcel.getPhoneNumber());
@@ -601,7 +613,7 @@
            PlaceEntity placeEntity = new PlaceEntity();
            placeEntity.setId(one.getId());
            placeEntity.setPlaceName(placeExcel.getPlaceName());
            placeEntity.setLocaltion(placeExcel.getAddress());
            placeEntity.setLocation(placeExcel.getAddress());
            placeEntity.setPrincipalUserId(userId);
            placeEntity.setCreateTime(new Date());
            placeEntity.setCreateUser(AuthUtil.getUserId());