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

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,6 +343,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 	private void treeDict(DummyInventoryInfoEO dummyInventoryInfoEO, List<DummyInventoryInfoEO> dummyInventoryInfoEOList) {
 		Set<String> technologyTerritorySet = new HashSet<>();
 		List<String> deliverableList = new ArrayList<>();
+		if(dummyInventoryInfoEOList.size() != 0){
 			for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) {
 				//技术领域
 				if(StringUtils.isNotBlank(record.getTechnologyTerritory())){
@@ -370,9 +371,13 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 			}
 
 			//树形结构数据字典(技术领域)
+			List<SysCategory> categoryList = new ArrayList<>();
+			if(technologyTerritorySet.size() != 0){
 				LambdaQueryWrapper<SysCategory> wrapper = new LambdaQueryWrapper<>();
 				wrapper.in(SysCategory::getId, technologyTerritorySet);
-		List<SysCategory> categoryList = sysCategoryService.list(wrapper);
+				categoryList = sysCategoryService.list(wrapper);
+			}
+
 			for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) {
 				//技术领域
 				if (categoryList.size() != 0 && StringUtils.isNotBlank(record.getTechnologyTerritory())) {
@@ -419,6 +424,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				}
 			}
 		}
+	}
 
 	private String getFileName(DummyInventoryInfoEO dummyInventoryInfoEO,List<OSSFile> fileInfos,String deliverableTemplate){
 		StringBuilder sb = new StringBuilder();