zhangk
2024-06-24 feb39b032f50cf5c3770a821652c132a15bcfef1
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
@@ -99,7 +99,7 @@
      SgDeviceDO sgDeviceDO = sgDeviceMapper.selectById(gxDeviceId);
      String deviceType = sgDeviceDO.getDeviceType();
      List<SgGxConfigDO> sgGxConfigDOS = new LambdaQueryChainWrapper<>(sgGxConfigMapper)
         .eq(SgGxConfigDO::getGxDeviceType, deviceType).eq(SgGxConfigDO::getGxStepId, gxStepId).list();
         .eq(SgGxConfigDO::getGxDeviceType, deviceType).eq(SgGxConfigDO::getGxStepId, gxStepId).orderByAsc(SgGxConfigDO::getSgOrder).list();
      List<String> roIds = sgGxConfigDOS.stream().map(SgGxConfigDO::getRoleId).collect(Collectors.toList());
      if (CollectionUtils.isEmpty(roIds)){
         throw new ServiceException("请完成工序角色配置!");
@@ -304,12 +304,12 @@
      Long userId = AuthUtil.getUserId();
      searchDTO.setUserId(userId);
      searchDTO.setApprovalStatus(0);
      Long pending = sgProgressReportMapper.countList(searchDTO);
      List<SgProgressReportVO> pending = sgProgressReportMapper.queryList(searchDTO);
      searchDTO.setApprovalStatus(1);
      Long over = sgProgressReportMapper.countList(searchDTO);
      List<SgProgressReportVO> over= sgProgressReportMapper.queryList(searchDTO);
      Map<String, Long> map = new HashMap<>();
      map.put("pending",pending);
      map.put("over",over);
      map.put("pending", Long.valueOf(pending.size()));
      map.put("over",Long.valueOf(over.size()));
      return map;
   }