返回建立的监理单位的用户集合

gonglilong

2024-09-13 f396cee26b27dece466ffd48a1659878151b1f54

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java

@@ -66,15 +66,37 @@
   @Autowired
   private SgProjectInfoServiceImpl sgProjectInfoService;



   ExecutorService cachedThreadPool = Executors.newCachedThreadPool();
   @Override
   public IPage<SgProgressReportVO> queryPageList(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO) {
      List<SgProgressReportVO> list = sgProgressReportMapper.queryPageList(page,searchDTO);
      if(list != null){
         list.forEach(s ->{
            Long proframId = s.getProframId();
            SgProjectInfoDO sgProjectInfoDO = sgProjectInfoMapper.selectById(proframId);
            String controlUnit = sgProjectInfoDO.getControlUnit();
            List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
            s.setUserIDs(users);
         });

      }
      return page.setRecords(list);
   }
   @Override
   public IPage<SgProgressReportVO> queryPageListAll(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO) {
      List<SgProgressReportVO> list = sgProgressReportMapper.queryPageListAll(page,searchDTO);
      if(list != null){
         list.forEach(s ->{
            Long proframId = s.getProframId();
            SgProjectInfoDO sgProjectInfoDO = sgProjectInfoMapper.selectById(proframId);
            String controlUnit = sgProjectInfoDO.getControlUnit();
            List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
            s.setUserIDs(users);
         });

      }
      return page.setRecords(list);
   }
   @Override
@@ -275,6 +297,7 @@
      SgProgressReportDO sgProgressReportDO = sgProgressReportMapper.selectById(id);
      List<SgReportUserDO> sgReportUserDOS = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).ne(SgReportUserDO::getApprovalOrder,0).eq(SgReportUserDO::getIsHis,0)
         .orderByAsc(SgReportUserDO::getApprovalOrder).list();

      //审批者
      SgReportUserDO sgReportUserDO = new SgReportUserDO();
      if (isReject==1){