dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7473 from dataease/pr@dev@fix_report_select_first

Browse Source 
fix: 定时报告包含首项的过滤器无效
This commit is contained in:
fit2cloud-chenyw 2023-12-29 14:38:39 +08:00 committed by GitHub
commit 83517c2619
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
core/backend/src/main/java/io/dataease/service/chart/build/SelectBuild.java
View File

@ -1,11 +1,18 @@
package io.dataease.service.chart.build; package io.dataease.service.chart.build;
import cn.hutool.core.bean.BeanUtil;
import io.dataease.commons.utils.LogUtil;
import io.dataease.controller.dataset.DataSetTableFieldController;
import io.dataease.controller.request.dataset.MultFieldValuesRequest;
import io.dataease.dto.chart.FilterParamTO; import io.dataease.dto.chart.FilterParamTO;
import io.dataease.dto.dataset.DeSortDTO;
import io.dataease.service.chart.FilterBuildTemplate; import io.dataease.service.chart.FilterBuildTemplate;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -14,6 +21,10 @@ import java.util.stream.Collectors;
@Service("selectWidget") @Service("selectWidget")
public class SelectBuild extends FilterBuildTemplate { public class SelectBuild extends FilterBuildTemplate {
@Resource
private DataSetTableFieldController dataSetTableFieldController;
@Override @Override
protected FilterParamTO buildParam(Map<String, Object> component) { protected FilterParamTO buildParam(Map<String, Object> component) {
FilterParamTO result = new FilterParamTO(); FilterParamTO result = new FilterParamTO();
@ -23,30 +34,34 @@ public class SelectBuild extends FilterBuildTemplate {
Object valueObj = null; Object valueObj = null;
List<String> realValues = null; List<String> realValues = null;
if(ObjectUtils.isEmpty(component.get("options"))) return result; if (ObjectUtils.isEmpty(component.get("options"))) return result;
Map<String, Object> options = (Map<String, Object>)component.get("options"); Map<String, Object> options = (Map<String, Object>) component.get("options");
valueObj = options.get("value"); valueObj = options.get("value");
String defaultValue = ""; String defaultValue = "";
Map<String, Object> attrs = (Map<String, Object>) options.get("attrs"); Map<String, Object> attrs = (Map<String, Object>) options.get("attrs");
boolean multiple = (boolean) attrs.get("multiple"); boolean multiple = (boolean) attrs.get("multiple");
if(!ObjectUtils.isEmpty(valueObj)) { if (!ObjectUtils.isEmpty(valueObj)) {
if(valueObj instanceof List) { if (valueObj instanceof List) {
defaultValue = ""; defaultValue = "";
}else { } else {
defaultValue = valueObj.toString(); defaultValue = valueObj.toString();
} }
} }
if(multiple) { boolean isSelectFirst = StringUtils.equals("custom", component.get("type").toString()) && ObjectUtils.isNotEmpty(attrs.get("selectFirst")) && (boolean) attrs.get("selectFirst");
if (isSelectFirst) {
defaultValue = getFirst(attrs);
}
if (multiple) {
if (StringUtils.isBlank(defaultValue)) { if (StringUtils.isBlank(defaultValue)) {
realValues = new ArrayList<>(); realValues = new ArrayList<>();
}else { } else {
realValues = Arrays.asList(defaultValue.split(",")); realValues = Arrays.asList(defaultValue.split(","));
} }
} else { } else {
if (StringUtils.isBlank(defaultValue)) { if (StringUtils.isBlank(defaultValue)) {
realValues = new ArrayList<>(); realValues = new ArrayList<>();
}else { } else {
realValues = Arrays.asList(defaultValue.split(",")).stream().limit(1).collect(Collectors.toList()); realValues = Arrays.asList(defaultValue.split(",")).stream().limit(1).collect(Collectors.toList());
} }
} }
@ -54,4 +69,22 @@ public class SelectBuild extends FilterBuildTemplate {
result.setValue(realValues); result.setValue(realValues);
return result; return result;
} }
private String getFirst(Map<String, Object> attrs) {
MultFieldValuesRequest request = new MultFieldValuesRequest();
request.setFieldIds(Arrays.stream(attrs.get("fieldId").toString().split(",")).collect(Collectors.toList()));
if (ObjectUtils.isNotEmpty(attrs.get("sort"))) {
DeSortDTO sort = BeanUtil.copyProperties(attrs.get("sort"), DeSortDTO.class);
request.setSort(sort);
}
List<Object> list = null;
try {
list = dataSetTableFieldController.multFieldValues(request);
} catch (Exception e) {
LogUtil.error(e.getMessage());
return null;
}
if (CollectionUtils.isEmpty(list)) return null;
return list.get(0).toString();
}
} }