비행 이력 현황 , 비행 시뮬레이션 기록 조회 - 검색조건의 날짜를 당일로 설정시 검색 안되는 버그 수정 , 정렬기준 수정

src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java

@@ -41,7 +41,6 @@ public class AnlsHstryController {
 		List<AnlsHstryRsModel> result = null;
 		
 		log.debug("JSON>>>>>>>>" , JsonUtils.toJson(rq));
-		
 		log.debug("Param" + rq.getStDate() + "::" + rq.getEndDate());
 		
 		//입력값 검증
@@ -86,7 +85,6 @@ public class AnlsHstryController {
 	@GetMapping(value = "/log/{id}")
 	public ResponseEntity<? extends BasicResponse> log(@PathVariable String id) {
 		List<AnlsHstryDetailModel> result = null;
-		
         try {
         	result = service.hstryList(id);
 			

src/main/java/com/palnet/biz/api/anls/smlt/controller/AnlsSmltController.java

@@ -45,6 +45,7 @@ public class AnlsSmltController {
 		List<AnlsHstryModel> result = null;
 		
 		log.debug("JSON>>>>>>>>" , JsonUtils.toJson(rq));
+		log.info("test");
 		log.debug("Param" + rq.getStDate() + "::" + rq.getEndDate());
 		
 		//입력값 검증

src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java

@@ -1,6 +1,8 @@
 package com.palnet.biz.jpa.repository.ctr;
 
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrGroupModel;
@@ -59,11 +61,22 @@ public class CtrCntrlQueryRepository{
 		
 		builder.and(qCntrlBasEntity.statusCd.eq("99"));
 		log.debug("Params ===> " +rq.toString());
-		
-		
+		if(rq.getStDate().equals(rq.getEndDate())) {
+			log.info("시작 날짜와 종료 날짜가 동일합니다");
+			Calendar std = Calendar.getInstance(); 
+			std.setTime(DateUtils.stringToDate(rq.getStDate()));
+			std.add(Calendar.DATE, -1);
+			Calendar end = Calendar.getInstance(); 
+			end.setTime(DateUtils.stringToDate(rq.getEndDate()));
+			end.add(Calendar.DATE, 1);
+			Date stDate = std.getTime();
+			Date endDate = end.getTime();
+			builder.and(qCntrlBasEntity.cntrlStDt.after(stDate));
+			builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate));
+		} else {
 		builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate())));
-		builder.and(qCntrlBasEntity.cntrlStDt.before(DateUtils.stringToDate(rq.getEndDate())));
-		
+		builder.and(qCntrlBasEntity.cntrlEndDt.before(DateUtils.stringToDate(rq.getEndDate())));
+		}
 		if(!StringUtils.isEmpty(rq.getSearch1())) {
 			builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%"));
 		}
@@ -114,7 +127,7 @@ public class CtrCntrlQueryRepository{
 				.leftJoin(qPtyCstmrGroupEntity)
 				.on(qFltPlanBasEntity.groupId.eq(qPtyCstmrGroupEntity.groupId))
 				.where(builder)
-				.orderBy(qCntrlBasEntity.cntrlStDt.desc())
+				.orderBy(qCntrlBasEntity.cntrlStDt.asc())
 				.fetch();
 		
 		for(AnlsHstryModel model: queryList) {
@@ -167,10 +180,24 @@ public List<AnlsHstryRsModel> listCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSn
 		} else {
 			builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId()));
 		}
-		if(rq.getStDate() != null) {
+		
+		if(rq.getStDate().equals(rq.getEndDate())) {
+			log.info("시작 날짜와 종료 날짜가 동일합니다");
+			Calendar std = Calendar.getInstance(); 
+			std.setTime(DateUtils.stringToDate(rq.getStDate()));
+			std.add(Calendar.DATE, -1);
+			Calendar end = Calendar.getInstance(); 
+			end.setTime(DateUtils.stringToDate(rq.getEndDate()));
+			end.add(Calendar.DATE, 1);
+			Date stDate = std.getTime();
+			Date endDate = end.getTime();
+			builder.and(qCntrlBasEntity.cntrlStDt.after(stDate));
+			builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate));
+		} 
+		else if (rq.getStDate() != null) {
 			builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate())));
 			}
-		if(rq.getEndDate() != null) {
+		else if(rq.getEndDate() != null) {
 			builder.and(qCntrlBasEntity.cntrlStDt.before(DateUtils.stringToDate(rq.getEndDate())));
 			}
 		if(!StringUtils.isEmpty(rq.getSearch1())) {