From c96cce403d853b94a041ba9c9f5244010f608b98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Fri, 30 Aug 2024 15:26:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2=E4=B8=AD?=
 =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E6=94=B9=E6=88=90=E6=9F=A5=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/IDocumentSplitService.java        |  8 ++++++
 .../impl/DocumentSplitServiceImpl.java        | 25 +++++++++++++++++++
 .../impl/LawsHomeSearchServiceImpl.java       |  2 +-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java
index 674339c5..9a4370e8 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java
@@ -63,6 +63,14 @@ public interface IDocumentSplitService {
      */
     List<Map<String, Object>> queryDocumentSplitDetailByList(Map<String, Object> parameter);
 
+
+    /**
+     * 文档拆分详情-高级检索查询
+     * @param parameter
+     * @return
+     */
+    List<Map<String, Object>> queryDocumentSplitDetailByHomeList(Map<String, Object> parameter);
+
     /**
      * 文档拆分-拆分
      * @param sarFileSplitInfoEO
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 1207a216..0f57d0c4 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
@@ -425,6 +425,31 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
         return list;
     }
 
+
+    @Override
+    public List<Map<String, Object>> queryDocumentSplitDetailByHomeList(Map<String, Object> parameter) {
+        // 查询全部字段列表
+        List<LawsTag> fieldList = lawsCommonMapper.getFieldList(TableNameEnum.DOCUMENT_SPLIT.getTableName());
+        // 列表展示字段
+        List<LawsTag> fieldListSelect = fieldList.stream().filter(v -> YesOrNoEnum.YES.getValue()
+                .equals(String.valueOf(v.getIsShowSearch()))).collect(Collectors.toList());
+        // 搜索条件展示字段
+        List<LawsTag> fieldListCondition = fieldList.stream().filter(v -> YesOrNoEnum.YES.getValue()
+                .equals(String.valueOf(v.getIsShowSearch()))).collect(Collectors.toList());
+
+        // sql查询列字段拼接
+        String selectColumn = getSelectColumn(fieldListSelect);
+        // sql where条件拼接
+        String selectCondition = getSelectCondition(parameter, fieldListCondition);
+        // 排序
+        selectCondition = orderBy(parameter, selectCondition, fieldListSelect);
+        // 查询数据
+        List<Map<String, Object>> list = documentSplitMapper.queryDocumentSplitDetail(selectColumn, selectCondition);
+        // 翻译
+        dicTranslate(list, fieldListSelect);
+        return list;
+    }
+
     private void dicTranslate(List<Map<String, Object>> records, List<LawsTag> fieldListSelect) {
         List<LawsTag> lawsTags = fieldListSelect.stream()
                 .filter(j -> FieldCommon.TYPE_DICT.contains(j.getFieldShowType())).collect(Collectors.toList());
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
index 42b61b72..fae133b2 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
@@ -1543,7 +1543,7 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
     @Override
     public List<LawsHomeAdvancedSearchClauseVO> getAdvancedSearchClause(Map<String, Object> parameterMap) {
         List<LawsHomeAdvancedSearchClauseVO> lawsHomeAdvancedSearchClauseVOList = new ArrayList<>();
-        List<Map<String, Object>> data = documentSplitService.queryDocumentSplitDetailByList(parameterMap);
+        List<Map<String, Object>> data = documentSplitService.queryDocumentSplitDetailByHomeList(parameterMap);
         // 过滤已发布数据
         List<String> infoIdList = data.stream().map(v -> String.valueOf(v.get("info_id")))
                 .distinct().collect(Collectors.toList());