虚拟清单--对应标准列表展示
This commit is contained in:
+2
@@ -120,6 +120,8 @@ public class DummyInventoryInfoEO implements Serializable {
|
|||||||
@Excel(name = "对应标准", width = 15)
|
@Excel(name = "对应标准", width = 15)
|
||||||
@ApiModelProperty(value = "对应标准")
|
@ApiModelProperty(value = "对应标准")
|
||||||
private java.lang.String correspondingStandard;
|
private java.lang.String correspondingStandard;
|
||||||
|
@TableField(exist = false)
|
||||||
|
private java.lang.String correspondingStandardName;
|
||||||
|
|
||||||
/**WVTA ID*/
|
/**WVTA ID*/
|
||||||
@Excel(name = "WVTA ID", width = 15)
|
@Excel(name = "WVTA ID", width = 15)
|
||||||
|
|||||||
+31
@@ -342,6 +342,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
|||||||
*/
|
*/
|
||||||
private void treeDict(DummyInventoryInfoEO dummyInventoryInfoEO, List<DummyInventoryInfoEO> dummyInventoryInfoEOList) {
|
private void treeDict(DummyInventoryInfoEO dummyInventoryInfoEO, List<DummyInventoryInfoEO> dummyInventoryInfoEOList) {
|
||||||
Set<String> technologyTerritorySet = new HashSet<>();
|
Set<String> technologyTerritorySet = new HashSet<>();
|
||||||
|
Set<String> correspondingStandardSet = new HashSet<>();
|
||||||
List<String> deliverableList = new ArrayList<>();
|
List<String> deliverableList = new ArrayList<>();
|
||||||
if(dummyInventoryInfoEOList.size() != 0){
|
if(dummyInventoryInfoEOList.size() != 0){
|
||||||
for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) {
|
for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) {
|
||||||
@@ -350,6 +351,11 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
|||||||
List<String> list = Arrays.asList(record.getTechnologyTerritory().split(","));
|
List<String> list = Arrays.asList(record.getTechnologyTerritory().split(","));
|
||||||
technologyTerritorySet.addAll(list);
|
technologyTerritorySet.addAll(list);
|
||||||
}
|
}
|
||||||
|
//对应标准
|
||||||
|
if(StringUtils.isNotBlank(record.getCorrespondingStandard())){
|
||||||
|
List<String> list = Arrays.asList(record.getCorrespondingStandard().split(","));
|
||||||
|
correspondingStandardSet.addAll(list);
|
||||||
|
}
|
||||||
//设计符合性确认交付物模板
|
//设计符合性确认交付物模板
|
||||||
if(StringUtils.isNotBlank(record.getDesignDeliverableTemplate())){
|
if(StringUtils.isNotBlank(record.getDesignDeliverableTemplate())){
|
||||||
deliverableList.addAll(Arrays.asList(record.getDesignDeliverableTemplate().split(",")));
|
deliverableList.addAll(Arrays.asList(record.getDesignDeliverableTemplate().split(",")));
|
||||||
@@ -364,6 +370,13 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//对应标准 iBussDocumentLibraryEOService
|
||||||
|
LambdaQueryWrapper<BussDocumentLibraryEO> wrapperTemp = new LambdaQueryWrapper<>();
|
||||||
|
wrapperTemp.in(BussDocumentLibraryEO::getId,correspondingStandardSet);
|
||||||
|
List<BussDocumentLibraryEO> bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapperTemp);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//文件
|
//文件
|
||||||
List<OSSFile> fileInfos = new ArrayList<>();
|
List<OSSFile> fileInfos = new ArrayList<>();
|
||||||
if(deliverableList.size() != 0){
|
if(deliverableList.size() != 0){
|
||||||
@@ -379,6 +392,24 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) {
|
for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) {
|
||||||
|
//对应标准
|
||||||
|
if(bussDocumentLibraryEOList.size() != 0 && StringUtils.isNotBlank(record.getCorrespondingStandard())){
|
||||||
|
StringBuilder stringBuilder = new StringBuilder();
|
||||||
|
for (String bussDocumentLibraryId : record.getCorrespondingStandard().split(",")) {
|
||||||
|
List<BussDocumentLibraryEO> 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())) {
|
if (categoryList.size() != 0 && StringUtils.isNotBlank(record.getTechnologyTerritory())) {
|
||||||
List<String> technologyTerritoryList = Arrays.asList(record.getTechnologyTerritory().split(","));
|
List<String> technologyTerritoryList = Arrays.asList(record.getTechnologyTerritory().split(","));
|
||||||
|
|||||||
Reference in New Issue
Block a user