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

Merge pull request #4608 from dataease/pr@dev@fix_group_bar_drill

Browse Source 
fix(分组柱状图-下钻): 修复分组柱状图子维度下钻问题
This commit is contained in:
wisonic-s 2023-02-22 23:15:18 +08:00 committed by GitHub
commit 326361f4fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -844,22 +844,37 @@ public class ChartViewService {
// 下钻 // 下钻
List<ChartExtFilterRequest> drillFilters = new ArrayList<>(); List<ChartExtFilterRequest> drillFilters = new ArrayList<>();
boolean isDrill = false; boolean isDrill = false;
List<ChartDrillRequest> drillRequest = chartExtRequest.getDrill(); List<ChartDrillRequest> drillRequestList = chartExtRequest.getDrill();
if (CollectionUtils.isNotEmpty(drillRequest) && (drill.size() > drillRequest.size())) { if (CollectionUtils.isNotEmpty(drillRequestList) && (drill.size() > drillRequestList.size())) {
for (int i = 0; i < drillRequest.size(); i++) { // 如果是从子维度开始下钻，那么先把主维度的条件先加上去
ChartDrillRequest request = drillRequest.get(i); if (CollectionUtils.isNotEmpty(xAxisExt) && StringUtils.equalsIgnoreCase(drill.get(0).getId(),xAxisExt.get(0).getId())) {
for (ChartDimensionDTO dto : request.getDimensionList()) { ChartDrillRequest head = drillRequestList.get(0);
for (int i = 0; i < xAxisBase.size(); i++) {
ChartDimensionDTO dimensionDTO = head.getDimensionList().get(i);
DatasetTableField datasetTableField = dataSetTableFieldsService.get(dimensionDTO.getId());
ChartExtFilterRequest tmp = new ChartExtFilterRequest();
tmp.setFieldId(tmp.getFieldId());
tmp.setValue(Collections.singletonList(dimensionDTO.getValue()));
tmp.setOperator("in");
tmp.setDatasetTableField(datasetTableField);
extFilterList.add(tmp);
drillFilters.add(tmp);
}
}
for (int i = 0; i < drillRequestList.size(); i++) {
ChartDrillRequest request = drillRequestList.get(i);
ChartViewFieldDTO chartViewFieldDTO = drill.get(i); ChartViewFieldDTO chartViewFieldDTO = drill.get(i);
for (ChartDimensionDTO requestDimension : request.getDimensionList()) {
// 将钻取值作为条件传递，将所有钻取字段作为xAxis并加上下一个钻取字段 // 将钻取值作为条件传递，将所有钻取字段作为xAxis并加上下一个钻取字段
if (StringUtils.equalsIgnoreCase(dto.getId(), chartViewFieldDTO.getId())) { if (StringUtils.equalsIgnoreCase(requestDimension.getId(), chartViewFieldDTO.getId())) {
isDrill = true; isDrill = true;
DatasetTableField datasetTableField = dataSetTableFieldsService.get(dto.getId()); DatasetTableField datasetTableField = dataSetTableFieldsService.get(requestDimension.getId());
ChartViewFieldDTO d = new ChartViewFieldDTO(); ChartViewFieldDTO d = new ChartViewFieldDTO();
BeanUtils.copyBean(d, datasetTableField); BeanUtils.copyBean(d, datasetTableField);
ChartExtFilterRequest drillFilter = new ChartExtFilterRequest(); ChartExtFilterRequest drillFilter = new ChartExtFilterRequest();
drillFilter.setFieldId(dto.getId()); drillFilter.setFieldId(requestDimension.getId());
drillFilter.setValue(Collections.singletonList(dto.getValue())); drillFilter.setValue(Collections.singletonList(requestDimension.getValue()));
drillFilter.setOperator("in"); drillFilter.setOperator("in");
drillFilter.setDatasetTableField(datasetTableField); drillFilter.setDatasetTableField(datasetTableField);
extFilterList.add(drillFilter); extFilterList.add(drillFilter);
@ -869,7 +884,8 @@ public class ChartViewService {
if (!checkDrillExist(xAxis, extStack, d, view)) { if (!checkDrillExist(xAxis, extStack, d, view)) {
xAxis.add(d); xAxis.add(d);
} }
if (i == drillRequest.size() - 1) { //
if (i == drillRequestList.size() - 1) {
ChartViewFieldDTO nextDrillField = drill.get(i + 1); ChartViewFieldDTO nextDrillField = drill.get(i + 1);
if (!checkDrillExist(xAxis, extStack, nextDrillField, view)) { if (!checkDrillExist(xAxis, extStack, nextDrillField, view)) {
// get drill list first element's sort,then assign to nextDrillField // get drill list first element's sort,then assign to nextDrillField