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 a0717025..571e2a52 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 @@ -23,20 +23,19 @@ public class DosFltPlanQueryRepository { BooleanBuilder builder = new BooleanBuilder(); - if(rq.getSearchEndDt() != null) { -// 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.applyDt.goe(rq.getSearchStDt())); } + if(rq.getSearchEndDt() != null) { + builder.and(bas.applyDt.loe(rq.getSearchEndDt())); + } if(rq.getApplyNo() != null) { builder.and(bas.applyNo.eq(rq.getApplyNo())); } return query.selectFrom(bas) .where(builder) + .orderBy(bas.applyNo.desc()) .fetch(); } }