hbwri/skjcmanager.git

			@@ -162,7 +162,7 @@
			public List<SgProjectInfoDO> queryStepByProject(ProjectSearchDTO searchDTO) {
			List<PreAcceVO> palist = new ArrayList<>();
			List<SgProjectInfoVO> list = sgProjectInfoMapper.queryStepByProject( searchDTO);
			palist.add(handleQuery(25, list.get(0).getId()));
			palist.add(handleQuery(20, list.get(0).getId()));
			palist.add(handleQuery(26, list.get(0).getId()));
			List<SgProjectInfoDO> projectProgress = getProjectProgress(list);
			projectProgress.forEach(s->{
			@@ -180,8 +180,11 @@
			*/
			@NotNull
			public List<SgProjectInfoDO> getProjectProgress(List<SgProjectInfoVO> list) {
			List<SgProjectInfoVO> sortedList = list.stream()
			.sorted(Comparator.comparing(SgProjectInfoVO::getSort))
			.collect(Collectors.toList());
			//项目分组
			Map<Long, List<SgProjectInfoVO>> projectMap = list.stream().collect(Collectors.groupingBy(SgProjectInfoVO::getId));
			Map<Long, List<SgProjectInfoVO>> projectMap = sortedList.stream().collect(Collectors.groupingBy(SgProjectInfoVO::getId));
			List<SgProjectInfoDO> result = new ArrayList<>();
			for (Map.Entry<Long, List<SgProjectInfoVO>> entry : projectMap.entrySet()) {
			List<SgDeviceDO> allDevice = new ArrayList<>();
			@@ -210,6 +213,7 @@
			if (CollectionUtils.isEmpty(gxList)){
			continue;
			}
			gxList = list.stream().sorted(Comparator.comparing(SgProjectInfoVO::getPrice)).collect(Collectors.toList());
			SgTypeVO typeVO = SgTypeVO.builder().typeName(gxList.get(0).getTypeName()).build();
			List<SgDeviceDO> deviceDOS = new ArrayList<>();
			//设备分组
			@@ -676,7 +680,7 @@
			SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(stepIdForNull);
			preAcceVO.setName(sgGxStepDO.getGxStepName());
			preAcceVO.setProgramId(programId);
			preAcceVO.setGxDeviceId(stepIdForNull != 25? (long)998:(long)999);
			preAcceVO.setGxDeviceId(stepIdForNull != 20? (long)998:(long)999);
			preAcceVO.setGxStepId(sgGxStepDO.getId());

			}