shenyijian
2024-08-27 7690aab61341ce187a505e238ed0a4b7bda6acb1
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
@@ -490,10 +490,16 @@
   private  PreAcceVO handleQuery( int stepIdForNull, Long programId) {
      QueryWrapper<SgProgressReportDO> queryWrapper = new QueryWrapper<>();
      queryWrapper.eq("gx_step_id", stepIdForNull)
         .ne("status",3)
         .eq("profram_id", programId);
      SgProgressReportDO sgProgressReportDO = sgProgressReportMapper.selectOne(queryWrapper);
      SgProgressReportDO sgProgressReportDO = null;
      List<SgProgressReportDO> sgProgressReportDOS = sgProgressReportMapper.selectList(queryWrapper);
      if (CollectionUtils.isNotEmpty(sgProgressReportDOS)) {
         List<SgProgressReportDO> collect = sgProgressReportDOS.stream().filter(s -> s.getStatus() == null || (s.getStatus() != 4 && !(s.getStatus() == 3 && s.getResubmit() != 0))).collect(Collectors.toList());
        if (!collect.isEmpty()){
           sgProgressReportDO = collect.get(0);
        }
      }
      PreAcceVO preAcceVO = new PreAcceVO();
      if (sgProgressReportDO!= null) {
         preAcceVO.setId(sgProgressReportDO.getId().toString());