虚拟清单--添加使用地区字段

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java

@@ -37,48 +37,44 @@ public class BussDocumentLibraryEO implements Serializable {
     private java.lang.String id;
 
     /**编号*/
-    @Excel(name = "编号", width = 15)
     @ApiModelProperty(value = "编号")
     private java.lang.String serialNumber;
 
     /**标题*/
-    @Excel(name = "标题", width = 15)
     @ApiModelProperty(value = "标题")
     private java.lang.String title;
 
     /**适用范围*/
-    @Excel(name = "适用范围", width = 15)
     @ApiModelProperty(value = "适用范围")
     private java.lang.String shi4Yong4Fan4Wei2;
 
+    /**适用地区*/
+    @ApiModelProperty(value = "适用地区")
+    private java.lang.String region;
+
     /**状态*/
-    @Excel(name = "状态", width = 15)
     @ApiModelProperty(value = "状态")
     @Dict(dicCode ="state")
     private java.lang.String state;
 
     /**技术领域*/
-    @Excel(name = "技术领域", width = 15)
     @ApiModelProperty(value = "技术领域")
     @Dict(dicCode ="technology_territory")
     private java.lang.String technologyTerritory;
 
     /**新车型实施日期*/
-    @Excel(name = "新车型实施日期", width = 15)
     @ApiModelProperty(value = "新车型实施日期")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private java.util.Date xin1Che1Xing2Shi2Shi1Ri4Qi1;
 
     /**在产车实施日期*/
-    @Excel(name = "在产车实施日期", width = 15)
     @ApiModelProperty(value = "在产车实施日期")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private java.util.Date implementTime;
 
     /**对应标准*/
-    @Excel(name = "对应标准", width = 15)
     @ApiModelProperty(value = "对应标准")
     private java.lang.String correspondingStandard;
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java

@@ -80,8 +80,14 @@ public class DummyInventoryInfoEO implements Serializable {
 	/**适用范围*/
 	@Excel(name = "适用范围", width = 15)
     @ApiModelProperty(value = "适用范围")
+    @Dict(dicCode ="apply_scope")
     private java.lang.String shi4Yong4Fan4Wei2;
 
+	/**适用地区*/
+    @ApiModelProperty(value = "适用地区")
+    @Dict(dicCode ="region")
+    private java.lang.String region;
+
 	/**状态*/
 	@Excel(name = "状态", width = 15)
     @ApiModelProperty(value = "状态")

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

@@ -36,5 +36,6 @@
         <result column="verify_deliverable_template" property="verifyDeliverableTemplate" />
         <result column="verify_initiator" property="verifyInitiator" />
         <result column="verify_duty" property="verifyDuty" />
+        <result column="region" property="region" />
     </resultMap>
 </mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java

@@ -343,77 +343,83 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 	private void treeDict(DummyInventoryInfoEO dummyInventoryInfoEO, List<DummyInventoryInfoEO> dummyInventoryInfoEOList) {
 		Set<String> technologyTerritorySet = new HashSet<>();
 		List<String> deliverableList = new ArrayList<>();
-		for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) {
+		if(dummyInventoryInfoEOList.size() != 0){
-			//技术领域
+			for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) {
-			if(StringUtils.isNotBlank(record.getTechnologyTerritory())){
+				//技术领域
-				List<String> list = Arrays.asList(record.getTechnologyTerritory().split(","));
+				if(StringUtils.isNotBlank(record.getTechnologyTerritory())){
-				technologyTerritorySet.addAll(list);
+					List<String> list = Arrays.asList(record.getTechnologyTerritory().split(","));
+					technologyTerritorySet.addAll(list);
+				}
+				//设计符合性确认交付物模板
+				if(StringUtils.isNotBlank(record.getDesignDeliverableTemplate())){
+					deliverableList.addAll(Arrays.asList(record.getDesignDeliverableTemplate().split(",")));
+				}
+				// Prehomo确认交付物模板
+				if(StringUtils.isNotBlank(record.getPrehomoDeliverableTemplate())){
+					deliverableList.addAll(Arrays.asList(record.getPrehomoDeliverableTemplate().split(",")));
+				}
+				// 验证符合性确认交付物模板
+				if(StringUtils.isNotBlank(record.getVerifyDeliverableTemplate())){
+					deliverableList.addAll(Arrays.asList(record.getVerifyDeliverableTemplate().split(",")));
+				}
 			}
-			//设计符合性确认交付物模板
-			if(StringUtils.isNotBlank(record.getDesignDeliverableTemplate())){
-				deliverableList.addAll(Arrays.asList(record.getDesignDeliverableTemplate().split(",")));
-			}
-			// Prehomo确认交付物模板
-			if(StringUtils.isNotBlank(record.getPrehomoDeliverableTemplate())){
-				deliverableList.addAll(Arrays.asList(record.getPrehomoDeliverableTemplate().split(",")));
-			}
-			// 验证符合性确认交付物模板
-			if(StringUtils.isNotBlank(record.getVerifyDeliverableTemplate())){
-				deliverableList.addAll(Arrays.asList(record.getVerifyDeliverableTemplate().split(",")));
-			}
-		}
 
-		//文件
+			//文件
-		List<OSSFile> fileInfos = new ArrayList<>();
+			List<OSSFile> fileInfos = new ArrayList<>();
-		if(deliverableList.size() != 0){
+			if(deliverableList.size() != 0){
-			fileInfos = iOSSFileService.getFileInfos(StringUtils.join(deliverableList, ","));
+				fileInfos = iOSSFileService.getFileInfos(StringUtils.join(deliverableList, ","));
-		}
+			}
 
-		//树形结构数据字典(技术领域)
+			//树形结构数据字典(技术领域)
-		LambdaQueryWrapper<SysCategory> wrapper = new LambdaQueryWrapper<>();
+			List<SysCategory> categoryList = new ArrayList<>();
-		wrapper.in(SysCategory::getId, technologyTerritorySet);
+			if(technologyTerritorySet.size() != 0){
-		List<SysCategory> categoryList = sysCategoryService.list(wrapper);
+				LambdaQueryWrapper<SysCategory> wrapper = new LambdaQueryWrapper<>();
-		for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) {
+				wrapper.in(SysCategory::getId, technologyTerritorySet);
-			//技术领域
+				categoryList = sysCategoryService.list(wrapper);
-			if (categoryList.size() != 0 && StringUtils.isNotBlank(record.getTechnologyTerritory())) {
+			}
-				List<String> technologyTerritoryList = Arrays.asList(record.getTechnologyTerritory().split(","));
+
-				StringBuilder sb = new StringBuilder();
+			for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) {
-				for (String technologyTerritory : technologyTerritoryList) {
+				//技术领域
-					List<SysCategory> collect = categoryList.stream().filter(e -> technologyTerritory.equals(e.getId())).collect(Collectors.toList());
+				if (categoryList.size() != 0 && StringUtils.isNotBlank(record.getTechnologyTerritory())) {
-					if(collect.size() != 0){
+					List<String> technologyTerritoryList = Arrays.asList(record.getTechnologyTerritory().split(","));
-						if (CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())) {
+					StringBuilder sb = new StringBuilder();
-							sb.append(collect.get(0).getName() + ",");
+					for (String technologyTerritory : technologyTerritoryList) {
-						} else {
+						List<SysCategory> collect = categoryList.stream().filter(e -> technologyTerritory.equals(e.getId())).collect(Collectors.toList());
-							sb.append(collect.get(0).getEnName());
+						if(collect.size() != 0){
+							if (CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())) {
+								sb.append(collect.get(0).getName() + ",");
+							} else {
+								sb.append(collect.get(0).getEnName());
+							}
 						}
 					}
-				}
+					String technologyTerritoryName = "";
-				String technologyTerritoryName = "";
+					if (StringUtils.isNotBlank(sb)) {
-				if (StringUtils.isNotBlank(sb)) {
+						technologyTerritoryName = sb.substring(0, sb.length() - 1);
-					technologyTerritoryName = sb.substring(0, sb.length() - 1);
-				}
-				record.setTechnologyTerritoryName(technologyTerritoryName);
-			}
-
-			//交付物类型模板
-			if(fileInfos.size() != 0){
-				if(StringUtils.isNotBlank(record.getDesignDeliverableTemplate())){
-					String fileName = getFileName(record, fileInfos,record.getDesignDeliverableTemplate());
-					if(StringUtils.isNotBlank(fileName)){
-						record.setDesignDeliverableTemplateName(fileName);
 					}
+					record.setTechnologyTerritoryName(technologyTerritoryName);
 				}
-				if(StringUtils.isNotBlank(record.getPrehomoDeliverableTemplate())){
-					String fileName = getFileName(record, fileInfos,record.getPrehomoDeliverableTemplate());
-					if(StringUtils.isNotBlank(fileName)){
-						record.setPrehomoDeliverableTemplateName(fileName);
-					}
-				}
-				if(StringUtils.isNotBlank(record.getVerifyDeliverableTemplate())){
-					String fileName = getFileName(record, fileInfos,record.getVerifyDeliverableTemplate());
-					if(StringUtils.isNotBlank(fileName)){
-						record.setVerifyDeliverableTemplateName(fileName);
 
+				//交付物类型模板
+				if(fileInfos.size() != 0){
+					if(StringUtils.isNotBlank(record.getDesignDeliverableTemplate())){
+						String fileName = getFileName(record, fileInfos,record.getDesignDeliverableTemplate());
+						if(StringUtils.isNotBlank(fileName)){
+							record.setDesignDeliverableTemplateName(fileName);
+						}
+					}
+					if(StringUtils.isNotBlank(record.getPrehomoDeliverableTemplate())){
+						String fileName = getFileName(record, fileInfos,record.getPrehomoDeliverableTemplate());
+						if(StringUtils.isNotBlank(fileName)){
+							record.setPrehomoDeliverableTemplateName(fileName);
+						}
+					}
+					if(StringUtils.isNotBlank(record.getVerifyDeliverableTemplate())){
+						String fileName = getFileName(record, fileInfos,record.getVerifyDeliverableTemplate());
+						if(StringUtils.isNotBlank(fileName)){
+							record.setVerifyDeliverableTemplateName(fileName);
+
+						}
 					}
 				}
 			}