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 9a4370e8..9b4940a2 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 @@ -71,6 +71,14 @@ public interface IDocumentSplitService { */ List> queryDocumentSplitDetailByHomeList(Map parameter); + + /** + * 文档拆分详情-高级检索导出 + * @param parameter + * @return + */ + List> queryDocumentSplitDetailByHomeListExport(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 0f57d0c4..3d8b4a4d 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 @@ -428,6 +428,30 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { @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.getIsShowList()))).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; + } + + @Override + public List> queryDocumentSplitDetailByHomeListExport(Map parameter) { // 查询全部字段列表 List fieldList = lawsCommonMapper.getFieldList(TableNameEnum.DOCUMENT_SPLIT.getTableName()); // 列表展示字段