|  | @ -340,11 +340,15 @@ public class ElasticsearchUtil {
 | 
												
													
														
															|  |         public List findDateQuotaLevel0(String startDate, String endDate, String area, int level, String index, String timeLevel, String interval, String lowLevel) throws Exception {
 |  |         public List findDateQuotaLevel0(String startDate, String endDate, String area, int level, String index, String timeLevel, String interval, String lowLevel) throws Exception {
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |         String areaLevel="6";
 |  |         String areaLevel="6";
 | 
												
													
														
															|  |         String sqlArea = " select area_level from wlyy_job_config_new where id='"+index+"' ";
 |  | 
 | 
												
													
														
															|  |         List<String> areaLevels = jdbcTemplate.queryForList(sqlArea,String.class);
 |  | 
 | 
												
													
														
															|  |         if (areaLevels.size()>0){
 |  | 
 | 
												
													
														
															|  |             areaLevel = areaLevels.get(0);
 |  | 
 | 
												
													
														
															|  | 
 |  |         if (!index.contains(",")){
 | 
												
													
														
															|  | 
 |  |             String sqlArea = " select area_level from wlyy_job_config_new where id='"+index+"' ";
 | 
												
													
														
															|  | 
 |  |             List<String> areaLevels = jdbcTemplate.queryForList(sqlArea,String.class);
 | 
												
													
														
															|  | 
 |  |             if (areaLevels.size()>0){
 | 
												
													
														
															|  | 
 |  |                 areaLevel = areaLevels.get(0);
 | 
												
													
														
															|  | 
 |  |             }
 | 
												
													
														
															|  |         }
 |  |         }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |         //时间格式转换  yyyy-MM-dd转成 2017-07-17T00:00:00+0800
 |  |         //时间格式转换  yyyy-MM-dd转成 2017-07-17T00:00:00+0800
 | 
												
													
														
															|  |         if (StringUtils.isNotEmpty(startDate)) {
 |  |         if (StringUtils.isNotEmpty(startDate)) {
 | 
												
													
														
															|  |             if (startDate.length() > 10) {
 |  |             if (startDate.length() > 10) {
 | 
												
											
												
													
														
															|  | @ -1133,11 +1137,14 @@ public class ElasticsearchUtil {
 | 
												
													
														
															|  |      */
 |  |      */
 | 
												
													
														
															|  |     public List findDateQuotaLevels(String startDate, String endDate, String area, int level, String index, String timeLevel,String interval, String lowLevel,String groupKey,String ...slaveKeys) {
 |  |     public List findDateQuotaLevels(String startDate, String endDate, String area, int level, String index, String timeLevel,String interval, String lowLevel,String groupKey,String ...slaveKeys) {
 | 
												
													
														
															|  |         String areaLevel="6";
 |  |         String areaLevel="6";
 | 
												
													
														
															|  |         String sqlArea = " select area_level from wlyy_job_config_new where id='"+index+"' ";
 |  | 
 | 
												
													
														
															|  |         List<String> areaLevels = jdbcTemplate.queryForList(sqlArea,String.class);
 |  | 
 | 
												
													
														
															|  |         if (areaLevels.size()>0){
 |  | 
 | 
												
													
														
															|  |             areaLevel = areaLevels.get(0);
 |  | 
 | 
												
													
														
															|  | 
 |  |         if (!index.contains(",")){
 | 
												
													
														
															|  | 
 |  |             String sqlArea = " select area_level from wlyy_job_config_new where id='"+index+"' ";
 | 
												
													
														
															|  | 
 |  |             List<String> areaLevels = jdbcTemplate.queryForList(sqlArea,String.class);
 | 
												
													
														
															|  | 
 |  |             if (areaLevels.size()>0){
 | 
												
													
														
															|  | 
 |  |                 areaLevel = areaLevels.get(0);
 | 
												
													
														
															|  | 
 |  |             }
 | 
												
													
														
															|  |         }
 |  |         }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |         //时间格式转换  yyyy-MM-dd转成 2017-07-17T00:00:00+0800
 |  |         //时间格式转换  yyyy-MM-dd转成 2017-07-17T00:00:00+0800
 | 
												
													
														
															|  |         if (StringUtils.isNotEmpty(startDate)) {
 |  |         if (StringUtils.isNotEmpty(startDate)) {
 | 
												
													
														
															|  |             if (startDate.length() > 10) {
 |  |             if (startDate.length() > 10) {
 |