center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: ck 时间过滤错误

Browse Source
This commit is contained in:
taojinlong 2023-05-22 17:07:31 +08:00
parent 85b66a1f13
commit 71bd530c4f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
View File

@ -1091,7 +1091,7 @@ public class CKQueryProvider extends QueryProvider {
return null;
}
AtomicReference<ChartExtFilterRequest> atomicReference = new AtomicReference<>();
List<ChartExtFilterRequest> chartExtFilterRequests = new ArrayList<>();
requestList.forEach(request -> {
DatasetTableField datasetTableField = request.getDatasetTableField();
List<String> requestValue = request.getValue();
@ -1106,12 +1106,12 @@ public class CKQueryProvider extends QueryProvider {
requestCopy.setValue(new ArrayList<String>() {{
add(String.format(toDateTime64, "'" + simpleDateFormat.format(new Date(Long.parseLong(requestValue.get(1)))) + "'"));
}});
atomicReference.set(requestCopy);
chartExtFilterRequests.add(requestCopy);
}
});
if (ObjectUtils.isNotEmpty(atomicReference.get())) {
requestList.add(atomicReference.get());
if (CollectionUtils.isNotEmpty(chartExtFilterRequests)) {
requestList.addAll(chartExtFilterRequests);
}
List<SQLObj> list = new ArrayList<>();
for (ChartExtFilterRequest request : requestList) {