Merge branch 'master' of git@git.int.it2000.com.cn:airport-chengdu/admin-api.git

src/main/java/com/gzzn/omms/adminapi/controller/schedule/FlightSchdSeasonController.java

@@ -1,17 +1,21 @@
 package com.gzzn.omms.adminapi.controller.schedule;
 
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.gzzn.omms.adminapi.domain.secondary.dao.basicdata.FimsFlightschdSeasonDao;
 import com.gzzn.omms.adminapi.domain.secondary.entity.schedule.FimsFlightschdSeason;
 import com.gzzn.omms.adminapi.dto.ResponseDto;
+import com.gzzn.omms.adminapi.dto.basicdata.FimsFlightschdSeasonConditionDto;
 import com.gzzn.omms.adminapi.dto.basicdata.FimsFlightschdSeasonDto;
 import com.gzzn.omms.adminapi.dto.basicdata.convert.FimsFlightschdSeasonConvert;
+import com.gzzn.omms.adminapi.utils.DateUtils;
 
 import io.swagger.annotations.ApiOperation;
 
@@ -38,8 +42,15 @@ public class FlightSchdSeasonController {
 	 */
 	@ApiOperation(value="获取航班计划列表",tags="航班季度计划") 
 	@GetMapping(value="/schedule/flightSchdSeasons")
-	public ResponseDto<List<FimsFlightschdSeasonDto>> getFlightSchdSeason() {
-		List<FimsFlightschdSeason> fimsFlightschdSeasonsList = (List<FimsFlightschdSeason>) fimsFlightschdSeasonDao.findAll();
+	public ResponseDto<List<FimsFlightschdSeasonDto>> getFlightSchdSeason(FimsFlightschdSeasonConditionDto conditions) {
+		List<FimsFlightschdSeason> fimsFlightschdSeasonsList = null;
+		if(!StringUtils.isEmpty(conditions.getStartDate())){
+			Date from = DateUtils.StringToDate(conditions.getStartDate()+"-01-01 00:00:00", "yyyy-MM-dd HH:mm:ss");
+			Date to = DateUtils.StringToDate(conditions.getStartDate()+"-12-31 23:59:59", "yyyy-MM-dd HH:mm:ss");
+			fimsFlightschdSeasonsList = fimsFlightschdSeasonDao.findByStartDateRange(from, to);
+		}else{
+			fimsFlightschdSeasonsList = (List<FimsFlightschdSeason>) fimsFlightschdSeasonDao.findAll();
+		}
 		
 		//转换dto
 		List<FimsFlightschdSeasonDto> fimsFlightschdSeasonsListDto = fimsFlightschdSeasonsList.stream().map(x -> {

src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/FimsFlightschdSeasonDao.java

@@ -1,9 +1,15 @@
 package com.gzzn.omms.adminapi.domain.secondary.dao.basicdata;
 
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 
 import com.gzzn.omms.adminapi.domain.secondary.entity.schedule.FimsFlightschdSeason;
 
 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); 
 }

src/main/java/com/gzzn/omms/adminapi/dto/basicdata/FimsFlightschdSeasonConditionDto.java

@@ -0,0 +1,22 @@
+package com.gzzn.omms.adminapi.dto.basicdata;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel(value="航班季度计划查询条件",description="航班季度计划查询条件")
+public class FimsFlightschdSeasonConditionDto {
+
+	
+
+	@ApiModelProperty(value="航班季度(某一年的)",example="2018-10-31")
+	private String startDate;
+
+	public String getStartDate() {
+		return startDate;
+	}
+
+	public void setStartDate(String startDate) {
+		this.startDate = startDate;
+	}
+	
+}