diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 12ed3c214..dc4542c77 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -153,6 +153,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl queryList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO,req.getParameterMap()); + queryWrapper.in("dummy_inventory_base_id",dummyInventoryInfoEO.getDummyInventoryBaseId()); queryWrapper.orderByDesc("create_time"); + List dummyInventoryInfoEOList = this.list(queryWrapper); //技术领域处理 treeDict(dummyInventoryInfoEO, dummyInventoryInfoEOList); @@ -769,6 +772,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl stringStringMap : dataList) { DummyInventoryInfoEO dummyInventoryInfoEOTemp = JSON.parseObject(JSON.toJSONString(stringStringMap), DummyInventoryInfoEO.class); dummyInventoryInfoEOTemp.setCut(dummyInventoryInfoEO.getCut()); + dummyInventoryInfoEOTemp.setDummyInventoryBaseId(dummyInventoryInfoEO.getDummyInventoryBaseId()); datas.add(dummyInventoryInfoEOTemp); } } @@ -1284,6 +1288,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl dataList = new ArrayList<>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO,request.getParameterMap()); + queryWrapper.in("dummy_inventory_base_id",dummyInventoryInfoEO.getDummyInventoryBaseId()); if(StringUtils.isNotBlank(dummyInventoryInfoEO.getIds())){ queryWrapper.in("id",Arrays.asList(dummyInventoryInfoEO.getIds().split(","))); } @@ -1444,13 +1449,29 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl getOssFiles(List dataList) { List fileIdList = new ArrayList<>(); - List design = dataList.stream().map(DummyInventoryInfoEO::getDesignDeliverableTemplate).collect(Collectors.toList()); - List prehomo = dataList.stream().map(DummyInventoryInfoEO::getPrehomoDeliverableTemplate).collect(Collectors.toList()); - List verify = dataList.stream().map(DummyInventoryInfoEO::getVerifyDeliverableTemplate).collect(Collectors.toList()); - fileIdList.addAll(design); - fileIdList.addAll(prehomo); - fileIdList.addAll(verify); - + List design = new ArrayList<>(); + List prehomo = new ArrayList<>(); + List verify = new ArrayList<>(); + for (DummyInventoryInfoEO dummyInventoryInfoEO : dataList) { + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableTemplate())){ + design.add(dummyInventoryInfoEO.getDesignDeliverableTemplate()); + } + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableTemplate())){ + prehomo.add(dummyInventoryInfoEO.getPrehomoDeliverableTemplate()); + } + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableTemplate())){ + verify.add(dummyInventoryInfoEO.getVerifyDeliverableTemplate()); + } + } + if(design.size() != 0){ + fileIdList.addAll(design); + } + if(prehomo.size() != 0){ + fileIdList.addAll(prehomo); + } + if(verify.size() != 0){ + fileIdList.addAll(verify); + } //查询所有的文件 List fileInfos = new ArrayList<>(); if(fileIdList.size() != 0){