zhongrj
2024-01-18 77fea47f1fa683f9a0356df3d2328e2bb68b28cf
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
@@ -17,6 +17,7 @@
package org.springblade.modules.task.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.common.cache.SysCache;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.grid.entity.GridmanEntity;
@@ -65,10 +66,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("网格员")) {
@@ -76,13 +76,10 @@
            list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
         } else if (taskReportForRepairs.getRoleName().equals("居民")) {
            taskReportForRepairs.setCreateUser(AuthUtil.getUserId());
            taskReportForRepairs.setConfirmUserId(null);
         }
      }
      if (AuthUtil.getUserRole().equals("wygly")) {
         taskReportForRepairs.setRegionCode("");
         taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
      }
      return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs, list));
      return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs, list,regionChildCodesList,isAdministrator));
   }
   /**
@@ -91,8 +88,13 @@
    * @return
    */
   @Override
   public TaskReportStatistics getStatisticsCount() {
      return baseMapper.getStatisticsCount(AuthUtil.getUserId());
   public TaskReportStatistics getStatisticsCount(String houseCode) {
      String neiCode = "";
      Dept dept = deptService.getById(AuthUtil.getDeptId());
      if (null != dept) {
         neiCode = dept.getRegionCode();
      }
      return baseMapper.getStatisticsCount(AuthUtil.getUserId(), houseCode, neiCode);
   }
   /**