비행 시뮬레이션 - 검색 조건 수정

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

@@ -61,24 +61,12 @@ public class CtrCntrlQueryRepository{
 		
 		builder.and(qCntrlBasEntity.statusCd.eq("99"));
 		log.debug("Params ===> " +rq.toString());
-		if(rq.getStDate().equals(rq.getEndDate())) {
+		Calendar end = Calendar.getInstance(); 
-			Calendar std = Calendar.getInstance(); 
+		end.setTime(DateUtils.stringToDate(rq.getEndDate()));
-			std.setTime(DateUtils.stringToDate(rq.getStDate()));
+		end.add(Calendar.DATE, 1);
-			std.add(Calendar.DATE, -1);
+		Date endDate = end.getTime();
-			Calendar end = Calendar.getInstance(); 
+		builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate())));
-			end.setTime(DateUtils.stringToDate(rq.getEndDate()));
+		builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate));
-			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())));
-			}
-		else if(rq.getEndDate() != null) {
-			builder.and(qCntrlBasEntity.cntrlStDt.before(DateUtils.stringToDate(rq.getEndDate())));
-			}
 		if(!StringUtils.isEmpty(rq.getSearch1())) {
 			builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%"));
 		}