From 8f42155a4fe9949b59dc9cfb5d0da4196a5592ec Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 24 Jul 2024 17:56:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8B=86=E5=88=86=E5=B7=B2=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=96=87=E6=9C=AC=E6=94=AF=E6=8C=81=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=8B=86=E5=88=86=E7=8A=B6=E6=80=81=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/laws/documenttool/entity/SplitFileInfo.java | 1 + .../laws/documenttool/service/impl/DocumentSplitServiceImpl.java | 1 + 2 files changed, 2 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 b6740317..68980da0 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,6 +86,7 @@ public class SplitFileInfo { private Integer pageSize; @TableField(exist = false) + @ApiModelProperty(value = "标准拆分状态") @Dict(dicCode = "standard_split_status") private String standardSplitStatus; 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 4017795b..516f2eb6 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 @@ -1299,6 +1299,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { queryWrapper.likeLeft("file_name", ".docx"); queryWrapper.isNotNull("o.standard_id"); queryWrapper.orderByDesc(CREATE_TIME); + queryWrapper.eq(StringUtils.isNotBlank(splitFileInfo.getStandardSplitStatus()), "standard.standard_split_status", splitFileInfo.getStandardSplitStatus()); if (StringUtils.isNotBlank(splitFileInfo.getEsMainDraftUnit())){ queryWrapper.in("esMainDraftUnit", Arrays.asList(splitFileInfo.getEsMainDraftUnit().split(","))); }