From 69ae50583e01217268fee8ba0a8e0f11847694f2 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 6 Nov 2023 22:44:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A8=A1=E6=9D=BF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsCommonServiceImpl.java | 3 +- .../modules/tag/enums/FieldShowTypeEnum.java | 35 ++++++++++++++----- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 91f956e7..02e88d16 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -1526,10 +1526,11 @@ public class LawsCommonServiceImpl implements ILawsCommonService { */ private void setRow3CellValue(Row row3, List fieldList, CellStyle style) { for (int i = 0; i < fieldList.size(); i++) { + LawsTag tag = fieldList.get(i); // 创建单元格 Cell cell = row3.createCell(i); cell.setCellStyle(style); - cell.setCellValue(FieldShowTypeEnum.getDescription(fieldList.get(i).getFieldShowType())); + cell.setCellValue(FieldShowTypeEnum.getDescription(tag)); } } diff --git a/laws-modules/src/main/java/com/jero/modules/tag/enums/FieldShowTypeEnum.java b/laws-modules/src/main/java/com/jero/modules/tag/enums/FieldShowTypeEnum.java index 54dbb74d..5d690c20 100644 --- a/laws-modules/src/main/java/com/jero/modules/tag/enums/FieldShowTypeEnum.java +++ b/laws-modules/src/main/java/com/jero/modules/tag/enums/FieldShowTypeEnum.java @@ -1,6 +1,7 @@ package com.jero.modules.tag.enums; import com.jero.common.exception.JeroBootException; +import com.jero.modules.tag.entity.LawsTag; /** * @author: Mzaxd @@ -8,13 +9,13 @@ import com.jero.common.exception.JeroBootException; */ public enum FieldShowTypeEnum { - SINGLE_DATE_PICKER("单日期选择","1","请填写选项中包含的文本"), + SINGLE_DATE_PICKER("单日期选择","1","日期输入"), SINGLE_USER_DIALOG("单选用户弹框","2","请填写选项中包含的文本"), SINGLE_ORGANIZATION_DIALOG("单选组织机构弹框","3","请填写选项中包含的文本"), - MULTI_DATE_PICKER("多日期选择","4","请填写一个至多个日期，多填以中文逗号隔开"), + MULTI_DATE_PICKER("多日期选择","4","请填写一个至多个日期，多填以英文逗号隔开"), MULTI_TEXT("多行文本","5","文本输入"), - MULTI_STANDARD_DIALOG("多选标准弹框","6","请填写选项中包含的文本，多填以中文逗号隔开"), - MULTI_ORGANIZATION_DIALOG("多选组织机构弹框","7","请填写选项中包含的文本，多填以中文逗号隔开"), + MULTI_STANDARD_DIALOG("多选标准弹框","6","请填写选项中包含的文本，多填以英文逗号隔开"), + MULTI_ORGANIZATION_DIALOG("多选组织机构弹框","7","请填写选项中包含的文本，多填以英文逗号隔开"), FILE_UPLOAD("上传文件","8","文件属性，请输入：标准号/文件名称.文件格式"), // 企标稽查内容导入 @@ -23,11 +24,11 @@ public enum FieldShowTypeEnum { DROPDOWN_SINGLE_SELECT("下拉单选","10","请填写选项中包含的文本"), DROPDOWN_MULTI_SELECT("下拉多选","11","请填写选项中包含的文本，多填以中文逗号隔开"), // 体系 - TREE_STRUCTURE_MULTI_SELECT("树形结构（多选）","12","请填写选项中包含的文本，多填以中文逗号隔开"), + TREE_STRUCTURE_MULTI_SELECT("树形结构（多选）","12","请填写选项中包含的文本，多填以英文逗号隔开"), YEAR_SELECT("年份选择","14","请填写选项中包含的文本"), // 零部件 - TREE_STRUCTURE_SINGLE_SELECT("树形结构（单选）","15","请填写选项中包含的文本"), - TREE_POP_UP("树形弹框","16","请填写选项中包含的文本"), + TREE_STRUCTURE_SINGLE_SELECT("树形结构（单选）","15","请填写选项中包含的文本，多填以逗号隔开"), + TREE_POP_UP("树形弹框","16","请填写选项中包含的文本，多填以逗号隔开"), ; @@ -41,7 +42,25 @@ public enum FieldShowTypeEnum { this.description = description; } - public static String getDescription(String value){ + public static String getDescription(LawsTag tag){ + String text = tag.getDbFieldTxt(); + switch (text) { + case "企标编号": + return "唯一标识，不可重复"; + case "企业标准代号": + return "请填写选项中包含的文本"; + case "实施日期": + return "日期输入，最少大于发布日期15天"; + case "是否试行": + return "请填写是/否"; + case "试行周期": + return "请填写1-24"; + case "*零部件名称": + return "填写的数据直接填写需要选中的数据文字，如需要选中车身，则直接填写车身，多填以逗号隔开"; + case "动力类型": + return "请填写选项中包含的文本，多填以逗号隔开"; + } + String value = tag.getFieldShowType(); for (FieldShowTypeEnum fieldShowTypeEnum : values()) { if (fieldShowTypeEnum.getValue().equals(value)) { return fieldShowTypeEnum.getDescription();