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

Merge pull request #10768 from dataease/pr@dev-v2@fix_sub_dim_time_drill

Browse Source 
Pr@dev v2@fix sub dim time drill
This commit is contained in:
wisonic-s 2024-07-03 16:41:13 +08:00 committed by GitHub
commit c6ed5c9158
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java
View File

@ -484,7 +484,7 @@ public class DefaultChartHandler extends AbstractChartPlugin {
List<ChartViewFieldDTO> drillFields,
List<ChartDrillRequest> drillRequestList) {
var fields = xAxis.stream().map(ChartViewFieldDTO::getId).collect(Collectors.toSet());
ChartDrillRequest head = drillRequestList.get(0);
ChartDrillRequest head = drillRequestList.getFirst();
Map<Long, String> dimValMap = new HashMap<>();
head.getDimensionList().forEach(item -> dimValMap.put(item.getId(), item.getValue()));
Map<Long, ChartViewFieldDTO> fieldMap = xAxis.stream().collect(Collectors.toMap(ChartViewFieldDTO::getId, o -> o, ((p, n) -> p)));
@ -525,6 +525,7 @@ public class DefaultChartHandler extends AbstractChartPlugin {
tmpFilter.setFieldId(String.valueOf(tmpField.getId()));
tmpFilter.setFilterType(1);
if (datasetTableField.getDeType() == 1) {
tmpFilter.setOriginValue(Collections.singletonList(dimValMap.get(tmpField.getId())));
tmpFilter.setOperator("between");
// 把value类似过滤组件处理，获得start time和end time
Map<String, Long> stringLongMap = Utils.parseDateTimeValue(dimValMap.get(tmpField.getId()));