From bd1a85717f4b66083191f76ae9aefa3ef727872a Mon Sep 17 00:00:00 2001
From: fanghongchao <601470458@qq.com>
Date: Mon, 17 Dec 2018 09:44:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8E=86=E5=8F=B2=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E6=9F=90=E4=B8=80=E5=A4=A9=E7=9A=84=E5=8E=86=E5=8F=B2=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../history/HistoryFlightDataController.java      | 11 ++++++++++-
 .../dto/history/HistoryFilghtConditionDto.java    | 15 +++++++++++++--
 2 files changed, 23 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 6577f51..db41274 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
@@ -47,12 +47,20 @@ public class HistoryFlightDataController {
 		BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
 		
 		//获取前一天的历史数据 根据实际时间
+		
+		String hstFLightTime = conditions.getHstFLightTime();
 		String hitStartTime = DateUtils.getNewDateOfDayMixOrMaxTime(new Date(), "Day", -1, "MIN");
 		String hitEndTime = DateUtils.getNewDateOfDayMixOrMaxTime(new Date(), "Day", -1, "MAX");
+		if(!StringUtils.isEmpty(conditions.getHstFLightTime())){
+			hitStartTime = DateUtils.swichTimeToEn_ddMMMyyHHmm(hstFLightTime +" 00:00:00");
+			hitEndTime = DateUtils.swichTimeToEn_ddMMMyyHHmm(hstFLightTime +" 23:59:59");
+		}
 		
-		boolQuery.must(QueryBuilders.rangeQuery("ACTT")
+		//历史创建使劲
+		boolQuery.must(QueryBuilders.rangeQuery("SODT")
 				.gte(hitStartTime).lte(hitEndTime));
 
+		//计划开始结束时间
 		if(!StringUtils.isEmpty(startTime) && !StringUtils.isEmpty(endTime)){
 			boolQuery.must(QueryBuilders.rangeQuery("SODT")
 					.gte(startTime).lte(endTime));
@@ -65,6 +73,7 @@ public class HistoryFlightDataController {
 			boolQuery.must(QueryBuilders.rangeQuery("SODT")
 					.lte(startTime));
 		}
+		//到达or离港
 		if(!StringUtils.isEmpty(MVIN)){
 			boolQuery.must(QueryBuilders.termQuery("MVIN", MVIN));
 		}
diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/history/HistoryFilghtConditionDto.java b/src/main/java/com/gzzn/omms/adminapi/dto/history/HistoryFilghtConditionDto.java
index 39940a8..20c6ff2 100644
--- a/src/main/java/com/gzzn/omms/adminapi/dto/history/HistoryFilghtConditionDto.java
+++ b/src/main/java/com/gzzn/omms/adminapi/dto/history/HistoryFilghtConditionDto.java
@@ -15,10 +15,21 @@ public class HistoryFilghtConditionDto {
 	@ApiModelProperty(value="出发/到达",example="到达/出发(进港/出港)标志,A-到达、D-出发")
 	private String MVIN;
 	
-	@ApiModelProperty(value="开始时间",example="开始时间(yyyy-mm-dd HH:mm)")
+	@ApiModelProperty(value="计划开始时间",example="开始时间(yyyy-mm-dd HH:mm)")
 	private String startSODT;
-	@ApiModelProperty(value="结束时间",example="结束时间(yyyy-mm-dd HH:mm)")
+	@ApiModelProperty(value="计划结束时间",example="结束时间(yyyy-mm-dd HH:mm)")
 	private String endSODT;
+	
+	@ApiModelProperty(value="历史时间",example="查询某天的计划(yyyy-mm-dd),默认查询昨天的历史")
+	private String hstFLightTime;
+	
+	
+	public String getHstFLightTime() {
+		return hstFLightTime;
+	}
+	public void setHstFLightTime(String hstFLightTime) {
+		this.hstFLightTime = hstFLightTime;
+	}
 	public String getMVIN() {
 		return MVIN;
 	}