diff --git a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java index a11eb94..300b16e 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java @@ -62,7 +62,6 @@ 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); @@ -73,10 +72,13 @@ public class CtrCntrlQueryRepository{ 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.cntrlEndDt.before(DateUtils.stringToDate(rq.getEndDate()))); - } + } + 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() + "%")); } @@ -182,7 +184,6 @@ public List listCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSn } if(rq.getStDate().equals(rq.getEndDate())) { - log.info("시작 날짜와 종료 날짜가 동일합니다"); Calendar std = Calendar.getInstance(); std.setTime(DateUtils.stringToDate(rq.getStDate())); std.add(Calendar.DATE, -1);