认证-参数项-变更:去掉技术领域

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java

@@ -77,10 +77,10 @@ public class ParamsInfoEO implements Serializable {
     private String paramsName;
 
 	/**技术领域*/
-	@Excel(name = "*技术领域", width = 15)
+//	@Excel(name = "*技术领域", width = 15)
 //    @Dict(dicCode = "technology_territory")
     @ApiModelProperty(value = "技术领域")
-    private String technologyTerritory;
+    private String technologyTerritory; // 2022-07-12 需求去掉技术领域
 
 	/**参数批次*/
 	@Excel(name = "*参数批次", width = 15, dicCode = "params_batch")

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java

@@ -455,7 +455,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 			if (CutEnum.CN.getValue().equals(cut)) {
 				// 查询导出数据
 				List<ParamsInfoEO> paramsInfoEOList = paramsInfoEOMapper.selectListWithCert(paramsInfoVO); // 中文数据导出
-				getTreeDictItemText(paramsInfoEOList, cut);
+//				getTreeDictItemText(paramsInfoEOList, cut);
 				List<Map<String, Object>> sheetsList = new ArrayList<>();
 				sheetsList = getCnExportSheetsList(paramsInfoEOList, fileNowPath, paramsTemplateId);
 				workbook = ExcelExportUtil.exportExcel(sheetsList, ExcelType.XSSF);
@@ -463,7 +463,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 			} else if (CutEnum.EN.getValue().equals(cut)) {
 				// 查询导出数据
 				List<ParamsInfoEnExport> paramsInfoEnExportList = paramsInfoEOMapper.selectListWithCertForEnExport(paramsInfoVO); // 英文数据导出
-				getTreeDictItemTextForEnExport(paramsInfoEnExportList);
+//				getTreeDictItemTextForEnExport(paramsInfoEnExportList);
 				List<Map<String, Object>> sheetsList = new ArrayList<>();
 				sheetsList = getEnExportSheetsList(paramsInfoEnExportList, fileNowPath, paramsTemplateId);
 				workbook = ExcelExportUtil.exportExcel(sheetsList, ExcelType.XSSF);
@@ -839,7 +839,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 					// 第几个sheet页
 					if (numSheet == 0) { // 企业参数表
 						if (CutEnum.EN.getValue().equals(cut)) {
-							String fields[] ={ "*NIO Number", "*Is Must", "*Params Name","*Technical Field","*Params Batch","*Duty Territory",
+							String fields[] ={ "*NIO Number", "*Is Must", "*Params Name","*Params Batch","*Duty Territory",
 									"Description", "*Control Type", "Control Verify", "Control Values", "File Template"};
 							params.setImportFields(fields);
 
@@ -847,7 +847,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 							List<ParamsInfoEnImport> paramsInfoEOListEn = resultEn.getList();
 							copyParamsInfoList(paramsInfoEOListEn, paramsInfoEOList);
 						} else {
-							String fields[] ={ "*NIO编号", "*是否必填", "*参数名称","*技术领域","*参数批次","*责任领域",
+							String fields[] ={ "*NIO编号", "*是否必填", "*参数名称","*参数批次","*责任领域",
 									"参数说明", "*控件类型", "控件校验", "控件备选值", "附件模板"};
 							params.setImportFields(fields);
 
@@ -1069,7 +1069,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 									String cut){
 		List<CertCategoryParamsInfoCnImport> certCategoryParamsInfoEOList = new ArrayList<>();
 		// 树形数据字典
-		List<SysCategory> categoryList = sysCategoryService.queryByTreeDicCode("technology_territory");
+//		List<SysCategory> categoryList = sysCategoryService.queryByTreeDicCode("technology_territory");
 		// 普通数据字典
 		List<SysDictItem> dictItemList = new ArrayList<>();
 		List<String> dictCodeList = new ArrayList<>();
@@ -1091,12 +1091,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 		//普通数据字典
 		List<String> itemNameList = new ArrayList<>();
 		if (CutEnum.CN.getValue().equals(cut)) {
-			treeNameList = categoryList.stream().map(SysCategory::getName).collect(Collectors.toList());
+//			treeNameList = categoryList.stream().map(SysCategory::getName).collect(Collectors.toList());
 			itemNameList = dictItemList.stream().map(SysDictItem::getItemText).collect(Collectors.toList());
 
 			certCategoryMap = dictItemList.stream().filter(e->"cert_category".equals(e.getDictCode())).collect(Collectors.toMap(c->c.getItemText(),c->c.getItemValue()));
 		} else if(CutEnum.EN.getValue().equals(cut)){
-			treeNameList = categoryList.stream().map(SysCategory::getEnName).collect(Collectors.toList());
+//			treeNameList = categoryList.stream().map(SysCategory::getEnName).collect(Collectors.toList());
 			itemNameList = dictItemList.stream().map(SysDictItem::getEnName).collect(Collectors.toList());
 
 			certCategoryMap = dictItemList.stream().filter(e->"cert_category".equals(e.getDictCode())).collect(Collectors.toMap(c->c.getEnName(),c->c.getItemValue()));
@@ -1177,15 +1177,15 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 			countError += (int)resultMap.get("countError");
 
 			// 技术领域
-			String technologyTerritory =  dto.getTechnologyTerritory();
+//			String technologyTerritory =  dto.getTechnologyTerritory();
-			resultMap = validateMustAndLength(technologyTerritory, "技术领域", "Technical Field", IsMustEnum.YES.getValue(), "1000", false, cut);
+//			resultMap = validateMustAndLength(technologyTerritory, "技术领域", "Technical Field", IsMustEnum.YES.getValue(), "1000", false, cut);
-			errorMsg += (String)resultMap.get("errorMsg");
+//			errorMsg += (String)resultMap.get("errorMsg");
-			countError += (int)resultMap.get("countError");
+//			countError += (int)resultMap.get("countError");
-			resultMap = getCodeByName(technologyTerritory,"技术领域", "Technical Field","treeDicCode",null,treeNameList,categoryList,cut);
+//			resultMap = getCodeByName(technologyTerritory,"技术领域", "Technical Field","treeDicCode",null,treeNameList,categoryList,cut);
-			errorMsg += (String)resultMap.get("errorMsg");
+//			errorMsg += (String)resultMap.get("errorMsg");
-			countError += (int)resultMap.get("countError");
+//			countError += (int)resultMap.get("countError");
-			technologyTerritory = (String)resultMap.get("value");
+//			technologyTerritory = (String)resultMap.get("value");
-			dto.setTechnologyTerritory(technologyTerritory);
+//			dto.setTechnologyTerritory(technologyTerritory);
 
 			// 参数批次
 			String paramsBatch = dto.getParamsBatch();

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoCnImport.java

@@ -28,7 +28,7 @@ public class ParamsInfoCnImport {
     private String paramsName;
 
     /**技术领域*/
-    @Excel(name = "*技术领域", width = 15)
+//    @Excel(name = "*技术领域", width = 15)
     @ApiModelProperty(value = "技术领域")
     private String technologyTerritory;
 

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java

@@ -60,8 +60,8 @@ public class ParamsInfoEnExport {
     private String paramsName;
 
     /**技术领域*/
-    @Excel(name = "*Technical Field", width = 15)
+//    @Excel(name = "*Technical Field", width = 15)
-//    @Dict(dicCode = "technology_territory")
+////    @Dict(dicCode = "technology_territory")
     @ApiModelProperty(value = "技术领域")
     private String technologyTerritory;
 

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnImport.java

@@ -28,7 +28,7 @@ public class ParamsInfoEnImport {
     private String paramsName;
 
     /**技术领域*/
-    @Excel(name = "*Technical Field", width = 15)
+//    @Excel(name = "*Technical Field", width = 15)
     @ApiModelProperty(value = "技术领域")
     private String technologyTerritory;