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> queryDocumentSplitDetailByList(Map parameter); + + /** + * 文档拆分详情-高级检索查询 + * @param parameter + * @return + */ + List> queryDocumentSplitDetailByHomeList(Map 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> queryDocumentSplitDetailByHomeList(Map parameter) { + // 查询全部字段列表 + List fieldList = lawsCommonMapper.getFieldList(TableNameEnum.DOCUMENT_SPLIT.getTableName()); + // 列表展示字段 + List fieldListSelect = fieldList.stream().filter(v -> YesOrNoEnum.YES.getValue() + .equals(String.valueOf(v.getIsShowSearch()))).collect(Collectors.toList()); + // 搜索条件展示字段 + List 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> list = documentSplitMapper.queryDocumentSplitDetail(selectColumn, selectCondition); + // 翻译 + dicTranslate(list, fieldListSelect); + return list; + } + private void dicTranslate(List> records, List fieldListSelect) { List 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 getAdvancedSearchClause(Map parameterMap) { List lawsHomeAdvancedSearchClauseVOList = new ArrayList<>(); - List> data = documentSplitService.queryDocumentSplitDetailByList(parameterMap); + List> data = documentSplitService.queryDocumentSplitDetailByHomeList(parameterMap); // 过滤已发布数据 List infoIdList = data.stream().map(v -> String.valueOf(v.get("info_id"))) .distinct().collect(Collectors.toList());