湖北水库：项目审批驳回后重新上报

shenyijian

2024-08-22 b396bfe894c08b5fb6ad49fdf2d4dcd0bba6fede

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

@@ -9,6 +9,7 @@
import cn.gistack.sm.sg.VO.SgStepReportVO;
import cn.gistack.sm.sg.mapper.*;
import cn.gistack.sm.sg.service.SgProgressReportService;
import cn.gistack.sm.sg.service.SgProjectInfoService;
import cn.hutool.http.useragent.UserAgentUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -61,6 +62,9 @@

   @Autowired
   private SgProjectInfoMapper sgProjectInfoMapper;

   @Autowired
   private SgProjectInfoServiceImpl sgProjectInfoService;

   ExecutorService cachedThreadPool = Executors.newCachedThreadPool();
   @Override
@@ -128,6 +132,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 {
@@ -143,6 +148,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() + "的审批！");
@@ -262,22 +268,32 @@
         updateChainWrapper.set(SgProgressReportDO::getStatus,1).set(SgProgressReportDO::getAuditPerson,nextUser.getUserId()).update();
      }else {
         updateChainWrapper.set(SgProgressReportDO::getStatus,2).set(SgProgressReportDO::getAuditPerson,null).update();
         Long proframId = sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId();
         //工序审核完成后 进行项目和设备状态的判断
         cachedThreadPool.execute(new Runnable(){
            @Override
            public  void  run(){
               setProgramAndDeviceStatus(sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId());
               setProgramAndDeviceStatus(proframId);

            }
         });
         cachedThreadPool.execute(new Runnable(){
            @Override
            public  void  run(){
               Long proframId = sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId();
               setProgramProgress(proframId);
            }
         });
      }
      }else {
         updateChainWrapper.set(SgProgressReportDO::getStatus,3);
         updateChainWrapper.set(SgProgressReportDO::getResubmit,0);
         userUpdate.set(SgReportUserDO::getApprovalStatus,2);
         if (isReject==1){
         /*if (isReject==1){
            userUpdate.set(SgReportUserDO::getUserId,userId);
         }
         }*/
         userUpdate.update();
         for (SgReportUserDO reportUserDO : sgReportUserDOS) {
         /*for (SgReportUserDO reportUserDO : sgReportUserDOS) {
            if (reportUserDO.getApprovalOrder()<=sgReportUserDO.getApprovalOrder()&&reportUserDO.getApprovalOrder()!=0){
               //更新为历史数据
               new LambdaUpdateChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getId,reportUserDO.getId()).set(SgReportUserDO::getIsHis,1).update();
@@ -301,13 +317,26 @@
            if (reportUserDO.getApprovalOrder()==1){
               updateChainWrapper.set(SgProgressReportDO::getAuditPerson,reportUserDO.getUserId());
            }
         }
         }*/
         updateChainWrapper.update();
      }


   }

   /**
    * 审批通过更新项目进度
    * @param proframId
    */
   public void setProgramProgress(Long proframId) {
      SgProjectInfoVO sgProjectInfoVO = sgProjectInfoMapper.selectVOById(proframId);
      List<SgProjectInfoDO> progress = sgProjectInfoService.getProjectProgress(Collections.singletonList(sgProjectInfoVO));
      String projectProgress = progress.get(0).getProjectProgress();
      if (StringUtils.isNotBlank(projectProgress)){
         String s = projectProgress.substring(0, projectProgress.length() - 1);
         new LambdaUpdateChainWrapper<>(sgProjectInfoMapper).set(SgProjectInfoDO::getProjectProgress,s).update() ;
      }
   }
   private  void setReportUser(Date date, SgReportUserDO reportUserDO) {
      reportUserDO.setId(null);
      reportUserDO.setApprovalStatus(0);
@@ -381,13 +410,19 @@
   public Map<String, Long> countList(ProjectSearchDTO searchDTO) {
      Long userId = AuthUtil.getUserId();
      searchDTO.setUserId(userId);
      searchDTO.setAuditPerson(userId.toString());
      List<SgProgressReportVO> all = sgProgressReportMapper.queryList(searchDTO);
      searchDTO.setApprovalStatus(0);
      List<SgProgressReportVO> pending = sgProgressReportMapper.queryList(searchDTO);
      searchDTO.setApprovalStatus(1);
      List<SgProgressReportVO> over= sgProgressReportMapper.queryList(searchDTO);
      searchDTO.setApprovalStatus(2);
      List<SgProgressReportVO> reject= sgProgressReportMapper.queryList(searchDTO);
      Map<String, Long> map = new HashMap<>();
      map.put("pending", Long.valueOf(pending.size()));
      map.put("over",Long.valueOf(over.size()));
      map.put("pending", (long) pending.size());
      map.put("over", (long) over.size());
      map.put("all", (long) all.size());
      map.put("reject", (long) reject.size());
      return map;
   }