From 9da0f7316774a64f82c2a3fcdf00ec43a0e93c6c Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 21 Jun 2024 11:22:19 +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=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=B8=BB=E8=B5=B7=E8=8D=89=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DocumentSplitController.java           |  8 +++-----
 .../laws/documenttool/entity/SplitFileInfo.java       | 11 +++++++++++
 .../documenttool/mapper/xml/DocumentSplitMapper.xml   |  4 ++--
 .../service/impl/DocumentSplitServiceImpl.java        |  3 +++
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java
index c41d1bbc..56f6b6f4 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java
@@ -82,13 +82,11 @@ public class DocumentSplitController {
      */
     @AutoLog(value = "标准拆分-拆分已入库文本分页列表查询")
     @ApiOperation(value="标准拆分-拆分已入库文本分页列表查询", notes="标准拆分-拆分已入库文本分页列表查询")
-    @GetMapping(value = "/querySplitFileInfoByPage")
+    @PostMapping(value = "/querySplitFileInfoByPage")
     @RequiresPermissions("split:sarFileSplitInfo:splitFile")
     @ApiOperationSupport(order = 2)
-    public Result<IPage<SplitFileInfo>> querySplitFileInfoByPage(SplitFileInfo splitFileInfo,
-                                                    @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                                    @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
-        return Result.OK(documentSplitService.querySplitFileInfoByPage(splitFileInfo, pageNo, pageSize));
+    public Result<IPage<SplitFileInfo>> querySplitFileInfoByPage(@RequestBody SplitFileInfo request) {
+        return Result.OK(documentSplitService.querySplitFileInfoByPage(request, request.getPageNo(), request.getPageSize()));
     }
 
     /**
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 4c2cc73d..56d0b6d5 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
@@ -71,7 +71,18 @@ public class SplitFileInfo {
     @ApiModelProperty(value = "标准名称")
     private String standardName;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "企标-主起草部门")
+    private String esMainDraftUnit;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "ids 查询用")
     private String ids;
+
+    @TableField(exist = false)
+    private Integer pageNo;
+
+    @TableField(exist = false)
+    private Integer pageSize;
+
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
index 9d862a91..ef21d3fd 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
@@ -217,11 +217,11 @@
 
     <select id="querySplitFileInfoByPage" resultType="com.jero.modules.laws.documenttool.entity.SplitFileInfo">
         select standard.*, o.id id, o.file_name, o.standard_file_type, o.url
-        from (select id standardId, standard_number, standard_number standardNo, standard_name, standard_state, release_date, 1 origin, create_time, create_by, update_by, update_time
+        from (select id standardId, standard_number, standard_number standardNo, standard_name, standard_state, release_date, 1 origin, create_time, create_by, update_by, update_time, null as esMainDraftUnit
               from laws_domestic_standard
               where del_flag = 0
               union all
-              select id standardId, standard_number, standard_number standardNo, standard_name, standard_state, release_date, 3 origin, create_time, create_by, update_by, update_time
+              select id standardId, standard_number, standard_number standardNo, standard_name, standard_state, release_date, 3 origin, create_time, create_by, update_by, update_time, main_drafting_unit as esMainDraftUnit
               from laws_enterprise_standard
               where del_flag = 0) standard left join oss_file o on standardId = o.standard_id
         ${ew.customSqlSegment}
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 ed4e2b4d..0bcf552d 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,9 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
         queryWrapper.likeLeft("file_name", ".docx");
         queryWrapper.isNotNull("o.standard_id");
         queryWrapper.orderByDesc(CREATE_TIME);
+        if (StringUtils.isNotBlank(splitFileInfo.getEsMainDraftUnit())){
+            queryWrapper.in("esMainDraftUnit", Arrays.asList(splitFileInfo.getEsMainDraftUnit().split(",")));
+        }
         if (StringUtils.isNotBlank(splitFileInfo.getIds())){
             queryWrapper.in("o.id", Arrays.asList(splitFileInfo.getIds().split(",")));
         }