湖北水库项目
blame | history | patch | commit | commitdiff | ignore whitespace
shenyijian
2024-09-30 2eaca6eee957d11234959153207c943deea77eae 
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java


@@ -145,6 +145,7 @@


   @Transactional


   public void add(SgProgressReportDO sgProgressReportDO) {


      String resubmitId = sgProgressReportDO.getResubmitId();


      Long roleId = getRoleId();


      if (StringUtils.isNotBlank(resubmitId)){


         new LambdaUpdateChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getId,resubmitId).set(SgProgressReportDO::getResubmit,1).update();


      }


@@ -258,7 +259,7 @@


//      }


      //Map<Long, Long> userMap = personConfigDOS.stream().collect(Collectors.toMap(SgProjectPersonConfigDO::getRoldId, SgProjectPersonConfigDO::getUserId));


      //新增审批记录


         sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).userId(sgProgressReportDO.getReportUser()).approvalContent("提交审批").roleId(Long.parseLong(AuthUtil.getUser().getRoleId())).approvalStatus(0).approvalOrder(0).approvalTime(now).build());


         sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).userId(sgProgressReportDO.getReportUser()).approvalContent("提交审批").roleId(roleId).approvalStatus(0).approvalOrder(0).approvalTime(now).build());


      for (SgGxConfigDO sgGxConfigDO : sgGxConfigDOS) {


         //sgGxConfigDO.setUser(userMap.get(Long.parseLong(sgGxConfigDO.getRoleId())));


         sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong(sgGxConfigDO.getRoleId())).approvalStatus(0).approvalOrder(sgGxConfigDO.getSgOrder()).build());


@@ -281,7 +282,8 @@


         }


      }


      SgProjectInfoDO sgProjectInfoDO = sgProjectInfoMapper.selectById(sgProgressReportDO.getProframId());


      if (sgProjectInfoDO != null && sgProjectInfoDO.getStatus() == 0) {


      Integer status = sgProjectInfoDO.getStatus();


      if (sgProjectInfoDO != null && ( Objects.isNull(status)||0 == status)) {


         sgProjectInfoDO.setStatus(1);


         sgProjectInfoMapper.updateById(sgProjectInfoDO);


      }