diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/dos/DosFltPlanQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/dos/DosFltPlanQueryRepository.java index 7980954f..a0717025 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/dos/DosFltPlanQueryRepository.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/dos/DosFltPlanQueryRepository.java @@ -22,11 +22,14 @@ public class DosFltPlanQueryRepository { QDosFltPlanBas bas = QDosFltPlanBas.dosFltPlanBas; BooleanBuilder builder = new BooleanBuilder(); + if(rq.getSearchEndDt() != null) { - builder.and(bas.schFltStDt.loe(rq.getSearchEndDt())); +// builder.and(bas.schFltStDt.loe(rq.getSearchEndDt())); + builder.and(bas.applyDt.loe(rq.getSearchEndDt())); } if(rq.getSearchStDt() != null) { - builder.and(bas.schFltEndDt.goe(rq.getSearchStDt())); +// builder.and(bas.schFltEndDt.goe(rq.getSearchStDt())); + builder.and(bas.applyDt.goe(rq.getSearchStDt())); } if(rq.getApplyNo() != null) { builder.and(bas.applyNo.eq(rq.getApplyNo()));