|
@@ -599,13 +599,16 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
|
|
|
|
|
|
@Override
|
|
|
public SbTreeVO getSbVOById(SbInfoDTO sbInfoDTO) {
|
|
|
- List<String> ids=sbInfoMapper.getSubSb(sbInfoDTO);
|
|
|
+ SbInfoVO sbInfoVO=sbInfoMapper.getById(sbInfoDTO.getId());
|
|
|
+ List<SbInfoVO> ids=sbInfoMapper.getSubSb(sbInfoDTO);
|
|
|
SbTreeVO sbTreeVO = new SbTreeVO();
|
|
|
+ sbTreeVO.setName(sbInfoVO.getName());
|
|
|
List<SbTreeVO> subSbTreeList=new ArrayList<>();
|
|
|
if(ids!=null&&ids.size()>0){
|
|
|
- for(String id: ids){
|
|
|
+ for(SbInfoVO id: ids){
|
|
|
SbInfoDTO infoDTO=new SbInfoDTO();
|
|
|
- SbTreeVO subSbTreeVO= getSbVOById(infoDTO.setId(id));
|
|
|
+ SbTreeVO subSbTreeVO= getSbVOById(infoDTO.setId(id.getId()));
|
|
|
+ subSbTreeVO.setName(id.getName());
|
|
|
subSbTreeList.add(subSbTreeVO);
|
|
|
|
|
|
}
|
|
@@ -631,6 +634,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
|
|
|
}
|
|
|
info.setSparePartInfoVOList(spareList2);
|
|
|
}
|
|
|
+
|
|
|
sbTreeVO.setId(sbInfoDTO.getId());
|
|
|
sbTreeVO.setPartInfoList(partInfoList);
|
|
|
sbTreeVO.setSbModelSpareBomVOList(spareList);
|