bug修复

linwe

2023-12-26 eb55b4133ae6b3df80d8d14fbc5b32928f296fd7

 src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java

@@ -17,35 +17,30 @@
package org.springblade.modules.grid.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
import org.springblade.modules.grid.entity.GridEntity;
import org.springblade.modules.grid.entity.GridRangeEntity;
import org.springblade.modules.grid.entity.GridmanEntity;
import org.springblade.modules.grid.excel.GridExcel;
import org.springblade.modules.grid.service.IGridRangeService;
import org.springblade.modules.grid.vo.GridVO;
import org.springblade.modules.grid.mapper.GridMapper;
import org.springblade.modules.grid.service.IGridRangeService;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.grid.vo.GridVO;
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IRegionService;
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.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.*;

/**
 * 网格表 服务实现类
@@ -70,6 +65,10 @@

   @Override
   public IPage<GridVO> selectGridPage(IPage<GridVO> page, GridVO grid) {
      Dept dept = deptService.getById(AuthUtil.getDeptId());
      if (null!=dept){
         grid.setRegionCode(dept.getRegionCode());
      }
      return page.setRecords(baseMapper.selectGridPage(page, grid));
   }

@@ -87,7 +86,7 @@
         String[] split = gridExcel.getGridName().split("居民委员会");
         GridEntity gridEntity = new GridEntity();
         String communityName = split[0] + "居民委员会";
         gridEntity.setCommunityName(communityName);
//         gridEntity.setCommunityName(communityName);
         // 通过社区名称查询对应的社区编号
         QueryWrapper<Region> wrapper = new QueryWrapper<>();
         wrapper.eq("name",split[0]);
@@ -269,6 +268,7 @@

   /**
    * 网格树
    *
    * @param grid
    * @return
    */
@@ -276,4 +276,36 @@
   public Object getGridTree(GridVO grid) {
      return NodeTreeUtil.getStringNodeTree(baseMapper.getGridTree());
   }


   @Override
   public Object gridInfoByHouseCode(String houseCode) {
      Map<String, Object> objectObjectHashMap = new HashMap<>();
      List<GridmanEntity> gridmanEntities = baseMapper.gridInfo(houseCode);
      Integer id = gridmanEntities.get(0).getId();
      objectObjectHashMap.put("grid", gridmanEntities);
      List<DoorplateAddressEntity> result = baseMapper.gridAoiName(id);
      objectObjectHashMap.put("doorplateAddress", result);
      return objectObjectHashMap;
   }

   /**
    * 网格集合查询
    * @param grid
    * @return
    */
   @Override
   public Object getGridList(GridVO grid) {
      return baseMapper.getGridList(grid);
   }

   /**
    * 查询小区网格绑定
    * @param aoiCode 小区aoiCode
    * @return
    */
   @Override
   public List<GridVO> getGridListByAoiCode(String aoiCode) {
      return baseMapper.getGridListByAoiCode(aoiCode);
   }
}