From 3cdd0dd684052517ee0e90daf4b03ad41b8f2771 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 03 四月 2023 15:04:47 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/show/DataLibService.java | 29 +----------------------------
1 files changed, 1 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/lf/server/service/show/DataLibService.java b/src/main/java/com/lf/server/service/show/DataLibService.java
index f6f1fe3..c029ddf 100644
--- a/src/main/java/com/lf/server/service/show/DataLibService.java
+++ b/src/main/java/com/lf/server/service/show/DataLibService.java
@@ -184,34 +184,7 @@
}
QueryWrapper wrapper = createQueryWrapper(baseMapper, dr);
- List list = baseMapper.selectList(wrapper);
- if (null == list || list.size() == 0) {
- continue;
- }
-
- if (!dataMap.containsKey(entity)) {
- dataMap.put(entity, list);
- } else {
- dataMap.get(entity).addAll(list);
- }
- if (wrapper.isEmptyOfWhere()) {
- wrapper.apply("1 = 1");
- }
- if ("bborehole".equals(entity)) {
- wrapper.last("limit 100");
- }
-
- String tab = BaseQueryService.getTabName(baseMapper);
- List<AttachEntity> annex = baseMapper.selectAnnex(tab, wrapper);
- if (null == annex || annex.isEmpty()) {
- continue;
- }
-
- if (!annexMap.containsKey(entity)) {
- annexMap.put(tab.replace(".", "_"), annex);
- } else {
- annexMap.get(tab.replace(".", "_")).addAll(annex);
- }
+ downloadService.addData(entity, baseMapper, wrapper, dataMap, annexMap);
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
}
--
Gitblit v1.9.3