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(","));