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);
			@@ -205,6 +210,11 @@
			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);
			@@ -212,6 +222,11 @@
			reportUserDO.setIsHis(0);
			reportUserDO.setApprovalTime(date);
			sgReportUserMapper.insert(reportUserDO);
			try {
			Thread.sleep(100);
			} catch (InterruptedException e) {
			throw new RuntimeException(e);
			}
			}
			if (reportUserDO.getApprovalOrder()==1){
			updateChainWrapper.set(SgProgressReportDO::getAuditPerson,reportUserDO.getUserId());
			@@ -289,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;
			}