From 1b3b8ab9cad85acaacef980036a2d982adc5e506 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Wed, 18 Oct 2023 18:47:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86):=20?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B,=E6=B7=BB=E5=8A=A0=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/LawsDocumentSplitView.java | 34 +++++++++++++++++++ .../impl/DocumentSplitServiceImpl.java | 9 +++++ 2 files changed, 43 insertions(+) create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsDocumentSplitView.java diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsDocumentSplitView.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsDocumentSplitView.java new file mode 100644 index 00000000..a2839e1b --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsDocumentSplitView.java @@ -0,0 +1,34 @@ +package com.jero.modules.laws.documenttool.entity; + +import com.jero.modules.split.entity.SarFileSplitMenuEO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Author: 31318 + * @Date: 2023/10/18/18:01 + * @Description: + */ +@Data +public class LawsDocumentSplitView { + /** + * 文档拆分信息 + */ + @ApiModelProperty(value = "文档拆分信息") + private DocumentSplitInfo documentSplitInfo; + + /** + * 目录 + */ + @ApiModelProperty(value = "目录") + private List sarFileSplitMenuEO; + + /** + * 文档拆分详情信息 + */ + @ApiModelProperty(value = "文档拆分详情信息") + private List> documentSplitDetail; +} 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 aa13dbc3..5ea61c00 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 @@ -29,6 +29,7 @@ import com.jero.modules.split.entity.SarFileSplitMenuEO; import com.jero.modules.split.enums.SplitEnum; import com.jero.modules.split.enums.SplitFileTypeTypeEnum; import com.jero.modules.split.mapper.SarFileSplitItemsValEOMapper; +import com.jero.modules.split.page.SarFileSplitMenuEOPage; import com.jero.modules.split.service.ISarFileSplitInfoService; import com.jero.modules.split.service.ISarFileSplitMenuEOService; import com.jero.modules.split.service.impl.FileSpiltService; @@ -626,6 +627,14 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { List documentSplitInfos = queryByList(documentSplitInfo); lawsDocumentSplitView.setDocumentSplitInfo(documentSplitInfos.get(0)); + // 目录 + SarFileSplitMenuEOPage splitMenuEOPage = new SarFileSplitMenuEOPage(); + splitMenuEOPage.setValidFlag("0"); + splitMenuEOPage.setOrderBy("display_seq"); + splitMenuEOPage.setInfoId(id); + List sarFileSplitMenuEOS = sarFileSplitMenuEOService.queryByList(splitMenuEOPage); + lawsDocumentSplitView.setSarFileSplitMenuEO(sarFileSplitMenuEOS); + // 文档拆分详情 parameter.remove(ID); parameter.put(INFO_ID, id);