From 69f9c308d0f1db99a41eab98e77ead77cfd6a567 Mon Sep 17 00:00:00 2001
From: fanghongchao <601470458@qq.com>
Date: Fri, 14 Dec 2018 18:19:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/history/HistoryFlightDataController.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gzzn/omms/adminapi/controller/history/HistoryFlightDataController.java b/src/main/java/com/gzzn/omms/adminapi/controller/history/HistoryFlightDataController.java
index 32c6638..6577f51 100644
--- a/src/main/java/com/gzzn/omms/adminapi/controller/history/HistoryFlightDataController.java
+++ b/src/main/java/com/gzzn/omms/adminapi/controller/history/HistoryFlightDataController.java
@@ -38,7 +38,7 @@ public class HistoryFlightDataController {
 	
 	@ApiOperation(value="获取历史航班数据(只提供计划时间的出发/到达时间段查询)",tags="历史航班数据") 
 	@PostMapping(value="/hitFlightData/list")
-	public ResponseDto<Object> findAllByGroupCode(@RequestBody HistoryFilghtConditionDto conditions) {
+	public ResponseDto<Object> findByTimeAndMvin(@RequestBody HistoryFilghtConditionDto conditions) {
 		
 		String startTime = StringUtils.isEmpty(conditions.getStartSODT())?null:DateUtils.swichTimeToEn_ddMMMyyHHmm(conditions.getStartSODT());
 		String endTime = StringUtils.isEmpty(conditions.getEndSODT())?null:DateUtils.swichTimeToEn_ddMMMyyHHmm(conditions.getEndSODT());
@@ -46,10 +46,11 @@ public class HistoryFlightDataController {
 		String MVIN = conditions.getMVIN();//到达/离港
 		BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
 		
-		//获取前一天的历史数据
+		//获取前一天的历史数据 根据实际时间
 		String hitStartTime = DateUtils.getNewDateOfDayMixOrMaxTime(new Date(), "Day", -1, "MIN");
 		String hitEndTime = DateUtils.getNewDateOfDayMixOrMaxTime(new Date(), "Day", -1, "MAX");
-		boolQuery.must(QueryBuilders.rangeQuery("SODT")
+		
+		boolQuery.must(QueryBuilders.rangeQuery("ACTT")
 				.gte(hitStartTime).lte(hitEndTime));
 
 		if(!StringUtils.isEmpty(startTime) && !StringUtils.isEmpty(endTime)){