|
@ -179,7 +179,7 @@ public class StatisticsController extends BaseController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 指标截止日期累积量
|
|
|
* 指标截止日期增量
|
|
|
*
|
|
|
* @param endDate
|
|
|
* @param area
|
|
@ -232,10 +232,13 @@ public class StatisticsController extends BaseController {
|
|
|
JSONObject result = new JSONObject();
|
|
|
JSONArray returnJa = new JSONArray();
|
|
|
List<JSONArray> jsonArrays = new ArrayList<>();
|
|
|
for (String idx : indexes) {
|
|
|
JSONArray jsonArray = statisticsService.getLowLevelTotalDetail(endDate, area, level, idx, sort, lowLevel);
|
|
|
jsonArrays.add(jsonArray);
|
|
|
}
|
|
|
|
|
|
JSONArray jsonArray1 = statisticsService.getLowLevelTotalDetail(endDate, area, level, indexes[0], sort, lowLevel);
|
|
|
jsonArrays.add(jsonArray1);
|
|
|
|
|
|
JSONArray jsonArray2= statisticsService.getLowLevelIncrementDetail(endDate, endDate, area, level, indexes[1], sort, lowLevel);
|
|
|
jsonArrays.add(jsonArray2);
|
|
|
|
|
|
//遍历合并2个指标中key值一样的
|
|
|
for (int i = 0; i < jsonArrays.get(0).length(); i++) {
|
|
|
if (jsonArrays.get(1).length() == 0) {
|