湖北水库项目
blame | history | patch | commit | commitdiff | ignore whitespace
shenyijian
2024-09-14 ebb2b7790cd50297cf3dbbafcdda7f67971ca7a0 
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java


@@ -258,7 +258,9 @@


//      }


      //Map<Long, Long> userMap = personConfigDOS.stream().collect(Collectors.toMap(SgProjectPersonConfigDO::getRoldId, SgProjectPersonConfigDO::getUserId));


      //新增审批记录


      sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).userId(sgProgressReportDO.getReportUser()).approvalContent("提交审批").roleId(Long.parseLong(AuthUtil.getUser().getRoleId())).approvalStatus(0).approvalOrder(0).approvalTime(now).build());


      if (gxDeviceId != 998 && gxDeviceId != 999){


         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());


@@ -297,7 +299,7 @@


         sgProgressReportVO.setDeviceName(sgDeviceDO.getDeviceName());


      }else {


      sgProgressReportVO.setDeviceName("");}


      List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId,id).orderByAsc(SgReportUserDO::getApprovalTime).list();


      List<SgReportUserDO> list =  new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId,id).orderByAsc(SgReportUserDO::getApprovalTime).list();


      List<Long> ids = list.stream().map(s -> s.getUserId()).collect(Collectors.toList());


      List<Map<String,Object>> users = sgProgressReportMapper.getUserByIds(ids);


      for (Map<String, Object> user : users) {