From 5c267b9dc269f5d5b27b69375746b2bf3c40c6aa Mon Sep 17 00:00:00 2001 From: junjun Date: Wed, 9 Oct 2024 09:52:32 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8):=20=E8=81=94?= =?UTF-8?q?=E5=8A=A8=E5=90=8C=E7=8E=AF=E6=AF=94=E8=AE=A1=E7=AE=97=E4=BC=98?= =?UTF-8?q?=E5=8C=96=20#12370?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/chart/charts/impl/DefaultChartHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java index 1413664c6d..3f30beb3be 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java @@ -357,7 +357,7 @@ public class DefaultChartHandler extends AbstractChartPlugin { return list; } - private ChartSeniorAssistDTO of(ThresholdDynamicFieldDTO dynamicField){ + private ChartSeniorAssistDTO of(ThresholdDynamicFieldDTO dynamicField) { ChartSeniorAssistDTO conditionField = new ChartSeniorAssistDTO(); conditionField.setFieldId(Long.parseLong(dynamicField.getFieldId())); conditionField.setValue(dynamicField.getSummary()); @@ -578,7 +578,8 @@ public class DefaultChartHandler extends AbstractChartPlugin { if (StringUtils.isNotEmpty(compareCalc.getType()) && !StringUtils.equalsIgnoreCase(compareCalc.getType(), "none")) { if (Arrays.asList(ChartConstants.M_Y).contains(compareCalc.getType())) { - if (StringUtils.equalsIgnoreCase(compareCalc.getField() + "", filterDTO.getFieldId()) && filterDTO.getFilterType() == 0) { + if (StringUtils.equalsIgnoreCase(compareCalc.getField() + "", filterDTO.getFieldId()) + && (filterDTO.getFilterType() == 0 || filterDTO.getFilterType() == 2)) { // -1 year try { Calendar calendar = Calendar.getInstance();