bug修复

linwe

2023-12-26 eb55b4133ae6b3df80d8d14fbc5b32928f296fd7

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

@@ -22,6 +22,8 @@
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;
@@ -51,6 +53,9 @@
   @Autowired
   private IGridService gridService;

   @Autowired
   private IDeptService deptService;

   /**
    * 自定义分页
    *
@@ -60,6 +65,10 @@
    */
   @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("网格员")) {
@@ -151,8 +160,8 @@
   }

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

   /**
@@ -170,27 +179,27 @@
   @Override
   public Object getReportForStatistics(String code, String roleType) {
      Map<String, Object> objectObjectHashMap = new HashMap<>();
      if (roleType.equals("1")) {
         Integer result1 = baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null,null);
         Integer result = baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), 1,null);
      if (roleType.equals("2")) {
         Integer result1 = baseMapper.getReportForStatistics(code, null, null, null, roleType);
         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("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));
         objectObjectHashMap.put("result6", baseMapper.getReportForStatistics(code, null, null, 4, roleType));
      } else {
         Integer result1 = baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null, null, roleType);
         Integer result = baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), 3, null, roleType);
         // 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("result3",   baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null,1));
         objectObjectHashMap.put("result4",   baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null,2));
         objectObjectHashMap.put("result5",   baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null,3));
         objectObjectHashMap.put("result6",   baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null,4));
      } else {
         Integer result1 = baseMapper.getReportForStatistics(code, null, null,null);
         Integer result = baseMapper.getReportForStatistics(code, null, 1,null);
         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("result3",   baseMapper.getReportForStatistics(code,null,null,1));
         objectObjectHashMap.put("result4",   baseMapper.getReportForStatistics(code, null, null,2));
         objectObjectHashMap.put("result5",   baseMapper.getReportForStatistics(code, null, null,3));
         objectObjectHashMap.put("result6",   baseMapper.getReportForStatistics(code, null, null,4));
         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));
         objectObjectHashMap.put("result6", baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null, 4, roleType));
      }
      return objectObjectHashMap;
   }