diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java index 122681a34..737b587ee 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java @@ -120,6 +120,8 @@ public class DummyInventoryInfoEO implements Serializable { @Excel(name = "对应标准", width = 15) @ApiModelProperty(value = "对应标准") private java.lang.String correspondingStandard; + @TableField(exist = false) + private java.lang.String correspondingStandardName; /**WVTA ID*/ @Excel(name = "WVTA ID", width = 15) 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 70e50e874..a2fdbde13 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 @@ -342,6 +342,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl dummyInventoryInfoEOList) { Set technologyTerritorySet = new HashSet<>(); + Set correspondingStandardSet = new HashSet<>(); List deliverableList = new ArrayList<>(); if(dummyInventoryInfoEOList.size() != 0){ for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) { @@ -350,6 +351,11 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl list = Arrays.asList(record.getTechnologyTerritory().split(",")); technologyTerritorySet.addAll(list); } + //对应标准 + if(StringUtils.isNotBlank(record.getCorrespondingStandard())){ + List list = Arrays.asList(record.getCorrespondingStandard().split(",")); + correspondingStandardSet.addAll(list); + } //设计符合性确认交付物模板 if(StringUtils.isNotBlank(record.getDesignDeliverableTemplate())){ deliverableList.addAll(Arrays.asList(record.getDesignDeliverableTemplate().split(","))); @@ -364,6 +370,13 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl wrapperTemp = new LambdaQueryWrapper<>(); + wrapperTemp.in(BussDocumentLibraryEO::getId,correspondingStandardSet); + List bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapperTemp); + + + //文件 List fileInfos = new ArrayList<>(); if(deliverableList.size() != 0){ @@ -379,6 +392,24 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl bussDocumentLibraryEOS = bussDocumentLibraryEOList.stream() + .filter(e -> e.getId().equals(bussDocumentLibraryId)).collect(Collectors.toList()); + if(bussDocumentLibraryEOS.size() != 0){ + stringBuilder.append(bussDocumentLibraryEOS.get(0).getSerialNumber()+","); + }else{ + //手动输入的情况 + stringBuilder.append(bussDocumentLibraryId + ","); + } + } + if(StringUtils.isNotBlank(stringBuilder)){ + String substring = stringBuilder.substring(0, stringBuilder.length() - 1); + record.setCorrespondingStandardName(substring); + } + } //技术领域 if (categoryList.size() != 0 && StringUtils.isNotBlank(record.getTechnologyTerritory())) { List technologyTerritoryList = Arrays.asList(record.getTechnologyTerritory().split(","));