|
@ -86,208 +86,7 @@ public class StatisticsESService {
|
|
|
return "";
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 获取所有指标的增量、到达量
|
|
|
* 备注:原来接口的一级指标对应现在的
|
|
|
*
|
|
|
* @param endDate
|
|
|
* @param area
|
|
|
* @param level
|
|
|
* @param index
|
|
|
* @return
|
|
|
*/
|
|
|
public List findOneDateQuotaLevel0(String startDate,String endDate, String area, int level, String index,String timeLevel,String interval,String lowLevel) throws Exception {
|
|
|
|
|
|
StringBuffer sql = new StringBuffer();
|
|
|
StringBuffer groupBy = new StringBuffer();
|
|
|
if (SaveModel.teamLevel.equals(level+"")) {
|
|
|
sql.append("select team,teamName,sum(result1) result1, sum(result2) result2 from wlyy_quota_test where team='" + area + "'");
|
|
|
groupBy.append(" group by team,teamName");
|
|
|
} else if (SaveModel.OrgLevel.equals(level+"")) {
|
|
|
sql.append("select hospital,hospitalName,sum(result1) result1,sum(result2) result2 from wlyy_quota_test where hospital='" + area + "'");
|
|
|
groupBy.append(" group by hospital,hospitalName");
|
|
|
} else if (SaveModel.townLevel.equals(level+"")) {
|
|
|
sql.append("select town,townName,sum(result1) result1,sum(result2) result2 from wlyy_quota_test where town='" + area + "'");
|
|
|
groupBy.append(" group by town,townName");
|
|
|
} else if (SaveModel.cityLevel.equals(level+"")) {
|
|
|
sql.append("select city,cityName,sum(result1) result1,sum(result2) result2 from wlyy_quota_test where city='" + area + "'");
|
|
|
groupBy.append(" group by city,cityName");
|
|
|
}
|
|
|
sql.append(" and quotaCode='"+index+"' ");
|
|
|
sql.append(" and timeLevel='"+timeLevel+"' ");
|
|
|
sql.append(" and areaLevel='5'");
|
|
|
if(StringUtils.isNotEmpty(startDate)){
|
|
|
sql.append(" and quotaDate>='" + startDate + "'");
|
|
|
}
|
|
|
if(StringUtils.isNotEmpty(endDate)){
|
|
|
sql.append(" and quotaDate<='" + endDate + "'");
|
|
|
}
|
|
|
|
|
|
if(StringUtils.isNotEmpty(lowLevel)){
|
|
|
|
|
|
if (SaveModel.teamLevel.equals(lowLevel)) {
|
|
|
sql.append(" and team='" + area + "'");
|
|
|
} else if (SaveModel.OrgLevel.equals(lowLevel)) {
|
|
|
sql.append(" and hospital='" + area + "'");
|
|
|
} else if (SaveModel.townLevel.equals(lowLevel)) {
|
|
|
sql.append(" and town='" + area + "'");
|
|
|
} else if (SaveModel.cityLevel.equals(lowLevel)) {
|
|
|
sql.append(" and city='" + area + "'");
|
|
|
}
|
|
|
}
|
|
|
//根据时间维度分组
|
|
|
if(StringUtils.isNotEmpty(interval)){
|
|
|
if (SaveModel.interval_month.equals(interval)) {
|
|
|
groupBy.append(" ,date_histogram(field='quotaDate','interval'='month') ");
|
|
|
} else if (SaveModel.interval_week.equals(interval)) {
|
|
|
groupBy.append(" ,date_histogram(field='quotaDate','interval'='week') ");
|
|
|
} else if (SaveModel.interval_day.equals(interval)) {
|
|
|
groupBy.append(" ,date_histogram(field='quotaDate','interval'='1d') ");
|
|
|
}
|
|
|
}
|
|
|
sql.append(groupBy);
|
|
|
|
|
|
return elasticsearchUtil.excute(sql.toString(),SaveModel.class,"","");
|
|
|
}
|
|
|
|
|
|
|
|
|
/**
|
|
|
* 获取一级指标的增量、到达量
|
|
|
* 备注:原接口的二级指标对应现在的一级指标
|
|
|
*
|
|
|
* @param endDate
|
|
|
* @param area
|
|
|
* @param level
|
|
|
* @param index
|
|
|
* @return
|
|
|
*/
|
|
|
public List findOneDateQuotaLevel1(String startDate,String endDate, String area, int level, String index,String timeLevel,String slaveKey1,String interval,String lowLevel ) throws Exception{
|
|
|
|
|
|
StringBuffer sql = new StringBuffer();
|
|
|
StringBuffer groupBy = new StringBuffer();
|
|
|
if (SaveModel.teamLevel.equals(level+"")) {
|
|
|
sql.append("select team,teamName,slaveKey1,slaveKey1Name,sum(result1) result1, sum(result2) result2 from wlyy_quota_test where team='" + area + "'");
|
|
|
groupBy.append(" group by team,teamName,slaveKey1,slaveKey1Name");
|
|
|
} else if (SaveModel.OrgLevel.equals(level+"")) {
|
|
|
sql.append("select hospital,hospitalName,slaveKey1,slaveKey1Name,sum(result1) result1,sum(result2) result2 from wlyy_quota_test where hospital='" + area + "'");
|
|
|
groupBy.append(" group by hospital,hospitalName,slaveKey1,slaveKey1Name");
|
|
|
} else if (SaveModel.townLevel.equals(level+"")) {
|
|
|
sql.append("select town,townName,slaveKey1,slaveKey1Name,sum(result1) result1,sum(result2) result2 from wlyy_quota_test where town='" + area + "'");
|
|
|
groupBy.append(" group by town,townName,slaveKey1,slaveKey1Name");
|
|
|
} else if (SaveModel.cityLevel.equals(level+"")) {
|
|
|
sql.append("select city,cityName,slaveKey1,slaveKey1Name,sum(result1) result1,sum(result2) result2 from wlyy_quota_test where city='" + area + "'");
|
|
|
groupBy.append(" group by city,cityName,slaveKey1,slaveKey1Name");
|
|
|
}
|
|
|
sql.append(" and quotaCode='"+index+"' ");
|
|
|
sql.append(" and timeLevel='"+timeLevel+"' ");
|
|
|
sql.append(" and areaLevel='5'");
|
|
|
if(StringUtils.isNotEmpty(startDate)){
|
|
|
sql.append(" and quotaDate>='" + startDate + "'");
|
|
|
}
|
|
|
if(StringUtils.isNotEmpty(endDate)){
|
|
|
sql.append(" and quotaDate<='" + endDate + "'");
|
|
|
}
|
|
|
if(StringUtils.isNotEmpty(slaveKey1)){
|
|
|
sql.append(" and slaveKey1='"+slaveKey1+"' ");
|
|
|
}
|
|
|
if(StringUtils.isNotEmpty(lowLevel)){
|
|
|
|
|
|
if (SaveModel.teamLevel.equals(lowLevel)) {
|
|
|
sql.append(" and team='" + area + "'");
|
|
|
} else if (SaveModel.OrgLevel.equals(lowLevel)) {
|
|
|
sql.append(" and hospital='" + area + "'");
|
|
|
} else if (SaveModel.townLevel.equals(lowLevel)) {
|
|
|
sql.append(" and town='" + area + "'");
|
|
|
} else if (SaveModel.cityLevel.equals(lowLevel)) {
|
|
|
sql.append(" and city='" + area + "'");
|
|
|
}
|
|
|
}
|
|
|
//根据时间维度分组
|
|
|
if(StringUtils.isNotEmpty(interval)){
|
|
|
if (SaveModel.interval_month.equals(interval)) {
|
|
|
groupBy.append(" ,date_histogram(field='quotaDate','interval'='month') ");
|
|
|
} else if (SaveModel.interval_week.equals(interval)) {
|
|
|
groupBy.append(" ,date_histogram(field='quotaDate','interval'='week') ");
|
|
|
} else if (SaveModel.interval_day.equals(interval)) {
|
|
|
groupBy.append(" ,date_histogram(field='quotaDate','interval'='1d') ");
|
|
|
}
|
|
|
}
|
|
|
sql.append(groupBy);
|
|
|
|
|
|
return elasticsearchUtil.excute(sql.toString(),SaveModel.class,"","");
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 获取二级指标的增量、到达量
|
|
|
* 备注:原接口的三级指标对应现在的二级指标
|
|
|
*
|
|
|
* @param endDate
|
|
|
* @param area
|
|
|
* @param level
|
|
|
* @param index
|
|
|
* @return
|
|
|
*/
|
|
|
public List findOneDateQuotaLevel2(String startDate,String endDate, String area, int level, String index,String timeLevel,String slaveKey1,String slaveKey2,String interval,String lowLevel){
|
|
|
|
|
|
//时间格式转换 yyyy-MM-dd转成 2017-07-17T00:00:00+0800
|
|
|
endDate = changeDate(endDate);
|
|
|
StringBuffer sql = new StringBuffer();
|
|
|
StringBuffer groupBy = new StringBuffer();
|
|
|
if (SaveModel.teamLevel.equals(level+"")) {
|
|
|
sql.append("select team,teamName,slaveKey1,slaveKey1Name,slaveKey2,slaveKey2Name,result1,result2 from wlyy_quota_test where team='" + area + "'");
|
|
|
groupBy.append(" group by team,teamName,slaveKey1,slaveKey1Name,slaveKey2,slaveKey2Name");
|
|
|
} else if (SaveModel.OrgLevel.equals(level+"")) {
|
|
|
sql.append("select hospital,hospitalName,sum(result1) result1,sum(result2) result2 from wlyy_quota_test where hospital='" + area + "'");
|
|
|
groupBy.append(" group by hospital,slaveKey1,slaveKey1Name,slaveKey2,slaveKey2Name,hospitalName,slaveKey1,slaveKey1Name,slaveKey2,slaveKey2Name");
|
|
|
} else if (SaveModel.townLevel.equals(level+"")) {
|
|
|
sql.append("select town,townName,slaveKey1,slaveKey1Name,slaveKey2,slaveKey2Name,sum(result1) result1,sum(result2) result2 from wlyy_quota_test where town='" + area + "'");
|
|
|
groupBy.append(" group by town,townName,slaveKey1,slaveKey1Name,slaveKey2,slaveKey2Name");
|
|
|
} else if (SaveModel.cityLevel.equals(level+"")) {
|
|
|
sql.append("select city,cityName,slaveKey1,slaveKey1Name,slaveKey2,slaveKey2Name,sum(result1) result1,sum(result2) result2 from wlyy_quota_test where city='" + area + "'");
|
|
|
groupBy.append(" group by city,cityName,slaveKey1,slaveKey1Name,slaveKey2,slaveKey2Name");
|
|
|
}
|
|
|
|
|
|
sql.append(" and quotaCode='" + index + "' ");
|
|
|
sql.append(" and timeLevel='"+timeLevel+"' ");
|
|
|
sql.append(" and areaLevel='5'");
|
|
|
if(StringUtils.isNotEmpty(startDate)){
|
|
|
sql.append(" and quotaDate>='" + startDate + "'");
|
|
|
}
|
|
|
if(StringUtils.isNotEmpty(endDate)){
|
|
|
sql.append(" and quotaDate<='" + endDate + "'");
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(slaveKey1)){
|
|
|
sql.append(" and slaveKey1='"+slaveKey1+"'");
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(slaveKey2)){
|
|
|
sql.append(" and slaveKey2='"+slaveKey2+"'");
|
|
|
}
|
|
|
|
|
|
if(StringUtils.isNotEmpty(lowLevel)){
|
|
|
|
|
|
if (SaveModel.teamLevel.equals(lowLevel)) {
|
|
|
sql.append(" and team='" + area + "'");
|
|
|
} else if (SaveModel.OrgLevel.equals(lowLevel)) {
|
|
|
sql.append(" and hospital='" + area + "'");
|
|
|
} else if (SaveModel.townLevel.equals(lowLevel)) {
|
|
|
sql.append(" and town='" + area + "'");
|
|
|
} else if (SaveModel.cityLevel.equals(lowLevel)) {
|
|
|
sql.append(" and city='" + area + "'");
|
|
|
}
|
|
|
}
|
|
|
//根据时间维度分组
|
|
|
if(StringUtils.isNotEmpty(interval)){
|
|
|
if (SaveModel.interval_month.equals(interval)) {
|
|
|
groupBy.append(" ,date_histogram(field='quotaDate','interval'='month') ");
|
|
|
} else if (SaveModel.interval_week.equals(interval)) {
|
|
|
groupBy.append(" ,date_histogram(field='quotaDate','interval'='week') ");
|
|
|
} else if (SaveModel.interval_day.equals(interval)) {
|
|
|
groupBy.append(" ,date_histogram(field='quotaDate','interval'='1d') ");
|
|
|
}
|
|
|
}
|
|
|
sql.append(groupBy);
|
|
|
return elasticsearchUtil.excute(sql.toString(),SaveModel.class,"","");
|
|
|
}
|
|
|
|
|
|
|
|
|
// /**
|
|
@ -365,14 +164,12 @@ public class StatisticsESService {
|
|
|
* @return
|
|
|
*/
|
|
|
public JSONArray getDateIncrementDetail(String startDate, String endDate, String interval, String area, int level, String index, String level2_type) throws Exception {
|
|
|
startDate = changeDate(startDate);
|
|
|
endDate = changeDate(endDate);
|
|
|
List<SaveModel> list = null;
|
|
|
if(StringUtils.isNotEmpty(level2_type)) {
|
|
|
|
|
|
list = findOneDateQuotaLevel1(startDate,endDate,area,level,index,"1",level2_type,interval,null);
|
|
|
list = elasticsearchUtil.findOneDateQuotaLevel1(startDate,endDate,area,level,index,"1",level2_type,interval,null);
|
|
|
}else{
|
|
|
list = findOneDateQuotaLevel0(startDate,endDate,area,level,index,"1",interval,null);
|
|
|
list = elasticsearchUtil.findOneDateQuotaLevel0(startDate,endDate,area,level,index,"1",interval,null);
|
|
|
}
|
|
|
List<JSONObject> result = new ArrayList<>();
|
|
|
for (SaveModel saveModel:list){
|
|
@ -394,9 +191,7 @@ public class StatisticsESService {
|
|
|
* @return
|
|
|
*/
|
|
|
public long getIntervalIncrement(String startDate, String endDate, String area, int level, String index) throws Exception {
|
|
|
startDate = changeDate(startDate);
|
|
|
endDate = changeDate(endDate);
|
|
|
List<SaveModel> list = findOneDateQuotaLevel0(startDate,endDate,area,level,index,"1",null,null);
|
|
|
List<SaveModel> list = elasticsearchUtil.findOneDateQuotaLevel0(startDate,endDate,area,level,index,"1",null,null);
|
|
|
if(list.size()>0){
|
|
|
return list.get(0).getResult2();
|
|
|
}
|
|
@ -462,14 +257,7 @@ public class StatisticsESService {
|
|
|
// }
|
|
|
|
|
|
|
|
|
/**
|
|
|
* 时间格式转换 yyyy-MM-dd转成 2017-07-17T00:00:00+0800
|
|
|
*
|
|
|
* @param quotaDate
|
|
|
*/
|
|
|
private String changeDate(String quotaDate) {
|
|
|
return quotaDate + "T00:00:00+0800";
|
|
|
}
|
|
|
|
|
|
|
|
|
/**
|
|
|
* 查询截止某个日期累计量
|
|
@ -482,14 +270,12 @@ public class StatisticsESService {
|
|
|
*/
|
|
|
public long getTotalAmount(String startDate, String endDate, String area, int level, String index, String level2_type) throws Exception {
|
|
|
|
|
|
startDate = changeDate(startDate);
|
|
|
endDate = changeDate(endDate);
|
|
|
List<SaveModel> list = null;
|
|
|
if(StringUtils.isNotEmpty(level2_type)){
|
|
|
|
|
|
list = findOneDateQuotaLevel1(startDate,endDate,area,level,index,"1",level2_type,null,null);
|
|
|
list = elasticsearchUtil.findOneDateQuotaLevel1(startDate,endDate,area,level,index,"1",level2_type,null,null);
|
|
|
}else{
|
|
|
list = findOneDateQuotaLevel0(startDate,endDate,area,level,index,"1",null,null);
|
|
|
list = elasticsearchUtil.findOneDateQuotaLevel0(startDate,endDate,area,level,index,"1",null,null);
|
|
|
}
|
|
|
// List<SaveModel> list = findOneDateQuotaLevel1(startDate,endDate,area,level,index,"1",level2_type,null,null);
|
|
|
if(list.size()>0){
|
|
@ -514,11 +300,6 @@ public class StatisticsESService {
|
|
|
if (!org.springframework.util.StringUtils.isEmpty(year)) {
|
|
|
startDate = year + "-06-30' ";
|
|
|
}
|
|
|
//时间格式转换 yyyy-MM-dd转成 2017-07-17T00:00:00+0800
|
|
|
if(StringUtils.isNotEmpty(startDate)){
|
|
|
startDate = changeDate(startDate);
|
|
|
}
|
|
|
endDate = changeDate(endDate);
|
|
|
String levelTemp = level+"";
|
|
|
if(StringUtils.isNotEmpty(lowLevel)){
|
|
|
levelTemp = lowLevel;
|
|
@ -644,8 +425,7 @@ public class StatisticsESService {
|
|
|
public JSONArray getIndexLevelTwototal(String endDate, String area, int level, String index) throws Exception{
|
|
|
|
|
|
// List<SaveModel> list =findOneDateQuotaLevel2(endDate, area, level, index,"1","");
|
|
|
endDate = changeDate(endDate);
|
|
|
List<SaveModel> list = findOneDateQuotaLevel1(endDate,endDate,area,level,index,"2",null,null,null);
|
|
|
List<SaveModel> list = elasticsearchUtil.findOneDateQuotaLevel1(endDate,endDate,area,level,index,"2",null,null,null);
|
|
|
List<Map<String, Object>> resultList = new ArrayList<>();
|
|
|
DecimalFormat df = new DecimalFormat("0.0000");
|
|
|
long total = 0;
|
|
@ -690,7 +470,7 @@ public class StatisticsESService {
|
|
|
if (!index.equals("8")) {
|
|
|
if (index.equals("36")) {
|
|
|
//如果是查询36的指标 那么除数是签约总数
|
|
|
List<SaveModel> list2 =findOneDateQuotaLevel1(endDate,endDate, area, level, "1","2",null,null,null);
|
|
|
List<SaveModel> list2 = elasticsearchUtil.findOneDateQuotaLevel1(endDate,endDate, area, level, "1","2",null,null,null);
|
|
|
Integer num=0;
|
|
|
if(list2.size()>0){
|
|
|
num = list2.get(0).getResult2();
|
|
@ -749,10 +529,9 @@ public class StatisticsESService {
|
|
|
* @return
|
|
|
*/
|
|
|
public long getIndexTotal(String endDate, String area, int level, String index,String timeLevel) throws Exception{
|
|
|
endDate = changeDate(endDate);
|
|
|
|
|
|
// List<SaveModel> list =findOneDateQuotaLevel1("",endDate, area, level, index,timeLevel,null,null);
|
|
|
List<SaveModel> list =findOneDateQuotaLevel0(endDate,endDate, area, level, index,timeLevel,null,null);
|
|
|
List<SaveModel> list = elasticsearchUtil.findOneDateQuotaLevel0(endDate,endDate, area, level, index,timeLevel,null,null);
|
|
|
// List<SaveModel> list =elasticsearchUtil.excute(sql.toString(),SaveModel.class,"","");
|
|
|
if(list.size()>0){
|
|
|
|
|
@ -771,7 +550,7 @@ public class StatisticsESService {
|
|
|
*/
|
|
|
public long getWeiJiaoFei(String endDate, String area, int level) throws Exception{
|
|
|
|
|
|
List<SaveModel> list = findOneDateQuotaLevel1(endDate,endDate,area,level,"16","2","0",null,null);
|
|
|
List<SaveModel> list = elasticsearchUtil.findOneDateQuotaLevel1(endDate,endDate,area,level,"16","2","0",null,null);
|
|
|
if(list.size()>0){
|
|
|
return list.get(0).getResult2();
|
|
|
}
|
|
@ -795,16 +574,16 @@ public class StatisticsESService {
|
|
|
//市的续签量
|
|
|
renewIndex = "29";
|
|
|
}
|
|
|
String timeKey = getTime();
|
|
|
List<SaveModel> list = findOneDateQuotaLevel0(timeKey,timeKey,area,Integer.parseInt(level),renewIndex,"2",null,null);
|
|
|
String timeKey = elasticsearchUtil.getQuotaTime();
|
|
|
List<SaveModel> list = elasticsearchUtil.findOneDateQuotaLevel0(timeKey,timeKey,area,Integer.parseInt(level),renewIndex,"2",null,null);
|
|
|
int renewNum = 0;
|
|
|
if(list.size()>0){
|
|
|
renewNum = list.get(0).getResult2();
|
|
|
}
|
|
|
//根据年度获取去年的签约数 签约指标是1
|
|
|
String date = changeDate(year + "-06-30");
|
|
|
String date = year + "-06-30";
|
|
|
String index = "1";
|
|
|
List<SaveModel> list2 = findOneDateQuotaLevel0(date,date,area,Integer.parseInt(level),index,"2",null,null);
|
|
|
List<SaveModel> list2 = elasticsearchUtil.findOneDateQuotaLevel0(date,date,area,Integer.parseInt(level),index,"2",null,null);
|
|
|
int signNum = 0;
|
|
|
if (list2.size()>0) {
|
|
|
signNum = list2.get(0).getResult2();
|
|
@ -827,7 +606,7 @@ public class StatisticsESService {
|
|
|
public JSONObject getSignRate(String endDate, String area, int level, String year) throws Exception {
|
|
|
|
|
|
long signAmount = 0;
|
|
|
List<SaveModel> list = findOneDateQuotaLevel0(endDate,endDate,area,level,"13","2",null,null);
|
|
|
List<SaveModel> list = elasticsearchUtil.findOneDateQuotaLevel0(endDate,endDate,area,level,"13","2",null,null);
|
|
|
if(list.size()>0){
|
|
|
signAmount = list.get(0).getResult2();
|
|
|
}
|
|
@ -857,8 +636,7 @@ public class StatisticsESService {
|
|
|
* @return
|
|
|
*/
|
|
|
public JSONObject getSignTaskRate(String endDate, String area, int level, String year) throws Exception {
|
|
|
endDate = changeDate(endDate);
|
|
|
List<SaveModel> list = findOneDateQuotaLevel0(endDate,endDate,area,level,"13","2",null,null);
|
|
|
List<SaveModel> list = elasticsearchUtil.findOneDateQuotaLevel0(endDate,endDate,area,level,"13","2",null,null);
|
|
|
long signAmount = 0;
|
|
|
if(list.size()>0){
|
|
|
signAmount = list.get(0).getResult2();
|
|
@ -890,8 +668,7 @@ public class StatisticsESService {
|
|
|
* @return
|
|
|
*/
|
|
|
public JSONObject getGroupInfo(String endDate, String lowCode, String area, int level, String year) throws Exception {
|
|
|
endDate = changeDate(endDate);
|
|
|
List<SaveModel> list = findOneDateQuotaLevel1(endDate,endDate,area,level,"17","2",lowCode,null,null);
|
|
|
List<SaveModel> list = elasticsearchUtil.findOneDateQuotaLevel1(endDate,endDate,area,level,"17","2",lowCode,null,null);
|
|
|
long total = 0;
|
|
|
if(list.size()>0){
|
|
|
total = list.get(0).getResult2();
|
|
@ -929,15 +706,7 @@ public class StatisticsESService {
|
|
|
return json;
|
|
|
}
|
|
|
|
|
|
//获取最新更新的时间
|
|
|
public String getTime(){
|
|
|
|
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
Date today = new Date();
|
|
|
String todayString = simpleDateFormat.format(today);
|
|
|
todayString = changeDate(todayString);
|
|
|
return todayString;
|
|
|
}
|
|
|
/**
|
|
|
* 获取2个数的百分比
|
|
|
*
|
|
@ -967,8 +736,7 @@ public class StatisticsESService {
|
|
|
* @return
|
|
|
*/
|
|
|
public JSONArray getSixFiveStatistics(String endDate, String area, int level) throws Exception{
|
|
|
endDate = changeDate(endDate);
|
|
|
List<SaveModel> list = findOneDateQuotaLevel2(endDate,endDate,area,level,"12","2","6",null,null,null);
|
|
|
List<SaveModel> list = elasticsearchUtil.findOneDateQuotaLevel2(endDate,endDate,area,level,"12","2","6",null,null,null);
|
|
|
List<Map<String, Object>> resultList = new ArrayList<>();
|
|
|
for (int i = 0; i < list.size(); i++) {
|
|
|
Map<String, Object> data = new HashMap<>();
|
|
@ -1036,7 +804,7 @@ public class StatisticsESService {
|
|
|
*/
|
|
|
public long getSixFiveTotal(String endDate, String area, int level) throws Exception{
|
|
|
|
|
|
List<SaveModel> list = findOneDateQuotaLevel1(endDate,endDate,area,level,"8","2","6",null,null);
|
|
|
List<SaveModel> list = elasticsearchUtil.findOneDateQuotaLevel1(endDate,endDate,area,level,"8","2","6",null,null);
|
|
|
if(list.size()>0){
|
|
|
return list.get(0).getResult2();
|
|
|
}
|
|
@ -1058,8 +826,6 @@ public class StatisticsESService {
|
|
|
|
|
|
int taskNum = 0;
|
|
|
JSONObject json = new JSONObject();
|
|
|
startDate = changeDate(startDate);
|
|
|
endDate = changeDate(endDate);
|
|
|
|
|
|
if (level > 1 && org.springframework.util.StringUtils.isEmpty(lowCode)) {
|
|
|
|
|
@ -1085,9 +851,9 @@ public class StatisticsESService {
|
|
|
List<SaveModel> list = null;
|
|
|
if(StringUtils.isNotEmpty(lowCode)){
|
|
|
//一级维度
|
|
|
list = findOneDateQuotaLevel1(startDate,endDate,area,level,index,"2",lowCode,interval+"",null);
|
|
|
list = elasticsearchUtil.findOneDateQuotaLevel1(startDate,endDate,area,level,index,"2",lowCode,interval+"",null);
|
|
|
}else{
|
|
|
list = findOneDateQuotaLevel0(startDate,endDate,area,level,index,"2",interval+"",null);
|
|
|
list = elasticsearchUtil.findOneDateQuotaLevel0(startDate,endDate,area,level,index,"2",interval+"",null);
|
|
|
}
|
|
|
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
List<JSONObject> result = new ArrayList<>();
|