From 3692c941f20d9d4e7d799f87a51cf2611da4f895 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Fri, 19 Jul 2024 11:27:09 +0800 Subject: [PATCH] =?UTF-8?q?fix(querySplitFileInfoByPage):=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=8E=92=E9=99=A4=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/laws/documenttool/entity/SplitFileInfo.java | 4 ++++ .../documenttool/service/impl/DocumentSplitServiceImpl.java | 4 ++++ 2 files changed, 8 insertions(+) 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 65b539ac..62a70f57 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 @@ -86,4 +86,8 @@ public class SplitFileInfo { @TableField(exist = false) @ApiModelProperty(value = "文件后缀 查询用") private String fileSuffix; + + @TableField(exist = false) + @ApiModelProperty(value = "排除文本状态 查询用") + private String excludeFileTypes; } 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 901754c8..7ae35c33 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 @@ -1312,6 +1312,10 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { }else { queryWrapper.likeLeft("file_name", ".docx"); } + if (StringUtils.isNotBlank(splitFileInfo.getExcludeFileTypes())){ + queryWrapper.notIn("standard_file_type", + Arrays.asList(splitFileInfo.getExcludeFileTypes().split(","))); + } queryWrapper.isNotNull("o.standard_id"); if (StringUtils.isNotBlank(splitFileInfo.getStandardSystem())){ List list = Arrays.asList(splitFileInfo.getStandardSystem().split(","));