From 0e9c7e78c169b8a7e577dca599b25a46df99fcce Mon Sep 17 00:00:00 2001
From: fanghongchao <601470458@qq.com>
Date: Mon, 24 Dec 2018 17:27:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96=20=20?=
 =?UTF-8?q?=E5=AD=A3=E5=BA=A6=E8=AE=A1=E5=88=92=E5=B9=B4=E4=BB=BD=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../schedule/FlightSchdSeasonController.java         | 12 ++++++++++++
 .../dao/basicdata/FimsFlightschdSeasonDao.java       |  6 +++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gzzn/omms/adminapi/controller/schedule/FlightSchdSeasonController.java b/src/main/java/com/gzzn/omms/adminapi/controller/schedule/FlightSchdSeasonController.java
index 3d28c8b..7f747ae 100644
--- a/src/main/java/com/gzzn/omms/adminapi/controller/schedule/FlightSchdSeasonController.java
+++ b/src/main/java/com/gzzn/omms/adminapi/controller/schedule/FlightSchdSeasonController.java
@@ -2,6 +2,7 @@ package com.gzzn.omms.adminapi.controller.schedule;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,4 +62,15 @@ public class FlightSchdSeasonController {
 		return ResponseDto.success(fimsFlightschdSeasonsListDto);
 	}
 	
+	
+	/**
+	 * 获取所有航班季度计划中的年份
+	 * @return
+	 */
+	@ApiOperation(value="获取航班计划中的年份列表",tags="航班季度计划") 
+	@GetMapping(value="/schedule/flightSchdSeason/years")
+	public ResponseDto<Set<String>> getFlightSchdSeasonYears() {
+		Set<String> years = fimsFlightschdSeasonDao.getFlightSchdSeasonYears();
+		return ResponseDto.success(years);
+	}
 }
diff --git a/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/FimsFlightschdSeasonDao.java b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/FimsFlightschdSeasonDao.java
index 814d927..200322b 100644
--- a/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/FimsFlightschdSeasonDao.java
+++ b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/FimsFlightschdSeasonDao.java
@@ -2,6 +2,7 @@ package com.gzzn.omms.adminapi.domain.secondary.dao.basicdata;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
@@ -11,5 +12,8 @@ import com.gzzn.omms.adminapi.domain.secondary.entity.schedule.FimsFlightschdSea
 public interface FimsFlightschdSeasonDao extends CrudRepository<FimsFlightschdSeason, String> {
 	
 	@Query(value = "select a from FimsFlightschdSeason a where a.startDate>=?1 and a.startDate<=?2")
-	List<FimsFlightschdSeason> findByStartDateRange(Date from,Date to); 
+	List<FimsFlightschdSeason> findByStartDateRange(Date from,Date to);
+
+	@Query(value = "select * from (select distinct to_char(s.start_date,'yyyy') start_date from FIMS_FLIGHTSCHD_SEASON s )order by start_date DESC",nativeQuery = true)
+	Set<String> getFlightSchdSeasonYears(); 
 }