From d3d32bede6f5dfe8fa1939c7fb85f0af57ea3358 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 28 三月 2023 13:12:01 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/show/DataLibService.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 9a3c8b7..f1630bd 100644
--- a/src/main/java/com/lf/server/service/show/DataLibService.java
+++ b/src/main/java/com/lf/server/service/show/DataLibService.java
@@ -156,16 +156,13 @@
return null;
}
- //
-
-
return null;
}
/**
* 鏌ヨ鏁版嵁
*/
- private void queryData(DownloadReqEntity dr, Map<String, List<?>> dataMap , Map<String, String> annexMap) {
+ private void queryData(DownloadReqEntity dr, Map<String, List<?>> dataMap, Map<String, String> annexMap) {
for (String enity : dr.getEntities()) {
try {
BasicMapper baseMapper = ClassHelper.getBasicMapper(enity);
@@ -174,17 +171,19 @@
}
QueryWrapper wrapper = createQueryWrapper(baseMapper, dr);
- List<?> list = baseMapper.selectList(wrapper);
+ List list = baseMapper.selectList(wrapper);
if (null == list || list.size() == 0) {
continue;
}
- // SQL鐗囨
- String sqlSegment = wrapper.getSqlSegment();
-
if (!dataMap.containsKey(enity)) {
dataMap.put(enity, list);
+ } else {
+ dataMap.get(enity).addAll(list);
}
+
+ // SQL鐗囨
+ String sqlSegment = wrapper.getSqlSegment();
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
}
@@ -202,7 +201,8 @@
wrapper.apply(dirs);
}
if (!StringHelper.isEmpty(dr.getDepcode())) {
- wrapper.likeRight("depid", dr.getDepcode());
+ //wrapper.likeRight("depid", dr.getDepcode());
+ wrapper.apply(String.format("depid like '%s'", StringHelper.getRightLike(dr.getDepcode())));
}
if (baseMapper instanceof GeomBaseMapper && !StringHelper.isEmpty(dr.getWkt())) {
wrapper.select("ST_AsText(geom) as geom, *");
@@ -421,7 +421,7 @@
removeDuplicate(list);
setRightLike(list, field);
- return StringHelper.join(list, " or ");
+ return "(" + StringHelper.join(list, " or ") + ")";
}
/**
--
Gitblit v1.9.3