住户删除，场所删除，三色任务执行修改

zhongrj

2024-01-12 ed28663eebdcc20325474e70be42e10e91fad930

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

@@ -69,6 +69,7 @@
      if (null != dept) {
         taskReportForRepairs.setRegionCode(dept.getRegionCode());
      }
      taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
      List<String> list = new ArrayList<>();
      if (null != taskReportForRepairs.getRoleName() && !taskReportForRepairs.getRoleName().equals("")) {
         if (taskReportForRepairs.getRoleName().equals("网格员")) {
@@ -76,11 +77,8 @@
            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));
   }
@@ -192,7 +190,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));
@@ -203,7 +201,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));