bug 修复

zhongrj

2023-12-28 8dab1f5e6ae80f6808d818ba799d38bb0ef4e699

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

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

import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.grid.entity.GridmanEntity;
import org.springblade.modules.grid.service.IGridService;
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;
@@ -51,6 +55,9 @@
   @Autowired
   private IGridService gridService;

   @Autowired
   private IDeptService deptService;

   /**
    * 自定义分页
    *
@@ -60,13 +67,20 @@
    */
   @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> list = new ArrayList<>();
      if (null != taskReportForRepairs.getRoleName() && !taskReportForRepairs.getRoleName().equals("")) {
         if (taskReportForRepairs.getRoleName().equals("网格员")) {
            // 查询对应的房屋地址code
            list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
         } else if(taskReportForRepairs.getRoleName().equals("居民")){
         } else if (taskReportForRepairs.getRoleName().equals("居民")) {
            taskReportForRepairs.setCreateUser(AuthUtil.getUserId());
         } else if (taskReportForRepairs.getRoleName().equals("物业")) {
            taskReportForRepairs.setRegionCode("");
            taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
         }
      }
      return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs,list));
@@ -151,8 +165,8 @@
   }

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

   /**
@@ -194,4 +208,5 @@
      }
      return objectObjectHashMap;
   }

}