hbwri/skjcmanager.git

			@@ -99,7 +99,7 @@
			SgDeviceDO sgDeviceDO = sgDeviceMapper.selectById(gxDeviceId);
			String deviceType = sgDeviceDO.getDeviceType();
			List<SgGxConfigDO> sgGxConfigDOS = new LambdaQueryChainWrapper<>(sgGxConfigMapper)
			.eq(SgGxConfigDO::getGxDeviceType, deviceType).eq(SgGxConfigDO::getGxStepId, gxStepId).list();
			.eq(SgGxConfigDO::getGxDeviceType, deviceType).eq(SgGxConfigDO::getGxStepId, gxStepId).orderByAsc(SgGxConfigDO::getSgOrder).list();
			List<String> roIds = sgGxConfigDOS.stream().map(SgGxConfigDO::getRoleId).collect(Collectors.toList());
			if (CollectionUtils.isEmpty(roIds)){
			throw new ServiceException("请完成工序角色配置！");
			@@ -113,6 +113,11 @@
			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);
			@@ -136,15 +141,7 @@
			SgProgressReportVO sgProgressReportVO = sgProgressReportMapper.queryById(id);
			SgDeviceDO sgDeviceDO = sgDeviceMapper.selectById(sgProgressReportVO.getGxDeviceId());
			sgProgressReportVO.setDeviceName(sgDeviceDO.getDeviceName());
			List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).list();
			List<SgReportUserDO> reportUserDOS = new ArrayList<>();
			Map<Integer, List<SgReportUserDO>> map = list.stream().collect(Collectors.groupingBy(SgReportUserDO::getIsHis));
			List<SgReportUserDO> sgReportUserDOS = map.get(1);
			if (CollectionUtils.isNotEmpty(sgReportUserDOS)){
			List<SgReportUserDO> sortList = sgReportUserDOS.stream().sorted(Comparator.comparing(SgReportUserDO::getApprovalTime)).collect(Collectors.toList());
			reportUserDOS.addAll(sortList);
			}
			reportUserDOS.addAll(map.get(0).stream().sorted(Comparator.comparingInt(SgReportUserDO::getApprovalOrder)).collect(Collectors.toList()));
			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());
			List<Map<String,Object>> users = sgProgressReportMapper.getUserByIds(ids);
			for (Map<String, Object> user : users) {
			@@ -154,7 +151,7 @@
			}
			}
			}
			sgProgressReportVO.setSgReportUserDOS(reportUserDOS);
			sgProgressReportVO.setSgReportUserDOS(list);
			List<SgStepReportVO> sgStepReportVOS = sgProgressReportMapper.selectByDeviceId(sgProgressReportVO.getGxDeviceId());
			sgProgressReportVO.setSgStepReportVOS(sgStepReportVOS);
			return sgProgressReportVO;
			@@ -186,7 +183,7 @@
			cachedThreadPool.execute(new Runnable(){
			@Override
			public void run(){
			setProgramAndDeviceStatus();
			setProgramAndDeviceStatus(sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId());
			}
			});

			@@ -213,9 +210,23 @@
			reportUserDO.setIsHis(0);
			reportUserDO.setApprovalTime(date);
			sgReportUserMapper.insert(reportUserDO);
			try {
			Thread.sleep(100);
			} catch (InterruptedException e) {
			throw new RuntimeException(e);
			}
			}else if (reportUserDO.getApprovalOrder()>sgReportUserDO.getApprovalOrder()){
			sgReportUserMapper.deleteById(reportUserDO.getId());
			reportUserDO.setId(null);
			reportUserDO.setApprovalStatus(0);
			reportUserDO.setIsHis(0);
			reportUserDO.setApprovalTime(date);
			sgReportUserMapper.updateById(reportUserDO);
			sgReportUserMapper.insert(reportUserDO);
			try {
			Thread.sleep(100);
			} catch (InterruptedException e) {
			throw new RuntimeException(e);
			}
			}
			if (reportUserDO.getApprovalOrder()==1){
			updateChainWrapper.set(SgProgressReportDO::getAuditPerson,reportUserDO.getUserId());
			@@ -228,9 +239,10 @@
			}


			public void setProgramAndDeviceStatus(){
			public void setProgramAndDeviceStatus(Long projectId){
			//查询所有的项目
			List<SgProjectInfoDO> sgProjectInfoDOS = sgProjectInfoMapper.selectList(null);
			SgProjectInfoDO sgProjectInfoDO = sgProjectInfoMapper.selectById(projectId);
			List<SgProjectInfoDO> sgProjectInfoDOS = List.of(sgProjectInfoDO);
			if(sgProjectInfoDOS!=null&& !sgProjectInfoDOS.isEmpty()) {
			for (SgProjectInfoDO project : sgProjectInfoDOS) {
			QueryWrapper<SgDeviceDO> queryWrapper = new QueryWrapper<>();
			@@ -262,7 +274,7 @@
			}
			}
			}
			if (deviceFinishCount == sgDeviceDOS.size()) {
			if (deviceFinishCount!=0 && deviceFinishCount == sgDeviceDOS.size()) {
			//如果项目下的设备下全部完成
			project.setStatus(2);
			sgProjectInfoMapper.updateById(project);
			@@ -292,12 +304,12 @@
			Long userId = AuthUtil.getUserId();
			searchDTO.setUserId(userId);
			searchDTO.setApprovalStatus(0);
			Long pending = sgProgressReportMapper.countList(searchDTO);
			List<SgProgressReportVO> pending = sgProgressReportMapper.queryList(searchDTO);
			searchDTO.setApprovalStatus(1);
			Long over = sgProgressReportMapper.countList(searchDTO);
			List<SgProgressReportVO> over= sgProgressReportMapper.queryList(searchDTO);
			Map<String, Long> map = new HashMap<>();
			map.put("pending",pending);
			map.put("over",over);
			map.put("pending", Long.valueOf(pending.size()));
			map.put("over",Long.valueOf(over.size()));
			return map;
			}