|
@ -4,7 +4,6 @@ import com.yihu.wlyy.entity.statistics.PopulationBase;
|
|
|
import com.yihu.wlyy.entity.statistics.WlyyQuotaResult;
|
|
|
import com.yihu.wlyy.service.app.statistics.StatisticsAllService;
|
|
|
import com.yihu.wlyy.service.app.statistics.StatisticsService;
|
|
|
import com.yihu.wlyy.service.app.statisticsES.StatisticsESService;
|
|
|
import com.yihu.wlyy.util.Constant;
|
|
|
import com.yihu.wlyy.util.DateUtil;
|
|
|
import com.yihu.wlyy.util.ValueComparator;
|
|
@ -35,8 +34,6 @@ public class StatisticsController extends BaseController {
|
|
|
@Autowired
|
|
|
StatisticsService statisticsService;
|
|
|
@Autowired
|
|
|
StatisticsESService statisticsESService;
|
|
|
@Autowired
|
|
|
StatisticsAllService statisticsAllService;
|
|
|
|
|
|
/**
|
|
@ -83,8 +80,8 @@ public class StatisticsController extends BaseController {
|
|
|
|
|
|
if (index != null) {
|
|
|
for (String idx : indexes) {
|
|
|
result.put("index_" + idx, statisticsESService.getDateIncrementDetail(startDate, endDate, interval, area, level, idx, level2_type));
|
|
|
// result.put("index_" + idx, statisticsService.getDateIncrementDetail(startDate, endDate, interval, area, Integer.parseInt(level), idx, level2_type));
|
|
|
// result.put("index_" + idx, statisticsESService.getDateIncrementDetail(startDate, endDate, interval, area, level, idx, level2_type));
|
|
|
result.put("index_" + idx, statisticsService.getDateIncrementDetail(startDate, endDate, interval, area, Integer.parseInt(level), idx, level2_type));
|
|
|
}
|
|
|
}
|
|
|
|