拿不到地址总表数据，不设置网格信息

linwei

2024-01-31 b3b566ebdfed4005aaa513da3d5d2fd3924903cc

 src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java

@@ -17,18 +17,26 @@
package org.springblade.modules.task.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.springblade.common.cache.SysCache;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.district.entity.DistrictEntity;
import org.springblade.modules.district.service.IDistrictService;
import org.springblade.modules.grid.entity.GridmanEntity;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.property.entity.PropertyCompanyDistrictEntity;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.modules.property.service.IPropertyDistrictUserService;
import org.springblade.modules.sse.server.SSEServer;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.task.entity.TaskEntity;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
import org.springblade.modules.task.mapper.TaskReportForRepairsMapper;
import org.springblade.modules.task.service.ITaskRepairStepService;
import org.springblade.modules.task.service.ITaskReportForRepairsService;
import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.task.vo.TaskReportForRepairsVO;
@@ -39,6 +47,7 @@

import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;

/**
 * 报事报修任务表 服务实现类
@@ -67,10 +76,9 @@
    */
   @Override
   public IPage<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage<TaskReportForRepairsVO> page, TaskReportForRepairsVO taskReportForRepairs) {
      Dept dept = deptService.getById(AuthUtil.getDeptId());
      if (null!=dept){
         taskReportForRepairs.setRegionCode(dept.getRegionCode());
      }
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
      taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
      List<String> list = new ArrayList<>();
      if (null != taskReportForRepairs.getRoleName() && !taskReportForRepairs.getRoleName().equals("")) {
         if (taskReportForRepairs.getRoleName().equals("网格员")) {
@@ -78,25 +86,54 @@
            list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
         } else if (taskReportForRepairs.getRoleName().equals("居民")) {
            taskReportForRepairs.setCreateUser(AuthUtil.getUserId());
         } else if (taskReportForRepairs.getRoleName().equals("物业")) {
            taskReportForRepairs.setRegionCode("");
            taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
            taskReportForRepairs.setConfirmUserId(null);
         }
      }
      return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs,list));

      String userRole = AuthUtil.getUserRole();
      List<String> aoiCodeList = new ArrayList<>();
      if (userRole.contains("wygly") || userRole.contains("wyxmjl")) {
         // 查询小区id
         IPropertyDistrictUserService propertyDistrictUserService = SpringUtils.getBean(IPropertyDistrictUserService.class);
         List<String> districtIds = propertyDistrictUserService.selectPropertyDistrictByUserId(AuthUtil.getUserId());
         // 通过用户机构查询用户的物业公司
         IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
         PropertyCompanyEntity one = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()));
         if (one != null) {
            IPropertyCompanyDistrictService bean2 = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
            // 通过物业公司，查询小区
            List<PropertyCompanyDistrictEntity> list2 = bean2.list(Wrappers.<PropertyCompanyDistrictEntity>lambdaQuery()
               .eq(PropertyCompanyDistrictEntity::getPropertyCompanyId, one.getId()));
            if (list2.size() > 0) {
               List<String> collect = list2.stream().map(i -> i.getDistrictId()).collect(Collectors.toList());
               districtIds.addAll(collect);
            }
         }
         if (districtIds.size() == 0) {
            return page.setRecords(new ArrayList<>());
         }
         IDistrictService bean1 = SpringUtil.getBean(IDistrictService.class);
         List<DistrictEntity> list1 = bean1.list(Wrappers.<DistrictEntity>lambdaQuery().in(DistrictEntity::getId, districtIds));
         aoiCodeList = list1.stream().map(i -> i.getAoiCode()).collect(Collectors.toList());
      }
      return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs, list, regionChildCodesList, isAdministrator, aoiCodeList));
   }

   /**
    * 查询报事报修统计
    *
    * @return
    */
   @Override
   public TaskReportStatistics getStatisticsCount() {
      return baseMapper.getStatisticsCount(AuthUtil.getUserId());
   public TaskReportStatistics getStatisticsCount(String houseCode) {
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
      return baseMapper.getStatisticsCount(AuthUtil.getUserId(), houseCode, regionChildCodesList, isAdministrator);
   }

   /**
    * 报事报修任务表 新增
    *
    * @param taskReportForRepairs
    * @return
    */
@@ -109,23 +146,24 @@
      taskEntity.setStatus(1);
      taskEntity.setType(1);
      taskEntity.setFrequency(3);
      if (null!=taskReportForRepairs.getAddressCode() && !taskReportForRepairs.getAddressCode().equals("")){
      if (null != taskReportForRepairs.getAddressCode() && !taskReportForRepairs.getAddressCode().equals("")) {
         taskEntity.setHouseCode(taskReportForRepairs.getAddressCode());
      }
      // 新增
      boolean save = taskService.save(taskEntity);
      if (save){
      if (save) {
         taskReportForRepairs.setTaskId(taskEntity.getId());
         taskReportForRepairs.setConfirmFlag(1);
         flag = save(taskReportForRepairs);
         // 同时向web 端推送消息
         SSEServer.sendMessage("web:1","1");
         SSEServer.sendMessage("web:1", "1");
      }
      return flag;
   }

   /**
    * 报事报修任务表 自定义修改
    *
    * @param taskReportForRepairs
    * @return
    */
@@ -140,6 +178,7 @@

   /**
    * 报事报修任务表 审核
    *
    * @param taskReportForRepairs
    * @return
    */
@@ -165,8 +204,8 @@
   }

   @Override
   public Integer getStatistics(Long userId,String neiCode) {
      return baseMapper.getStatistics(userId,neiCode);
   public Integer getStatistics(Long userId, String neiCode) {
      return baseMapper.getStatistics(userId, neiCode);
   }

   /**
@@ -189,7 +228,7 @@
         Integer result = baseMapper.getReportForStatistics(code, null, 3, null, roleType);
         objectObjectHashMap.put("result", result1);
         objectObjectHashMap.put("result1", result);
         objectObjectHashMap.put("result2", result1.equals(0) ? 0 : BigDecimal.valueOf(result).divide(BigDecimal.valueOf(result1), 2, BigDecimal.ROUND_HALF_UP));
         objectObjectHashMap.put("result2", result1.equals(0) ? 0 : BigDecimal.valueOf(result).divide(BigDecimal.valueOf(result1), 4, BigDecimal.ROUND_HALF_UP));
         objectObjectHashMap.put("result3", baseMapper.getReportForStatistics(code, null, null, 1, roleType));
         objectObjectHashMap.put("result4", baseMapper.getReportForStatistics(code, null, null, 2, roleType));
         objectObjectHashMap.put("result5", baseMapper.getReportForStatistics(code, null, null, 3, roleType));
@@ -200,7 +239,7 @@
         // result 总数  result1 已处理  result2 处理率  result3 公共维修  result4 居家维修  result5 矛盾纠纷  result6 投诉举报
         objectObjectHashMap.put("result", result1);
         objectObjectHashMap.put("result1", result);
         objectObjectHashMap.put("result2", result1.equals(0) ? 0 : BigDecimal.valueOf(result).divide(BigDecimal.valueOf(result1), 2, BigDecimal.ROUND_HALF_UP));
         objectObjectHashMap.put("result2", result1.equals(0) ? 0 : BigDecimal.valueOf(result).divide(BigDecimal.valueOf(result1), 4, BigDecimal.ROUND_HALF_UP));
         objectObjectHashMap.put("result3", baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null, 1, roleType));
         objectObjectHashMap.put("result4", baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null, 2, roleType));
         objectObjectHashMap.put("result5", baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null, 3, roleType));