测试加上上报

gonglilong

2024-09-13 297d72e3afd512c9579bceee3963c295aee0d28f

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

@@ -191,20 +191,21 @@
//         throw new ServiceException("请完成项目审批人员配置！");
//      }
      //Map<Long, Long> userMap = personConfigDOS.stream().collect(Collectors.toMap(SgProjectPersonConfigDO::getRoldId, SgProjectPersonConfigDO::getUserId));
//      sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).userId(sgProgressReportDO.getReportUser()).approvalContent("提交审批").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()).userId(sgGxConfigDO.getUser()).approvalStatus(0).approvalOrder(sgGxConfigDO.getSgOrder()).build());
//         try {
//            Thread.sleep(100);
//         } catch (InterruptedException e) {
//            throw new RuntimeException(e);
//         }
      //新增审批记录
      sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).userId(sgProgressReportDO.getReportUser()).approvalContent("提交审批").roleId(Long.parseLong(AuthUtil.getUser().getRoleId())).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());
         try {
            Thread.sleep(100);
         } catch (InterruptedException e) {
            throw new RuntimeException(e);
         }
//         if (sgGxConfigDO.getSgOrder() == 1) {
//            sgProgressReportDO.setAuditPerson(String.valueOf(sgGxConfigDO.getUser()));
//            sgProgressReportMapper.updateById(sgProgressReportDO);
//         }
//      }
      }

      //加个项目及设备的状态判断 方便统计计算
      if(gxStepId != 25 && gxStepId != 26 ) {
@@ -258,6 +259,19 @@
      Integer isReject = approvalDTO.getIsReject();
      Long userId = approvalDTO.getUserId();
      Long id = approvalDTO.getId();
      String roleId = AuthUtil.getUser().getRoleId();
      QueryWrapper<SgProgressReportDO> wrappers = new QueryWrapper<>();
      wrappers.eq("id", id);
      SgProgressReportDO sgProgressReportDOS1 = sgProgressReportMapper.selectOne(wrappers);

      //判断当前用户的角色是不是   工序配置的审核的角色

      List<SgGxConfigDO> sgGxConfigDOS = new LambdaQueryChainWrapper<>(sgGxConfigMapper)
         .eq(SgGxConfigDO::getGxDeviceType, sgProgressReportDOS1.getDeviceType()).eq(SgGxConfigDO::getGxStepId, sgProgressReportDOS1.getGxStepId()).orderByAsc(SgGxConfigDO::getSgOrder).list();
      List<String> roIds = sgGxConfigDOS.stream().map(SgGxConfigDO::getRoleId).collect(Collectors.toList());
      if (CollectionUtils.isEmpty(roIds)){
         throw new ServiceException("请完成工序角色配置！");
      }
      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();