湖北水库：项目施工准备改为可重复上报

shenyijian

2024-08-24 3d68f255e43f1c57f831bccb62e8a05fe100b361

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

@@ -80,6 +80,10 @@
   @Override
   @Transactional
   public void add(SgProgressReportDO sgProgressReportDO) {
      String resubmitId = sgProgressReportDO.getResubmitId();
      if (StringUtils.isNotBlank(resubmitId)){
         new LambdaUpdateChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getId,resubmitId).set(SgProgressReportDO::getResubmit,1).update();
      }
      Long userId = AuthUtil.getUserId();
      sgProgressReportDO.setReportUser(userId);
      Date now = DateUtil.now();
@@ -120,7 +124,7 @@

      if (sgProgressReportDOS1!= null && sgProgressReportDOS1.size() > 0) {
         for (SgProgressReportDO sgProgressReportDO1 : sgProgressReportDOS1) {
            if (sgProgressReportDO1.getStatus()!= 2) {
            if (sgProgressReportDO1.getStatus()!= 2 && sgProgressReportDO1.getStatus()!= 3)  {
               throw new ServiceException("请先完成施工准备的审批!");
            }
         }
@@ -132,6 +136,7 @@
      SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxStepId);
      List<SgGxStepDO> list = sgGxStepMapper.selectByGxInfoId(sgGxStepDO.getGxInfoId());
      QueryWrapper<SgProgressReportDO> wrapper = new QueryWrapper<>();
      wrapper.in("status",Arrays.asList(0,1,2));
      if(sgProgressReportDO.getGxDeviceId()==998 || sgProgressReportDO.getGxDeviceId()==999){
         wrapper.eq("gx_step_id", gxStepId).eq("gx_device_id",gxDeviceId).ne("status",4).eq("profram_id",sgProgressReportDO.getProframId());
      }else {
@@ -147,6 +152,7 @@
            wrapper1.eq("gx_step_id", gxStepDO.getId());
            wrapper1.eq("gx_device_id",gxDeviceId);
            wrapper1.ne("status",4);
            wrapper1.ne("status",3);
            SgProgressReportDO one = sgProgressReportMapper.selectOne(wrapper1);
            if (one == null || one.getStatus() != 2) {
               throw new ServiceException("请先完成" + gxStepDO.getGxStepName() + "的审批！");
@@ -483,6 +489,9 @@
   public IPage<SgProgressReportVO> progressPage(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO) {
      Long userId = AuthUtil.getUserId();
      searchDTO.setUserId(userId);
      if (searchDTO.getApprovalStatus()!=null && searchDTO.getApprovalStatus() ==0){
         searchDTO.setAuditPerson(String.valueOf(userId));
      }
      List<SgProgressReportVO> list = sgProgressReportMapper.queryList(page, searchDTO);
      return page.setRecords(list);
   }