diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java index 4f4b9b081..3bc88251f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java +++ b/jero-boot/jero-boot-modules/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 = "*参数编号", width = 15, orderNum = "1") @ApiModelProperty(value = "nio编号") private String nioNumber; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java index 1df1f9a2e..d28b0bc1b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java +++ b/jero-boot/jero-boot-modules/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 = "*参数编号", width = 15) @ApiModelProperty(value = "nio编号") private String nioNumber; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index 90c23b1e2..40ff65cb0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -102,9 +102,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl paramsInfoEOList = list(queryWrapper); if (CollectionUtil.isNotEmpty(paramsInfoEOList)) { if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) { - throw new JeroBootException("NIO编号已存在!"); + throw new JeroBootException("参数编号已存在!"); } else { - throw new JeroBootException("NIO number already exists!"); + throw new JeroBootException("Parameter number already exists!"); } } @@ -180,9 +180,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl paramsInfoEOList = list(queryWrapper); if (CollectionUtil.isNotEmpty(paramsInfoEOList)) { if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) { - throw new JeroBootException("NIO编号已存在!"); + throw new JeroBootException("参数编号已存在!"); } else { - throw new JeroBootException("NIO number already exists!"); + throw new JeroBootException("Parameter number already exists!"); } } } @@ -449,16 +449,16 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl paramsInfoEOListEn = resultEn.getList(); copyParamsInfoList(paramsInfoEOListEn, paramsInfoEOList); } else { - String fields[] ={ "*NIO编号", "*是否必填", "*参数名称","*参数批次","*责任领域", + String fields[] ={ "*参数编号", "*是否必填", "*参数名称","*参数批次","*责任领域", "参数说明", "*控件类型", "控件校验", "控件备选值", "默认值", "附件模板"}; params.setImportFields(fields); @@ -950,14 +950,14 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl list = new ArrayList<>(); if (CutEnum.EN.getValue().equals(cut)) { - String fields[] ={ "*NIO Number", "*Number", "*Para Name","Description"}; + String fields[] ={ "*Parameter Number", "*Number", "*Para Name","Description"}; params.setImportFields(fields); ExcelImportResult resultEn = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoEnImport.class, params); List listEn = resultEn.getList(); copycertCategoryParamsInfoList(listEn, list); } else { - String fields[] ={ "*NIO编号", "*编号", "*参数名称","参数说明"}; + String fields[] ={ "*参数编号", "*编号", "*参数名称","参数说明"}; params.setImportFields(fields); ExcelImportResult result = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoCnImport.class, params); @@ -1225,7 +1225,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl resultMap = new HashMap<>(); // nio编号 String nioNumber = dto.getNioNumber(); - resultMap = validateMustAndLength(nioNumber, "NIO编号", "NIO Number", IsMustEnum.YES.getValue(),"20", false, cut); + resultMap = validateMustAndLength(nioNumber, "参数编号", "Parameter Number", IsMustEnum.YES.getValue(),"20", false, cut); errorMsg += (String)resultMap.get("errorMsg"); countError += (int)resultMap.get("countError"); if (StringUtils.isNotEmpty(dto.getNioNumber())) { @@ -1233,18 +1233,18 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl