From c21701ab42831843c6053316be08af8ed344b8b7 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 1 Aug 2024 16:26:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2087986=20=E3=80=90=E9=98=BB=E5=A1=9E?= =?UTF-8?q?=E3=80=91=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86-=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E4=B8=8B=E8=BD=BD=EF=BC=8C=E4=B8=8B=E8=BD=BD=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=8D=9F=E5=9D=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/impl/LawsCommonServiceImpl.java | 4 ++-- .../com/jero/modules/tag/enums/FieldShowTypeEnum.java | 10 +++++++--- 2 files changed, 9 insertions(+), 5 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 fef95034..4080c60d 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 @@ -2463,7 +2463,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { zos.closeEntry(); // 添加第二个文件到ZIP中 - ZipEntry entry2 = new ZipEntry("稽查内容.xls"); + ZipEntry entry2 = new ZipEntry("监察内容.xls"); zos.putNextEntry(entry2); zos.write(inspectContentBytes); zos.closeEntry(); @@ -2605,7 +2605,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { .filter(lawsTag -> !lawsTag.getDbFieldName().equals(FieldCommon.REFERENCED_STANDARD)) .collect(Collectors.toList()); - // 添加稽查内容字段 + // 添加监察内容字段 LawsTag inspectContentTag = new LawsTag(); inspectContentTag.setDbFieldTxt("监察内容"); inspectContentTag.setFieldShowType(FieldShowTypeEnum.INSPECT_CONTENT_FILE_UPLOAD.getValue()); 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 0eab672e..49272aa6 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 @@ -19,7 +19,7 @@ public enum FieldShowTypeEnum { FILE_UPLOAD("上传文件","8","文件属性，请输入：标准号/文件名称.文件格式"), // 企标稽查内容导入 - INSPECT_CONTENT_FILE_UPLOAD("上传稽查内容导入模板","ZZ","文件属性，请输入：标准号/稽查内容.xls"), + INSPECT_CONTENT_FILE_UPLOAD("上传监察内容导入模板","ZZ","文件属性，请输入：标准号/监察内容.xls"), TEXT_BOX("文本框","9","文本输入"), DROPDOWN_SINGLE_SELECT("下拉单选","10","请填写选项中包含的文本"), DROPDOWN_MULTI_SELECT("下拉多选","11","请填写选项中包含的文本，多填以英文逗号隔开"), @@ -27,8 +27,12 @@ public enum FieldShowTypeEnum { TREE_STRUCTURE_MULTI_SELECT("树形结构（多选）","12","请填写选项中包含的文本，多填以英文逗号隔开"), YEAR_SELECT("年份选择","14","请填写选项中包含的文本"), TREE_STRUCTURE_SINGLE_SELECT("树形结构（单选）","15","请填写选项中包含的文本"), - // 零部件 - TREE_POP_UP("树形弹框","16","请填写选项中包含的文本"), + // 树形弹框 + TREE_UP("树形弹框","16","请填写选项中包含的文本"), + // 树形-单线父级子级 + TREE_FATHER_CHILD("树形-单线父级子级","17","请填写选项中包含的文本"), + // 树形-子级 + TREE_CHILD("树形-子级","18","请填写选项中包含的文本"), ;