市场法规清单导出重复数据合并

laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java

@@ -71,6 +71,14 @@ public interface IDocumentSplitService {
      */
     List<Map<String, Object>> queryDocumentSplitDetailByHomeList(Map<String, Object> parameter);
 
+
+    /**
+     * 文档拆分详情-高级检索导出
+     * @param parameter
+     * @return
+     */
+    List<Map<String, Object>> queryDocumentSplitDetailByHomeListExport(Map<String, Object> parameter);
+
     /**
      * 文档拆分-拆分
      * @param sarFileSplitInfoEO

laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java

@@ -428,6 +428,30 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
 
     @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.getIsShowList()))).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;
+    }
+
+    @Override
+    public List<Map<String, Object>> queryDocumentSplitDetailByHomeListExport(Map<String, Object> parameter) {
         // 查询全部字段列表
         List<LawsTag> fieldList = lawsCommonMapper.getFieldList(TableNameEnum.DOCUMENT_SPLIT.getTableName());
         // 列表展示字段