비행 계획 목록 - 검색 조건 수정

src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java

@@ -2,6 +2,7 @@ package com.palnet.biz.jpa.repository.flt;
 
 import com.palnet.biz.api.bas.flight.model.*;
 import com.palnet.biz.jpa.entity.*;
+import com.palnet.comn.utils.DateUtils;
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.group.GroupBy;
 import com.querydsl.core.types.Predicate;
@@ -12,6 +13,7 @@ import lombok.extern.log4j.Log4j2;
 
 import org.springframework.stereotype.Repository;
 
+
 import java.util.List;
 
 @Log4j2
@@ -41,12 +43,9 @@ public class FltPlanQueryRepository {
         	}
         }
 
-        if (rq.getSchFltEndDt() != null) {
 		builder.and(bas.schFltStDt.goe(rq.getSchFltStDt()));
-        }
+		builder.and(bas.schFltStDt.before(rq.getSchFltEndDt()));
-        if (rq.getSchFltStDt() != null) {
+
-            builder.and(bas.schFltEndDt.loe(rq.getSchFltEndDt()));
-        }
 //        if ("Y".equals(rq.getAprvlYn()) || "N".equals(rq.getAprvlYn())) {
 //            builder.and(bas.aprvlYn.eq(rq.getAprvlYn()));
 //        }