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

refactor(图表): 联动同环比计算优化 #12370

Browse Source
This commit is contained in:
junjun 2024-10-09 09:52:32 +08:00
parent 4583b3c73b
commit 5c267b9dc2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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();