Merge remote-tracking branch 'origin/master'

linwe

2023-12-21 224e0bbfc8d24785fea2e0160c36d7a8f6cd7269

 src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java

@@ -25,6 +25,9 @@
import org.springblade.modules.district.mapper.DistrictMapper;
import org.springblade.modules.district.service.IDistrictService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.grid.vo.GridVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;

@@ -39,9 +42,28 @@
@Service
public class DistrictServiceImpl extends ServiceImpl<DistrictMapper, DistrictEntity> implements IDistrictService {

   @Autowired
   private IGridService gridService;

   @Override
   public IPage<DistrictVO> selectDistrictPage(IPage<DistrictVO> page, DistrictVO district) {
      return page.setRecords(baseMapper.selectDistrictPage(page, district));
      List<DistrictVO> districtVOS = baseMapper.selectDistrictPage(page, district);
      // 遍历
      for (DistrictVO districtVO : districtVOS) {
         // 设置对应的网格名称
         List<GridVO> gridVO = gridService.getGridListByAoiCode(districtVO.getAoiCode());
         if (gridVO.size()>0) {
            StringBuilder builder = new StringBuilder();
            for (GridVO vo : gridVO) {
               builder.append(vo.getGridName()).append(",");
            }
            String bui = builder.toString();
            String substring = bui.substring(0, bui.length() - 1);
            districtVO.setGridName(substring);
         }
      }
      // 返回
      return page.setRecords(districtVOS);
   }

   /**
@@ -68,4 +90,15 @@
         node.setChildren(null);
      }
   }

   /**
    * 小区表 自定义获取详情
    * @param district
    * @return
    */
   @Override
   public DistrictVO getDetail(DistrictVO district) {
      // 小区自定义获取详情查询并返回
      return baseMapper.getDetail(district);
   }
}