suojin
/
jonhon-mes-svr
23
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

暂存

Browse Source
liweidong
liweidong-hj 1 week ago
parent 0a065cee54
commit 18bc148329
1 changed files with 26 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 78
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java

78
blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java
Unescape View File

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

Write Preview
Loading…
Cancel
Save