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 f37c8a175..25ebd5b3d 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 @@ -153,6 +153,11 @@ public class DummyInventoryInfoEO implements Serializable { @Dict(dicCode ="attestation_rank") private java.lang.String attestationRank; + /**适用增补件*/ + @ApiModelProperty(value = "适用增补件") + @Excel(name = "适用增补件", width = 15) + private java.lang.String applicableSupplement; + /**责任领域*/ @Excel(name = "责任领域", width = 15,dicCode ="duty_territory") @ApiModelProperty(value = "责任领域") @@ -257,4 +262,6 @@ public class DummyInventoryInfoEO implements Serializable { @TableField(exist = false) private Integer pageSize; + + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml index 898137e6c..61fcb9840 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml @@ -37,5 +37,6 @@ + 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 baff61dc5..387419cc9 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 @@ -462,14 +462,14 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl 1){ startLine = startLine + line + 1; endLine = startLine + line; @@ -528,7 +528,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl dummyInventoryInfoEOList) { Set technologyTerritorySet = new HashSet<>(); - Set correspondingStandardSet = new HashSet<>(); +// Set correspondingStandardSet = new HashSet<>(); List deliverableList = new ArrayList<>(); if(dummyInventoryInfoEOList.size() != 0){ for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) { @@ -614,10 +614,10 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl list = Arrays.asList(record.getCorrespondingStandard().split(",")); - correspondingStandardSet.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(","))); @@ -632,13 +632,13 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl bussDocumentLibraryEOList = new ArrayList<>(); - if(correspondingStandardSet.size() != 0){ - //对应标准 iBussDocumentLibraryEOService - LambdaQueryWrapper wrapperTemp = new LambdaQueryWrapper<>(); - wrapperTemp.in(BussDocumentLibraryEO::getId,correspondingStandardSet); - bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapperTemp); - } +// List bussDocumentLibraryEOList = new ArrayList<>(); +// if(correspondingStandardSet.size() != 0){ +// //对应标准 iBussDocumentLibraryEOService +// LambdaQueryWrapper wrapperTemp = new LambdaQueryWrapper<>(); +// wrapperTemp.in(BussDocumentLibraryEO::getId,correspondingStandardSet); +// bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapperTemp); +// } @@ -659,23 +659,23 @@ 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(bussDocumentLibraryEOList.size() != 0 && StringUtils.isNotBlank(record.getCorrespondingStandard())){ +// StringBuilder stringBuilder = new StringBuilder(); +// for (String bussDocumentLibraryId : record.getCorrespondingStandard().split(",")) { +// List 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(",")); @@ -743,7 +743,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl 7){ + if(j > 8){ String flag = ""; - if(7 < j && j < 12){ + if(8 < j && j < 13){ flag ="设计"; key = flag + headerCell.getStringCellValue(); } - if(11 < j && j < 16){ + if(12 < j && j < 17){ flag ="pre"; key = flag + headerCell.getStringCellValue(); } - if(15 < j && j < 20){ + if(16 < j && j < 21){ flag ="验证"; key = flag + headerCell.getStringCellValue(); @@ -1420,6 +1420,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl