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

Merge pull request #12579 from dataease/pr@dev-v2@refactor_chart

Browse Source 
refactor(图表): 联动同环比计算优化 #12370
This commit is contained in:
Junjun 2024-10-09 09:54:02 +08:00 committed by GitHub
commit 6a059fa5b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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();