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

feat(视图): 快速计算支持周环比

Browse Source
This commit is contained in:
junjun 2024-03-21 11:08:47 +08:00
parent cb2c48e418
commit db809f65ce
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1399,7 +1399,7 @@ public class ChartViewService {
String cValue = item[dataIndex]; String cValue = item[dataIndex];
// 获取计算后的时间，并且与所有维度拼接 // 获取计算后的时间，并且与所有维度拼接
String lastTime = calcLastTime(cTime, compareCalc.getType(), timeField.getDateStyle(), timeField.getDatePattern()); String lastTime = calcLastTime(cTime, compareCalc.getType(), timeField.getDateStyle(), timeField.getDatePattern(), ds);
String[] dimension = Arrays.copyOfRange(item, 0, checkedField.size()); String[] dimension = Arrays.copyOfRange(item, 0, checkedField.size());
dimension[timeIndex] = lastTime; dimension[timeIndex] = lastTime;
@ -1460,7 +1460,7 @@ public class ChartViewService {
if (StringUtils.containsIgnoreCase(view.getType(), "stack") && extStack.isEmpty()) { if (StringUtils.containsIgnoreCase(view.getType(), "stack") && extStack.isEmpty()) {
break; break;
} }
if (StringUtils.containsIgnoreCase(view.getType(), "group") && xAxisExt.isEmpty() ) { if (StringUtils.containsIgnoreCase(view.getType(), "group") && xAxisExt.isEmpty()) {
break; break;
} }
final Map<String, Integer> mainIndexMap = new HashMap<>(); final Map<String, Integer> mainIndexMap = new HashMap<>();
@ -1764,7 +1764,7 @@ public class ChartViewService {
return false; return false;
} }
private String calcLastTime(String cTime, String type, String dateStyle, String datePattern) { private String calcLastTime(String cTime, String type, String dateStyle, String datePattern, Datasource ds) {
try { try {
String lastTime = null; String lastTime = null;
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
@ -1843,9 +1843,17 @@ public class ChartViewService {
} else if (StringUtils.equalsIgnoreCase(type, ChartConstants.WEEK_MOM)) { } else if (StringUtils.equalsIgnoreCase(type, ChartConstants.WEEK_MOM)) {
SimpleDateFormat simpleDateFormat = null; SimpleDateFormat simpleDateFormat = null;
if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) { if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) {
simpleDateFormat = new SimpleDateFormat("yyyy/'W'w"); if (StringUtils.equalsIgnoreCase(ds.getType(), "ck")) {
simpleDateFormat = new SimpleDateFormat("yyyy/'W'w");
} else {
simpleDateFormat = new SimpleDateFormat("yyyy/'W'ww");
}
} else { } else {
simpleDateFormat = new SimpleDateFormat("yyyy-'W'w"); if (StringUtils.equalsIgnoreCase(ds.getType(), "ck")) {
simpleDateFormat = new SimpleDateFormat("yyyy-'W'w");
} else {
simpleDateFormat = new SimpleDateFormat("yyyy-'W'ww");
}
} }
Date date = simpleDateFormat.parse(cTime); Date date = simpleDateFormat.parse(cTime);
calendar.setTime(date); calendar.setTime(date);