From 539b0f43967d67bd2979d57837f0b0c2e93b519a Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Thu, 18 Jul 2024 19:08:06 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=A0=87=E5=87=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/laws/documenttool/entity/SplitFileInfo.java | 4 ++++ .../documenttool/service/impl/DocumentSplitServiceImpl.java | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/SplitFileInfo.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/SplitFileInfo.java index 5dd0b91f..65b539ac 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/SplitFileInfo.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/SplitFileInfo.java @@ -82,4 +82,8 @@ public class SplitFileInfo { @TableField(exist = false) @ApiModelProperty(value = "标准结构树 查询用") private String standardSystem; + + @TableField(exist = false) + @ApiModelProperty(value = "文件后缀 查询用") + private String fileSuffix; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index c0c3112a..901754c8 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -1307,7 +1307,11 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { queryWrapper.like(StringUtils.isNotBlank(splitFileInfo.getStandardNumber()), "standard_number", splitFileInfo.getStandardNumber()); queryWrapper.like(StringUtils.isNotBlank(splitFileInfo.getStandardName()), "standard_name", splitFileInfo.getStandardName()); queryWrapper.eq(StringUtils.isNotBlank(splitFileInfo.getStandardFileType()), "standard_file_type", splitFileInfo.getStandardFileType()); - queryWrapper.likeLeft("file_name", ".docx"); + if (StringUtils.isNotBlank(splitFileInfo.getFileSuffix())){ + queryWrapper.likeLeft("file_name", splitFileInfo.getFileSuffix()); + }else { + queryWrapper.likeLeft("file_name", ".docx"); + } queryWrapper.isNotNull("o.standard_id"); if (StringUtils.isNotBlank(splitFileInfo.getStandardSystem())){ List list = Arrays.asList(splitFileInfo.getStandardSystem().split(","));