湖北水库：审批驳回修复

shenyijian

2024-09-14 b1415ac2adf2f31f41ea655d1824235f4b0ba1d9

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

@@ -297,7 +297,7 @@
         sgProgressReportVO.setDeviceName(sgDeviceDO.getDeviceName());
      }else {
      sgProgressReportVO.setDeviceName("");}
      List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId,id).orderByAsc(SgReportUserDO::getId).list();
      List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId,id).orderByAsc(SgReportUserDO::getApprovalTime).list();
      List<Long> ids = list.stream().map(s -> s.getUserId()).collect(Collectors.toList());
      List<Map<String,Object>> users = sgProgressReportMapper.getUserByIds(ids);
      for (Map<String, Object> user : users) {
@@ -312,6 +312,23 @@
      List<SgStepReportVO> sgStepReportVOS = sgProgressReportMapper.selectByDeviceId(sgProgressReportVO.getGxDeviceId());
      sgStepReportVOS = sgStepReportVOS.stream().filter(s -> s.getApprovalStatus() == null || (s.getApprovalStatus() != 4 && !(s.getApprovalStatus() == 3 && s.getResubmit() != 0))).collect(Collectors.toList());
      sgProgressReportVO.setSgStepReportVOS(sgStepReportVOS);

      if(sgProgressReportVO.getControlUnit()!=null){
         String controlUnit = sgProgressReportVO.getControlUnit();
         List<String> users1=sgProjectInfoMapper.getUserS(controlUnit);
         sgProgressReportVO.setUserIDs(users1);
      }
      String gxStepName = sgProgressReportVO.getGxStepName();
      String countyCd = sgProgressReportVO.getCountyCd();

      if("测量定位".equals(gxStepName)){

         if(countyCd!=null){
            List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
            sgProgressReportVO.setXbUnitIDs(xbUnitIDs);
         }

      }
      return sgProgressReportVO;
   }

@@ -382,6 +399,7 @@
         updateChainWrapper.set(SgProgressReportDO::getStatus,3);
         updateChainWrapper.set(SgProgressReportDO::getResubmit,0);
         userUpdate.set(SgReportUserDO::getApprovalStatus,2);
         userUpdate.set(SgReportUserDO::getUserId,userId);
         if (isReject==1){
            userUpdate.set(SgReportUserDO::getUserId,userId);
         }