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

暂存

Browse Source
liweidong
liweidong-hj 4 weeks ago
parent 12aa2fc3e8
commit 2f49157c8b
1 changed files with 19 additions and 15 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. 34
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java

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

@ -202,15 +202,17 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
// } // }
//查询子件信息 //查询子件信息
List<DsPartRelationEntity> partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId()); if(null != partEntity){
//获取所有子件ID List<DsPartRelationEntity> partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId());
List<Long> idList = partRelationEntityList.stream().map(DsPartRelationEntity::getChildPartId).collect(Collectors.toList()); //获取所有子件ID
if (!CollectionUtils.isEmpty(idList)) { List<Long> idList = partRelationEntityList.stream().map(DsPartRelationEntity::getChildPartId).collect(Collectors.toList());
List<DsPartVersionVO> dsPartEntityList = partService.selectDsPartVersionByIds(idList); if (!CollectionUtils.isEmpty(idList)) {
List<DsPartVersionVO> dsPartEntityList = partService.selectDsPartVersionByIds(idList);
// for (DsPartVersionVO dsPartVersionVO : dsPartEntityList) { // for (DsPartVersionVO dsPartVersionVO : dsPartEntityList) {
// dsPartVersionVO.setUpdateUserStr(userClient.userInfo(Func.toLong(dsPartVersionVO.getUpdateUser())).getData().getUser().getName()); // dsPartVersionVO.setUpdateUserStr(userClient.userInfo(Func.toLong(dsPartVersionVO.getUpdateUser())).getData().getUser().getName());
// } // }
dsTaskingVO.setChildren(dsPartEntityList); dsTaskingVO.setChildren(dsPartEntityList);
}
} }
} }
} }
@ -520,17 +522,19 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
//// dsTaskingVO.setChildren(list); //// dsTaskingVO.setChildren(list);
//// } //// }
// } // }
List<DsPartRelationEntity> partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId()); if(null != partEntity){
//获取所有子件ID List<DsPartRelationEntity> partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId());
List<Long> idList = partRelationEntityList.stream().map(DsPartRelationEntity::getChildPartId).collect(Collectors.toList()); //获取所有子件ID
if (!CollectionUtils.isEmpty(idList)) { List<Long> idList = partRelationEntityList.stream().map(DsPartRelationEntity::getChildPartId).collect(Collectors.toList());
List<DsPartVersionVO> dsPartEntityList = partService.selectDsPartVersionByIds(idList); if (!CollectionUtils.isEmpty(idList)) {
for (DsPartVersionVO dsPartVersionVO : dsPartEntityList) { List<DsPartVersionVO> dsPartEntityList = partService.selectDsPartVersionByIds(idList);
for (DsPartVersionVO dsPartVersionVO : dsPartEntityList) {
// dsPartVersionVO.setUpdateUserStr(userClient.userInfo(Func.toLong(dsPartVersionVO.getUpdateUser())).getData().getUser().getName()); // dsPartVersionVO.setUpdateUserStr(userClient.userInfo(Func.toLong(dsPartVersionVO.getUpdateUser())).getData().getUser().getName());
DsPartVersionEntity partVersionEntity = partVersionService.selectByPartId(dsPartVersionVO.getId()); DsPartVersionEntity partVersionEntity = partVersionService.selectByPartId(dsPartVersionVO.getId());
dsPartVersionVO.setPartVersion(partVersionEntity.getPartVersion()); dsPartVersionVO.setPartVersion(partVersionEntity.getPartVersion());
}
dsTaskingVO.setChildren(dsPartEntityList);
} }
dsTaskingVO.setChildren(dsPartEntityList);
} }
} }
} }

Write Preview
Loading…
Cancel
Save