虚拟清单添加适用增补件

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;
 
+
+
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml

@@ -37,5 +37,6 @@
         <result column="verify_initiator" property="verifyInitiator" />
         <result column="verify_duty" property="verifyDuty" />
         <result column="region" property="region" />
+        <result column="applicable_supplement" property="applicableSupplement" />
     </resultMap>
 </mapper>

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<DummyInventoryI
 			if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
 				titleOne = "*编号,子标题,实施类别," +
 						"WVTA ID,认证类型," +
-						"*认证级别," +
+						"*认证级别," +"适用增补件,"+
 						"*责任领域,备注," +
 						"设计符合性确认,Pre-homo确认,验证符合性确认";
 				titleTwo = "交付物类型,交付物模板,发起人,责任人,交付物类型,交付物模板,发起人,责任人,交付物类型,交付物模板,发起人,责任人";
 			}else{
 				titleOne = "*serial number,subtitle,implementation category," +
 						"WVTA ID,certification type," +
-						"*certification level," +
+						"*certification level," +"applicable supplement,"+
 						"*area of responsibility,remarks," +
 						"design compliance check,pre-homo check,validation compliance chech";
 				titleTwo = "type of deliverables,deliverable template,initiator,person liable," +
@@ -513,7 +513,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 						new CellRangeAddress(0, 1, i, i);
 				sheet.addMergedRegion(region1);
 			}
-			for (int i = index; i < 11; i++) {
+			for (int i = index; i < 12; i++) {
 				if(count > 1){
 					startLine = startLine + line + 1;
 					endLine = startLine + line;
@@ -528,7 +528,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				count ++;
 			}
 			CellRangeAddress region =
-					new CellRangeAddress(2, 2, 0, 19); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列
+					new CellRangeAddress(2, 2, 0, 20); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列
 			sheet.addMergedRegion(region);
 			String explain= "";
 			if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
@@ -571,7 +571,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 					//titleTwo
 					String[] headerArrTwo = titleTwo.split(",");
 					for (int j = 0; j < headerArrTwo.length; j++) {
-						row.createCell(8+j).setCellValue(headerArrTwo[j]);
+						row.createCell(9+j).setCellValue(headerArrTwo[j]);
 					}
 				}else{
 					short height = (short) (7 * 252);
@@ -604,7 +604,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 	 */
 	private void treeDict(DummyInventoryInfoEO dummyInventoryInfoEO, List<DummyInventoryInfoEO> dummyInventoryInfoEOList) {
 		Set<String> technologyTerritorySet = new HashSet<>();
-		Set<String> correspondingStandardSet = new HashSet<>();
+//		Set<String> correspondingStandardSet = new HashSet<>();
 		List<String> deliverableList = new ArrayList<>();
 		if(dummyInventoryInfoEOList.size() != 0){
 			for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) {
@@ -614,10 +614,10 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 					technologyTerritorySet.addAll(list);
 				}
 				//对应标准
-				if(StringUtils.isNotBlank(record.getCorrespondingStandard())){
-					List<String> list = Arrays.asList(record.getCorrespondingStandard().split(","));
-					correspondingStandardSet.addAll(list);
-				}
+//				if(StringUtils.isNotBlank(record.getCorrespondingStandard())){
+//					List<String> 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<DummyInventoryI
 				}
 			}
 
-			List<BussDocumentLibraryEO> bussDocumentLibraryEOList = new ArrayList<>();
-			if(correspondingStandardSet.size() != 0){
-				//对应标准 iBussDocumentLibraryEOService
-				LambdaQueryWrapper<BussDocumentLibraryEO> wrapperTemp = new LambdaQueryWrapper<>();
-				wrapperTemp.in(BussDocumentLibraryEO::getId,correspondingStandardSet);
-				bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapperTemp);
-			}
+//			List<BussDocumentLibraryEO> bussDocumentLibraryEOList = new ArrayList<>();
+//			if(correspondingStandardSet.size() != 0){
+//				//对应标准 iBussDocumentLibraryEOService
+//				LambdaQueryWrapper<BussDocumentLibraryEO> wrapperTemp = new LambdaQueryWrapper<>();
+//				wrapperTemp.in(BussDocumentLibraryEO::getId,correspondingStandardSet);
+//				bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapperTemp);
+//			}
 
 
 
@@ -659,23 +659,23 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 
 			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(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())) {
 					List<String> technologyTerritoryList = Arrays.asList(record.getTechnologyTerritory().split(","));
@@ -743,7 +743,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 	public void importData(MultipartFile file, DummyInventoryInfoEO dummyInventoryInfoEO) {
 		String title = "";
 		if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
-			title = "*编号,子标题,实施类别,WVTA ID,认证类型,*认证级别,*责任领域,备注," +
+			title = "*编号,子标题,实施类别,WVTA ID,认证类型,*认证级别,适用增补件,*责任领域,备注," +
 					"设计交付物类型,设计交付物模板,设计发起人,设计责任人,pre交付物类型,pre交付物模板,pre发起人,pre责任人,验证交付物类型,验证交付物模板,验证发起人,验证责任人";
 		}else{
 
@@ -862,21 +862,21 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 								if (i == 0) {
 									cell.setCellType(HSSFCell.CELL_TYPE_STRING);
 									headerSb.append(cell.getStringCellValue() + ",");
-									if(j == 7){
+									if(j == 8){
 										break;
 									}
 								}else if(i == 1){
-									if(j > 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<DummyInventoryI
 			case "WVTA ID": return "wvtaId";
 			case "认证类型": return "attestationType";
 			case "*认证级别": return "attestationRank";
+			case "适用增补件": return "applicableSupplement";
 			case "技术领域": return "technologyTerritory";
 			case "*责任领域": return "dutyTerritory";
 			case "适用地区": return "region";