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

Merge pull request #3900 from dataease/pr@dev@fix_filter_date_range_param

Browse Source 
fix(过滤器): 日期范围过滤器参数设置单个结束时间有效
This commit is contained in:
wisonic-s 2022-11-28 14:23:27 +08:00 committed by GitHub
commit 61789f04d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -121,6 +121,8 @@ public class ChartViewService {
private static final Logger logger = LoggerFactory.getLogger(ChartViewService.class);
private static final String START_END_SEPARATOR = "_START_END_SPLIT";
//默认使用非公平
private ReentrantLock lock = new ReentrantLock();
@ -705,6 +707,9 @@ public class ChartViewService {
List<SqlVariableDetails> sqlVariables = new Gson().fromJson(table.getSqlVariableDetails(), new TypeToken<List<SqlVariableDetails>>() {
}.getType());
for (String parameter : Optional.ofNullable(request.getParameters()).orElse(new ArrayList<>())) {
if (StringUtils.endsWith(parameter, START_END_SEPARATOR)) {
parameter = parameter.split(START_END_SEPARATOR)[0];
}
if (sqlVariables.stream().map(SqlVariableDetails::getVariableName).collect(Collectors.toList()).contains(parameter)) {
hasParameters = true;
}
@ -1707,8 +1712,8 @@ public class ChartViewService {
String paramName = null;
if (parameterArray.length > 1) {
paramName = parameterArray[1];
if (paramName.contains("_START_END_SPLIT")) {
String[] paramNameArray = paramName.split("_START_END_SPLIT");
if (paramName.contains(START_END_SEPARATOR)) {
String[] paramNameArray = paramName.split(START_END_SEPARATOR);
paramName = paramNameArray[0];
isEndParam = true;
}