|
@ -521,7 +521,7 @@ public class EsStatisticsController extends BaseController {
|
|
|
String thisYear = Constant.getNowYearByDate(endDate);
|
|
|
JSONObject json = new JSONObject();
|
|
|
if ("20".equals(idx) && Integer.valueOf(thisYear)>=2018){
|
|
|
//@TODO idx="86";1.5.0版本返回前端改为index_86
|
|
|
idx="86";//1.5.0版本返回前端改为index_86
|
|
|
json = statisticsESService.getDateTotal(startDate, endDate, interval, area, level, "86", lowCode, year,SaveModel.timeLevel_DDL);
|
|
|
}else {
|
|
|
json = statisticsESService.getDateTotal(startDate, endDate, interval, area, level, idx, lowCode, year,SaveModel.timeLevel_DDL);
|
|
@ -601,7 +601,7 @@ public class EsStatisticsController extends BaseController {
|
|
|
result.put("index_" + idx, statisticsESService.getLowLevelTotalOnlineTeamLeader(date, area, level, idx, sort, lowLevel, year, ""));
|
|
|
}else if (idx.equals("20") && Integer.valueOf(year)>=2018){
|
|
|
//20指标是一个键绑定一条数据 所以2018年开始使用86指标 2018-08-27 zd
|
|
|
//@TODO idx="86";
|
|
|
idx="86";
|
|
|
result.put("index_" + idx, statisticsESService.getDeviceLowLevelTotal(date, area, level,"86", sort, lowLevel, year));
|
|
|
}else {
|
|
|
result.put("index_" + idx, statisticsESService.getLowLevelTotal(date, area, level, idx, sort, lowLevel, year));
|