| | |
|---|
| | | if (CollectionUtils.isEmpty(roIds)){ |
|---|
| | | throw new ServiceException("请完成工序角色配置！"); |
|---|
| | | } |
|---|
| | | // List<SgProjectPersonConfigDO> personConfigDOS = new LambdaQueryChainWrapper<>(sgProjectPersonConfigMapper).eq(SgProjectPersonConfigDO::getProgramId,sgProgressReportDO.getProframId()).in(SgProjectPersonConfigDO::getRoldId, roIds).list(); |
|---|
| | | // if (CollectionUtils.isEmpty(personConfigDOS)){ |
|---|
| | | // throw new ServiceException("请完成项目审批人员配置！"); |
|---|
| | | // } |
|---|
| | | //Map<Long, Long> userMap = personConfigDOS.stream().collect(Collectors.toMap(SgProjectPersonConfigDO::getRoldId, SgProjectPersonConfigDO::getUserId)); |
|---|
| | | List<SgProjectPersonConfigDO> personConfigDOS = new LambdaQueryChainWrapper<>(sgProjectPersonConfigMapper).eq(SgProjectPersonConfigDO::getProgramId,sgProgressReportDO.getProframId()).in(SgProjectPersonConfigDO::getRoldId, roIds).list(); |
|---|
| | | if (CollectionUtils.isEmpty(personConfigDOS)){ |
|---|
| | | 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); |
|---|
| | | // } |
|---|
| | | // if (sgGxConfigDO.getSgOrder() == 1) { |
|---|
| | | // sgProgressReportDO.setAuditPerson(String.valueOf(sgGxConfigDO.getUser())); |
|---|
| | | // sgProgressReportMapper.updateById(sgProgressReportDO); |
|---|
| | | // } |
|---|
| | | // } |
|---|
| | | 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); |
|---|
| | | } |
|---|
| | | if (sgGxConfigDO.getSgOrder() == 1) { |
|---|
| | | sgProgressReportDO.setAuditPerson(String.valueOf(sgGxConfigDO.getUser())); |
|---|
| | | sgProgressReportMapper.updateById(sgProgressReportDO); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | //加个项目及设备的状态判断 方便统计计算 |
|---|
| | | if(gxStepId != 25 && gxStepId != 26 ) { |
|---|
