From f3ca6f763bb8cf35a1b86ede5c1bcdc8c6b8851b Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 16 Jun 2022 18:10:55 +0800 Subject: [PATCH] bug 54232 --- .../controller/ParamsInfoEOController.java | 4 +- .../entity/CertCategoryParamsInfoEO.java | 2 +- .../cert/template/entity/ParamsInfoEO.java | 4 +- .../service/IParamsInfoEOService.java | 2 +- .../service/impl/ParamsInfoEOServiceImpl.java | 93 +++++++++++++++---- .../vo/CertCategoryParamsInfoCnImport.java | 2 +- .../vo/CertCategoryParamsInfoEnExport.java | 8 +- .../vo/CertCategoryParamsInfoEnImport.java | 6 +- .../cert/template/vo/ParamsInfoCnImport.java | 4 +- .../cert/template/vo/ParamsInfoEnExport.java | 24 ++--- .../cert/template/vo/ParamsInfoEnImport.java | 24 ++--- 11 files changed, 115 insertions(+), 58 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java index da0342455..6f0941db9 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java @@ -213,8 +213,8 @@ public class ParamsInfoEOController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { - ParamsInfoEO paramsInfoEO = paramsInfoEOService.queryById(id); + public Result queryById(@RequestParam(name="id",required=true) String id, @RequestParam(name="cut",required=true) String cut) { + ParamsInfoEO paramsInfoEO = paramsInfoEOService.queryById(id,cut); if(paramsInfoEO==null) { return Result.error("未找到对应数据"); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java index cb39a5d9e..4f4b9b081 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java @@ -75,7 +75,7 @@ public class CertCategoryParamsInfoEO implements Serializable { private String description; /**nio编号*/ - @Excel(name = "*nio编号", width = 15, orderNum = "1") + @Excel(name = "*NIO编号", width = 15, orderNum = "1") @ApiModelProperty(value = "nio编号") private String nioNumber; 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 dabf60f86..46bb57d69 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 @@ -62,7 +62,7 @@ public class ParamsInfoEO implements Serializable { private String sysOrgCode; /**nio编号*/ - @Excel(name = "*nio编号", width = 15) + @Excel(name = "*NIO编号", width = 15) @ApiModelProperty(value = "nio编号") private String nioNumber; @@ -100,7 +100,7 @@ public class ParamsInfoEO implements Serializable { private String description; /**认证类别*/ - @Excel(name = "*认证类别", width = 15, dicCode = "cert_category") +// @Excel(name = "*认证类别", width = 15, dicCode = "cert_category") @Dict(dicCode = "cert_category") @ApiModelProperty(value = "认证类别") private String certCategory; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java index 84bb61e12..986b78b11 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java @@ -60,7 +60,7 @@ public interface IParamsInfoEOService extends IService { * @param id * @return */ - ParamsInfoEO queryById(String id); + ParamsInfoEO queryById(String id, String cut); /** * 列表查询 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 1ceb2cbf0..56f0677fe 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 @@ -38,6 +38,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.checkerframework.checker.units.qual.C; import org.jeecgframework.poi.excel.ExcelExportUtil; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.enmus.ExcelType; @@ -265,15 +266,19 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl certCategoryParamsInfoEOList = certCategoryParamsInfoEOService.selectListByNioNumber(paramsInfoEO.getNioNumber(), paramsInfoEO.getParamsTemplateId()); // 认证类别 数据字典 map List sysDictItemList = sysDictItemService.selectItemsByDictCode("cert_category"); - Map certCategoryMap = sysDictItemList.stream().collect(Collectors.toMap(c->c.getItemValue(), c->c.getItemText())); - + Map certCategoryMap = new HashMap<>(); + if (CutEnum.CN.getValue().equals(cut)) { + certCategoryMap = sysDictItemList.stream().collect(Collectors.toMap(c -> c.getItemValue(), c -> c.getItemText())); + } else { + certCategoryMap = sysDictItemList.stream().collect(Collectors.toMap(c -> c.getItemValue(), c -> c.getEnName())); + } for (CertCategoryParamsInfoEO certCategoryParamsInfoEO : certCategoryParamsInfoEOList) { certCategoryParamsInfoEO.setCertCategory_dictText(certCategoryMap.get(certCategoryParamsInfoEO.getCertCategory())); } @@ -309,7 +314,11 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl sysDictItemList = sysDictItemService.selectItemsByDictCode("cert_category"); - List certCategoryNameList = sysDictItemList.stream().map(SysDictItem::getItemText).collect(Collectors.toList()); + List certCategoryNameList = new ArrayList<>(); + if (CutEnum.CN.getValue().equals(cut)) { + certCategoryNameList = sysDictItemList.stream().map(SysDictItem::getItemText).collect(Collectors.toList()); + } else { + certCategoryNameList = sysDictItemList.stream().map(SysDictItem::getEnName).collect(Collectors.toList()); + } if (CollectionUtil.isNotEmpty(certCategoryNameList)) { for (String certCategoryName : certCategoryNameList) { ExportParams certExportParams = new ExportParams(); @@ -468,7 +482,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl certCategoryList = certCategoryParamsInfoEOList.stream().map(CertCategoryParamsInfoEO::getCertCategory).distinct().collect(Collectors.toList()); List sysDictItemList = sysDictItemService.selectItemsByDictCode("cert_category"); List finalCertCategoryList = certCategoryList; - certCategoryNameList = sysDictItemList.stream().filter(e-> finalCertCategoryList.contains(e.getItemValue())).map(SysDictItem::getItemText).collect(Collectors.toList()); + certCategoryNameList = sysDictItemList.stream().filter(e -> finalCertCategoryList.contains(e.getItemValue())).map(SysDictItem::getItemText).collect(Collectors.toList()); certCategoryMap = sysDictItemList.stream().filter(e-> finalCertCategoryList.contains(e.getItemValue())).collect(Collectors.toMap(c->c.getItemText(),c->c.getItemValue())); } //导出数据 @@ -555,8 +569,8 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl certCategoryList = certCategoryParamsInfoEOList.stream().map(CertCategoryParamsInfoEO::getCertCategory).distinct().collect(Collectors.toList()); List sysDictItemList = sysDictItemService.selectItemsByDictCode("cert_category"); List finalCertCategoryList = certCategoryList; - certCategoryNameList = sysDictItemList.stream().filter(e-> finalCertCategoryList.contains(e.getItemValue())).map(SysDictItem::getItemText).collect(Collectors.toList()); - certCategoryMap = sysDictItemList.stream().filter(e-> finalCertCategoryList.contains(e.getItemValue())).collect(Collectors.toMap(c->c.getItemText(),c->c.getItemValue())); + certCategoryNameList = sysDictItemList.stream().filter(e-> finalCertCategoryList.contains(e.getItemValue())).map(SysDictItem::getEnName).collect(Collectors.toList()); + certCategoryMap = sysDictItemList.stream().filter(e-> finalCertCategoryList.contains(e.getItemValue())).collect(Collectors.toMap(c->c.getEnName(),c->c.getItemValue())); } //导出数据 List> sheetsList = new ArrayList<>(); @@ -564,7 +578,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl paramsInfoEOList = new ArrayList<>(); Map> certCategoryParamsInfoEOListMap = new HashMap<>(); // 认证类别 数据字典 map List sysDictItemList = sysDictItemService.selectItemsByDictCode("cert_category"); - Map certCategoryMap = sysDictItemList.stream().collect(Collectors.toMap(c->c.getItemText(),c->c.getItemValue())); + Map certCategoryMap = new HashMap<>(); + if (CutEnum.CN.getValue().equals(cut)) { + certCategoryMap = sysDictItemList.stream().collect(Collectors.toMap(c->c.getItemText(),c->c.getItemValue())); + } else { + certCategoryMap = sysDictItemList.stream().collect(Collectors.toMap(c->c.getEnName(),c->c.getItemValue())); + } for (int numSheet = 0; numSheet < workbook.getNumberOfSheets(); numSheet++) { params.setStartSheetIndex(numSheet); @@ -986,6 +1005,8 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl controlVerifyEnumMap = ControlVerifyEnum.toMapForImport(cut); Map paramsIsMustEnumMap = ParamsIsMustEnum.toMapForImport(cut); + // 认证类别map + Map certCategoryMap = new HashMap<>(); //树形数据字典 List treeNameList = new ArrayList<>(); //普通数据字典 @@ -993,11 +1014,17 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl"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()); 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())); } + Map nioCertCategoryMap = getNioCertCategoryMap(certCategoryParamsInfoEOListMap, certCategoryMap); // 认证类别专用 + //存放数据验证结果信息 List stringMessage = new ArrayList<>(); int i = 1; //记录行号 @@ -1090,15 +1117,21 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl getNioCertCategoryMap(Map> certCategoryParamsInfoEOListMap,Map certCategoryMap) { + Map nioCertCategoryMap = new HashMap<>(); + // 获取nio最大级 + List listAll = new ArrayList<>(); + for (Map.Entry> ccDtoMap : certCategoryParamsInfoEOListMap.entrySet()) { + List list = ccDtoMap.getValue(); + if (CollectionUtil.isNotEmpty(list)) { + listAll.addAll(list); + } + } + List listAfterDistinct = listAll.stream() + .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> + new TreeSet<>(Comparator.comparing(o -> o.getNioNumber() + ";" + o.getCertCategory()))), ArrayList::new)); + listAfterDistinct.forEach(item -> { + String certs = listAfterDistinct.stream() + .filter(e->item.getNioNumber().equals(e.getNioNumber())) + .map(CertCategoryParamsInfoCnImport::getCertCategory) + .collect(Collectors.joining(",")); + nioCertCategoryMap.put(item.getNioNumber(), certs); + }); + + return nioCertCategoryMap; + } + private Map validateMustAndLength (String value, String fieldNameCn, String fieldNameEn, String mustInput, String dbLength, Boolean isSingle, String cut) { String errorMsg = ""; int countError= 0; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoCnImport.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoCnImport.java index 077406aad..6e6bb9739 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoCnImport.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoCnImport.java @@ -57,7 +57,7 @@ public class CertCategoryParamsInfoCnImport { private String description; /**nio编号*/ - @Excel(name = "*nio编号", width = 15, orderNum = "1") + @Excel(name = "*NIO编号", width = 15, orderNum = "1") @ApiModelProperty(value = "nio编号") private String nioNumber; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnExport.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnExport.java index f162ca4fc..2aaeeec59 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnExport.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnExport.java @@ -42,22 +42,22 @@ public class CertCategoryParamsInfoEnExport { private String sysOrgCode; /**编号*/ - @Excel(name = "*number", width = 15, orderNum = "2") + @Excel(name = "*Number", width = 15, orderNum = "2") @ApiModelProperty(value = "编号") private String paramsNumber; /**参数名称*/ - @Excel(name = "*params name", width = 15, orderNum = "3") + @Excel(name = "*Params Name", width = 15, orderNum = "3") @ApiModelProperty(value = "参数名称") private String paramsName; /**参数说明*/ - @Excel(name = "description", width = 36, orderNum = "4") + @Excel(name = "Description", width = 36, orderNum = "4") @ApiModelProperty(value = "参数说明") private String description; /**nio编号*/ - @Excel(name = "*nio number", width = 15, orderNum = "1") + @Excel(name = "*NIO Number", width = 15, orderNum = "1") @ApiModelProperty(value = "nio编号") private String nioNumber; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnImport.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnImport.java index 84f584e76..fc5e43960 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnImport.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnImport.java @@ -42,12 +42,12 @@ public class CertCategoryParamsInfoEnImport { private String sysOrgCode; /**编号*/ - @Excel(name = "*number", width = 15, orderNum = "2") + @Excel(name = "*Number", width = 15, orderNum = "2") @ApiModelProperty(value = "编号") private String paramsNumber; /**参数名称*/ - @Excel(name = "*params name", width = 15, orderNum = "3") + @Excel(name = "*Params Name", width = 15, orderNum = "3") @ApiModelProperty(value = "参数名称") private String paramsName; @@ -57,7 +57,7 @@ public class CertCategoryParamsInfoEnImport { private String description; /**nio编号*/ - @Excel(name = "*nio number", width = 15, orderNum = "1") + @Excel(name = "*NIO Number", width = 15, orderNum = "1") @ApiModelProperty(value = "nio编号") private String nioNumber; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoCnImport.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoCnImport.java index 45e99bf28..ffebdcb74 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoCnImport.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoCnImport.java @@ -13,7 +13,7 @@ import lombok.Data; public class ParamsInfoCnImport { /**nio编号*/ - @Excel(name = "*nio编号", width = 15) + @Excel(name = "*NIO编号", width = 15) @ApiModelProperty(value = "nio编号") private String nioNumber; @@ -48,7 +48,7 @@ public class ParamsInfoCnImport { private String description; /**认证类别*/ - @Excel(name = "*认证类别", width = 15) +// @Excel(name = "*认证类别", width = 15) @ApiModelProperty(value = "认证类别") private String certCategory; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java index 385ab0b9a..b5dd68d1d 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java @@ -45,61 +45,61 @@ public class ParamsInfoEnExport { private String sysOrgCode; /**nio编号*/ - @Excel(name = "*nio number", width = 15) + @Excel(name = "*NIO Number", width = 15) @ApiModelProperty(value = "nio编号") private String nioNumber; /**是否必填*/ - @Excel(name = "*is must", width = 15, replace = {"yes_1","no_0"}) + @Excel(name = "*Is Must", width = 15, replace = {"yes_1","no_0"}) @ApiModelProperty(value = "是否必填") private String isMust; /**参数名称*/ - @Excel(name = "*params name", width = 15) + @Excel(name = "*Params Name", width = 15) @ApiModelProperty(value = "参数名称") private String paramsName; /**技术领域*/ - @Excel(name = "*technology territory", width = 15) + @Excel(name = "*Technical Field", width = 15) // @Dict(dicCode = "technology_territory") @ApiModelProperty(value = "技术领域") private String technologyTerritory; /**参数批次*/ - @Excel(name = "*params batch", width = 15, dicCode = "params_batch_en") + @Excel(name = "*Params Batch", width = 15, dicCode = "params_batch_en") @Dict(dicCode = "params_batch") @ApiModelProperty(value = "参数批次") private String paramsBatch; /**责任领域*/ - @Excel(name = "*duty territory", width = 15, dicCode = "duty_territory_en") + @Excel(name = "*Duty Territory", width = 15, dicCode = "duty_territory_en") @Dict(dicCode = "duty_territory") @ApiModelProperty(value = "责任领域") private String dutyTerritory; /**参数说明*/ - @Excel(name = "description", width = 36) + @Excel(name = "Description", width = 36) @ApiModelProperty(value = "参数说明") private String description; /**认证类别*/ - @Excel(name = "*cert category", width = 15, dicCode = "cert_category_en") +// @Excel(name = "*Cert Category", width = 15, dicCode = "cert_category_en") @Dict(dicCode = "cert_category") @ApiModelProperty(value = "认证类别") private String certCategory; /**控件类型*/ - @Excel(name = "*control type", width = 15, replace = {"text_1","pull single_2","pull more_3","file_4","text+pull single_5","text+pull more_6","text+file_7","pull single+file_8","pull more+file_9","text+pull single+file_10"}) + @Excel(name = "*Control Type", width = 15, replace = {"text_1","pull single_2","pull more_3","file_4","text+pull single_5","text+pull more_6","text+file_7","pull single+file_8","pull more+file_9","text+pull single+file_10"}) @ApiModelProperty(value = "控件类型") private String controlType; /**控件校验*/ - @Excel(name = "control verify", width = 15, replace = {"null_1","chinese_2","positive integer_3","positive float_4","integer decimaL_5","decimal one_6","decimal two_7","decimal three_8","decimal four_9"}) + @Excel(name = "Control Verify", width = 15, replace = {"null_1","chinese_2","positive integer_3","positive float_4","integer decimaL_5","decimal one_6","decimal two_7","decimal three_8","decimal four_9"}) @ApiModelProperty(value = "控件校验") private String controlVerify; /**控件备选值*/ - @Excel(name = "control values", width = 15) + @Excel(name = "Control Values", width = 15) @ApiModelProperty(value = "控件备选值") private String controlValues; @@ -107,7 +107,7 @@ public class ParamsInfoEnExport { @ApiModelProperty(value = "附件模板") private String fileTemplateConnectId; - @Excel(name = "file template", width = 15) + @Excel(name = "File Template", width = 15) private String fileTemplateName; //附件模板文件名 /**参数模板id*/ diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnImport.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnImport.java index 53fef38af..f2ae3c61e 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnImport.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnImport.java @@ -13,57 +13,57 @@ import lombok.Data; public class ParamsInfoEnImport { /**nio编号*/ - @Excel(name = "*nio number", width = 15) + @Excel(name = "*NIO Number", width = 15) @ApiModelProperty(value = "nio编号") private String nioNumber; /**是否必填*/ - @Excel(name = "*is must", width = 15) + @Excel(name = "*Is Must", width = 15) @ApiModelProperty(value = "是否必填") private String isMust; /**参数名称*/ - @Excel(name = "*params name", width = 15) + @Excel(name = "*Params Name", width = 15) @ApiModelProperty(value = "参数名称") private String paramsName; /**技术领域*/ - @Excel(name = "*technology territory", width = 15) + @Excel(name = "*Technical Field", width = 15) @ApiModelProperty(value = "技术领域") private String technologyTerritory; /**参数批次*/ - @Excel(name = "*params batch", width = 15) + @Excel(name = "*Params Batch", width = 15) @ApiModelProperty(value = "参数批次") private String paramsBatch; /**责任领域*/ - @Excel(name = "*duty territory", width = 15) + @Excel(name = "*Duty Territory", width = 15) @ApiModelProperty(value = "责任领域") private String dutyTerritory; /**参数说明*/ - @Excel(name = "description", width = 36) + @Excel(name = "Description", width = 36) @ApiModelProperty(value = "参数说明") private String description; /**认证类别*/ - @Excel(name = "*cert category", width = 15) +// @Excel(name = "*Cert Category", width = 15) @ApiModelProperty(value = "认证类别") private String certCategory; /**控件类型*/ - @Excel(name = "*control type", width = 15) + @Excel(name = "*Control Type", width = 15) @ApiModelProperty(value = "控件类型") private String controlType; /**控件校验*/ - @Excel(name = "control verify", width = 15) + @Excel(name = "Control Verify", width = 15) @ApiModelProperty(value = "控件校验") private String controlVerify; /**控件备选值*/ - @Excel(name = "control values", width = 15) + @Excel(name = "Control Values", width = 15) @ApiModelProperty(value = "控件备选值") private String controlValues; @@ -71,7 +71,7 @@ public class ParamsInfoEnImport { @ApiModelProperty(value = "附件模板") private String fileTemplateConnectId; - @Excel(name = "file template", width = 15) + @Excel(name = "File Template", width = 15) private String fileTemplateName; //附件模板文件名 /**参数模板id*/