From 3acf90d33e4226675b6385c3d966fc1352a7d677 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 12 Jul 2022 13:44:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9-?= =?UTF-8?q?=E5=8F=98=E6=9B=B4:=E5=8E=BB=E6=8E=89=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E9=A2=86=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cert/template/entity/ParamsInfoEO.java | 4 +-- .../service/impl/ParamsInfoEOServiceImpl.java | 32 +++++++++---------- .../cert/template/vo/ParamsInfoCnImport.java | 2 +- .../cert/template/vo/ParamsInfoEnExport.java | 4 +-- .../cert/template/vo/ParamsInfoEnImport.java | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java index bac0f3502..548885b9d 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java +++ b/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") diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index ad9bf75f1..0c2e0f47a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/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 paramsInfoEOList = paramsInfoEOMapper.selectListWithCert(paramsInfoVO); // 中文数据导出 - getTreeDictItemText(paramsInfoEOList, cut); +// getTreeDictItemText(paramsInfoEOList, cut); List> sheetsList = new ArrayList<>(); sheetsList = getCnExportSheetsList(paramsInfoEOList, fileNowPath, paramsTemplateId); workbook = ExcelExportUtil.exportExcel(sheetsList, ExcelType.XSSF); @@ -463,7 +463,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl paramsInfoEnExportList = paramsInfoEOMapper.selectListWithCertForEnExport(paramsInfoVO); // 英文数据导出 - getTreeDictItemTextForEnExport(paramsInfoEnExportList); +// getTreeDictItemTextForEnExport(paramsInfoEnExportList); List> sheetsList = new ArrayList<>(); sheetsList = getEnExportSheetsList(paramsInfoEnExportList, fileNowPath, paramsTemplateId); workbook = ExcelExportUtil.exportExcel(sheetsList, ExcelType.XSSF); @@ -839,7 +839,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl 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 certCategoryParamsInfoEOList = new ArrayList<>(); // 树形数据字典 - List categoryList = sysCategoryService.queryByTreeDicCode("technology_territory"); +// List categoryList = sysCategoryService.queryByTreeDicCode("technology_territory"); // 普通数据字典 List dictItemList = new ArrayList<>(); List dictCodeList = new ArrayList<>(); @@ -1091,12 +1091,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl 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