|
@ -1151,7 +1151,7 @@ public class BaseStatistsService {
|
|
|
|
|
|
if (StringUtils.isNotEmpty(esConfig.getGrowthFlag())) {
|
|
if (StringUtils.isNotEmpty(esConfig.getGrowthFlag())) {
|
|
//增幅运算(环比和同比)
|
|
//增幅运算(环比和同比)
|
|
result = getGrowthByQuota(dimension, filters, esConfig, dateType);
|
|
|
|
|
|
result = getGrowthByQuota(dimension, filters, esConfig, dateType, top);
|
|
} else {
|
|
} else {
|
|
if (StringUtils.isNotEmpty(esConfig.getDateComparisonType())) {
|
|
if (StringUtils.isNotEmpty(esConfig.getDateComparisonType())) {
|
|
//时间条件处理
|
|
//时间条件处理
|
|
@ -1507,7 +1507,7 @@ public class BaseStatistsService {
|
|
* @return
|
|
* @return
|
|
* @throws Exception
|
|
* @throws Exception
|
|
*/
|
|
*/
|
|
public List<Map<String, Object>> getGrowthByQuota(String dimension, String filters, EsConfig esConfig, String dateType) throws Exception {
|
|
|
|
|
|
public List<Map<String, Object>> getGrowthByQuota(String dimension, String filters, EsConfig esConfig, String dateType, String top) throws Exception {
|
|
List<Map<String, Object>> resultList = new LinkedList<>();
|
|
List<Map<String, Object>> resultList = new LinkedList<>();
|
|
String startQuotaDate = "";
|
|
String startQuotaDate = "";
|
|
String endQuotaDate = "";
|
|
String endQuotaDate = "";
|
|
@ -1615,7 +1615,7 @@ public class BaseStatistsService {
|
|
molecularFilter += " and " + noDateFilter;
|
|
molecularFilter += " and " + noDateFilter;
|
|
denominatorFilter += " and " + noDateFilter;
|
|
denominatorFilter += " and " + noDateFilter;
|
|
}
|
|
}
|
|
List<Map<String, Object>> moleList = getSimpleQuotaReport(esConfig.getMolecular(), molecularFilter,dimension ,false , null);
|
|
|
|
|
|
List<Map<String, Object>> moleList = getSimpleQuotaReport(esConfig.getMolecular(), molecularFilter,dimension ,false , top);
|
|
List<Map<String, Object>> denoList = getSimpleQuotaReport(esConfig.getDenominator(),denominatorFilter,dimension,false, null);
|
|
List<Map<String, Object>> denoList = getSimpleQuotaReport(esConfig.getDenominator(),denominatorFilter,dimension,false, null);
|
|
resultList = divisionPercent(dimension, moleList, denoList, 1, 100);
|
|
resultList = divisionPercent(dimension, moleList, denoList, 1, 100);
|
|
return resultList;
|
|
return resultList;
|