feat: 拆分已入库文本支持企标支持主起草部门筛选

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,
+    public Result<IPage<SplitFileInfo>> querySplitFileInfoByPage(@RequestBody SplitFileInfo request) {
-                                                    @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+        return Result.OK(documentSplitService.querySplitFileInfoByPage(request, request.getPageNo(), request.getPageSize()));
-                                                    @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
-        return Result.OK(documentSplitService.querySplitFileInfoByPage(splitFileInfo, pageNo, pageSize));
     }
 
     /**

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;
+
 }

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}

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