暂存

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java

@@ -499,60 +499,34 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 		List<DsTaskingVO> dsTaskingList = baseMapper.selectDisposeList(page, dsTasking);
 		if(!CollectionUtils.isEmpty(dsTaskingList)){
 			for (DsTaskingVO dsTaskingVO : dsTaskingList) {
+				if(!dsTaskingVO.getTaskType().equals(TaskingConstant.REWORK_PLAN_EDIT)){
 					String partCode = dsTaskingVO.getPartCode();
 					String version = dsTaskingVO.getVersion();
 					DsPartEntity partEntity = partService.selectDsPartByPatCodeAndVersion(partCode,version);
-//				if(TaskingConstant.IS_SINTERING.equals(partEntity.getIsSintering())){
-//					//查询子件信息
-//					List<DsPartRelationEntity> partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId());
-//					//获取所有子件ID
-//					List<Long> idList = partRelationEntityList.stream().map(DsPartRelationEntity::getChildPartId).collect(Collectors.toList());
-//					if(CollectionUtils.isEmpty(idList)){
-//						continue;
-//					}
-//					//获取版本号 根据子件ID
-//					List<DsPartVersionEntity> partVersionList = partVersionService.selectByPartIds(idList);
-//					List<DsTaskingIsCompletedVO> list = new ArrayList<>();
-//					for (DsPartVersionEntity dsPartVersionEntity : partVersionList) {
-//						//根据零件编码 和 版本号查询数据
-//						List<Integer> taskStatusList = new ArrayList<>(Arrays.asList(
-//								TaskingConstant.TASK_STATUS_WAIT,
-//								TaskingConstant.TASK_STATUS_ALREADY,
-//								TaskingConstant.TASK_STATUS_UNDERWAY
-//						));
-//						List<DsTaskingEntity> dsTaskingEntityList = taskingMapper.selectDsTaskingByPartCodeAndVersion(dsPartVersionEntity.getPartCode(), dsPartVersionEntity.getPartVersion(), taskStatusList);
-//
-//						List<DsTaskingIsCompletedVO> collect = dsTaskingEntityList.stream()
-//								.filter(entity -> entity.getCraftMan() != null)
-//								.map(entity -> {
-//									DsTaskingIsCompletedVO vo = new DsTaskingIsCompletedVO();
-//									BeanUtils.copyProperties(entity, vo);
-//									return vo;
-//								})
-//								.collect(Collectors.toList());
-//
-//						list.addAll(collect);
-//					}
-//
-////					if(!CollectionUtils.isEmpty(list)){
-////						dsTaskingVO.setChildren(list);
-////					}
-//				}
 					if(null != partEntity){
 						List<DsPartRelationEntity> partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId());
 						//获取所有子件ID
 						List<Long> idList = partRelationEntityList.stream().map(DsPartRelationEntity::getChildPartId).collect(Collectors.toList());
 						if (!CollectionUtils.isEmpty(idList)) {
 							List<DsPartVersionVO> dsPartEntityList = partService.selectDsPartVersionByIds(idList);
+							List<DsPartVersionVO> Children = new ArrayList<>();
 							for (DsPartVersionVO dsPartVersionVO : dsPartEntityList) {
-//						dsPartVersionVO.setUpdateUserStr(userClient.userInfo(Func.toLong(dsPartVersionVO.getUpdateUser())).getData().getUser().getName());
+								if(null != dsPartVersionVO.getSinTerType()&&(
-							if(null != dsPartVersionVO.getSinTerType()){
+												dsPartVersionVO.getSinTerType().equals(DsPartConstant.SIN_TER_TYPE_CZ) ||
+												dsPartVersionVO.getSinTerType().equals(DsPartConstant.SIN_TER_TYPE_KT) ||
+												dsPartVersionVO.getSinTerType().equals(DsPartConstant.SIN_TER_TYPE_BLB) ||
+												dsPartVersionVO.getSinTerType().equals(DsPartConstant.SIN_TER_TYPE_SMM)
+										)){
+
 									DsPartVersionEntity partVersionEntity = partVersionService.selectByPartId(dsPartVersionVO.getId());
+									if (partVersionEntity != null) {
 										dsPartVersionVO.setPartVersion(partVersionEntity.getPartVersion());
-								dsTaskingVO.setChildren(dsPartEntityList);
 									}
+									Children.add(dsPartVersionVO);
+								}
+							}
+							dsTaskingVO.setChildren(Children);
 						}
-
 					}
 				}
 			}