Merge remote-tracking branch 'origin/jtdev' into jtdev

aix

2024-06-28 9aed65a6aee6a4ec73bad2b34150a50285bc951b

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

@@ -74,14 +74,16 @@
   @Override
   @Transactional
   public void add(SgProgressReportDO sgProgressReportDO) {
      Long userId = AuthUtil.getUserId();
      sgProgressReportDO.setReportUser(userId);
      Date now = DateUtil.now();
      sgProgressReportDO.setReportTime(now);
      sgProgressReportDO.setCreateTime(now);
      //如果为草稿状态，单纯插入
      if(sgProgressReportDO.getStatus()==4){
         sgProgressReportMapper.insert(sgProgressReportDO);
         return;
      }
      Date now = DateUtil.now();
      sgProgressReportDO.setReportTime(now);
      sgProgressReportDO.setCreateTime(now);
      Long gxDeviceId = sgProgressReportDO.getGxDeviceId();
      Long gxStepId = sgProgressReportDO.getGxStepId();
      SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxStepId);
@@ -104,9 +106,7 @@
            }
         }
      }
      Long userId = AuthUtil.getUserId();
      sgProgressReportDO.setStatus(0);
      sgProgressReportDO.setReportUser(userId);
      sgProgressReportMapper.insert(sgProgressReportDO);
      SgDeviceDO sgDeviceDO = sgDeviceMapper.selectById(gxDeviceId);
      String deviceType = sgDeviceDO.getDeviceType();
@@ -152,6 +152,8 @@
   public SgProgressReportVO detail(String id) {
      SgProgressReportVO sgProgressReportVO = sgProgressReportMapper.queryById(id);
      SgDeviceDO sgDeviceDO = sgDeviceMapper.selectById(sgProgressReportVO.getGxDeviceId());
      SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(sgProgressReportVO.getGxStepId());
      sgProgressReportVO.setStepRemark(sgGxStepDO.getRemark());
      sgProgressReportVO.setDeviceName(sgDeviceDO.getDeviceName());
      List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).orderByAsc(SgReportUserDO::getId).list();
      List<Long> ids = list.stream().map(s -> s.getUserId()).collect(Collectors.toList());
@@ -180,57 +182,50 @@
      Integer isReject = approvalDTO.getIsReject();
      Long userId = approvalDTO.getUserId();
      Long id = approvalDTO.getId();
      List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).eq(SgReportUserDO::getIsHis,0)
         .eq(SgReportUserDO::getApprovalStatus, 0).orderByDesc(SgReportUserDO::getApprovalOrder).list();
      SgProgressReportDO sgProgressReportDO = sgProgressReportMapper.selectById(id);
      List<SgReportUserDO> sgReportUserDOS = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).ne(SgReportUserDO::getApprovalOrder,0).eq(SgReportUserDO::getIsHis,0)
         .orderByAsc(SgReportUserDO::getApprovalOrder).list();
      //审批者
      SgReportUserDO sgReportUserDO = new SgReportUserDO();
      if (isReject==0){
         list.stream().filter(s -> s.getUserId().equals(userId)).findFirst().get();
      }
      if (isReject==1){
         sgReportUserDO.setUserId(userId);
      if (isReject==1 && sgProgressReportDO.getStatus().equals(2)){
         sgReportUserDO = sgReportUserDOS.get(0);
      }else {
         sgReportUserDO = sgReportUserDOS.stream().filter(s -> s.getUserId().equals(Long.parseLong(sgProgressReportDO.getAuditPerson()))).findFirst().get();
      }
      Date date = new Date();
      LambdaUpdateChainWrapper<SgProgressReportDO> updateChainWrapper = new LambdaUpdateChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getId, id);
      LambdaUpdateChainWrapper<SgReportUserDO> userUpdate = new LambdaUpdateChainWrapper<>(sgReportUserMapper)
         .eq(SgReportUserDO::getId, sgReportUserDO.getId()).set(SgReportUserDO::getApprovalContent,approvalDTO.getApprovalContent()).set(SgReportUserDO::getApprovalTime,date);
      if (approvalDTO.getStatus()==1){
         Integer approvalOrder = sgReportUserDO.getApprovalOrder();
         userUpdate.set(SgReportUserDO::getApprovalStatus,1).update();
         if (sgReportUserDO.getId()==list.get(0).getId()){
            updateChainWrapper.set(SgProgressReportDO::getStatus,2).set(SgProgressReportDO::getAuditPerson,null).update();


            //工序审核完成后 进行项目和设备状态的判断

            cachedThreadPool.execute(new Runnable(){
               @Override
               public  void  run(){
                  setProgramAndDeviceStatus(sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId());
               }
            });



         }else {
            SgReportUserDO nextUser = list.stream().filter(s -> s.getApprovalOrder()==sgReportUserDO.getApprovalOrder()+1).findFirst().get();
            updateChainWrapper.set(SgProgressReportDO::getStatus,1).set(SgProgressReportDO::getAuditPerson,nextUser.getUserId()).update();
         }
      Optional<SgReportUserDO> next = sgReportUserDOS.stream().filter(s -> s.getApprovalOrder() == approvalOrder + 1).findFirst();
      //如果存在下一个审批人，则继续审批
      if (next.isPresent()){
         SgReportUserDO nextUser = next.get();
         updateChainWrapper.set(SgProgressReportDO::getStatus,1).set(SgProgressReportDO::getAuditPerson,nextUser.getUserId()).update();
      }else {
         updateChainWrapper.set(SgProgressReportDO::getStatus,2).set(SgProgressReportDO::getAuditPerson,null).update();
         //工序审核完成后 进行项目和设备状态的判断
         cachedThreadPool.execute(new Runnable(){
            @Override
            public  void  run(){
               setProgramAndDeviceStatus(sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId());
            }
         });
      }
      }else {
         updateChainWrapper.set(SgProgressReportDO::getStatus,3);
         List<SgReportUserDO> sgReportUserDOS = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).eq(SgReportUserDO::getIsHis,0)
            .orderByAsc(SgReportUserDO::getApprovalOrder).list()
//            .stream().distinct()
//            .stream().filter(s->s.getApprovalOrder()!=0 && s.getApprovalOrder()<= sgReportUserDO.getApprovalOrder()).collect(Collectors.toList())
            ;
            userUpdate.set(SgReportUserDO::getApprovalStatus,2).update();
         userUpdate.set(SgReportUserDO::getApprovalStatus,2);
         if (isReject==1){
            userUpdate.set(SgReportUserDO::getUserId,userId);
         }
         userUpdate.update();
         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();
               reportUserDO.setId(null);
               reportUserDO.setApprovalStatus(0);
               reportUserDO.setIsHis(0);
               reportUserDO.setApprovalTime(date);
               setReportUser(date, reportUserDO);
               sgReportUserMapper.insert(reportUserDO);
               try {
                  Thread.sleep(100);
@@ -239,10 +234,7 @@
               }
            }else if (reportUserDO.getApprovalOrder()>sgReportUserDO.getApprovalOrder()){
               sgReportUserMapper.deleteById(reportUserDO.getId());
               reportUserDO.setId(null);
               reportUserDO.setApprovalStatus(0);
               reportUserDO.setIsHis(0);
               reportUserDO.setApprovalTime(date);
               setReportUser(date, reportUserDO);
               sgReportUserMapper.insert(reportUserDO);
               try {
                  Thread.sleep(100);
@@ -260,6 +252,14 @@

   }

   private  void setReportUser(Date date, SgReportUserDO reportUserDO) {
      reportUserDO.setId(null);
      reportUserDO.setApprovalStatus(0);
      reportUserDO.setIsHis(0);
      reportUserDO.setApprovalTime(date);
      reportUserDO.setApprovalContent(null);
   }


   public void  setProgramAndDeviceStatus(Long projectId){
      //查询所有的项目