From aae659330bd0e84ad9492de8cfa9d371df4c7bd9 Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Fri, 13 Sep 2024 20:00:56 +0800
Subject: [PATCH] 系统包过滤管理员
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
index 4b49f56..2265c96 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
@@ -186,25 +186,25 @@
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 ) {
--
Gitblit v1.9.3