From 4eae482b04870a3747744fc93f04bff8563ec62e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=9E=AC=EC=9A=B0?= <박재우@DESKTOP-EF7ECBO> Date: Thu, 22 Sep 2022 10:29:25 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=9D=B4=EB=A0=A5=20?= =?UTF-8?q?=ED=98=84=ED=99=A9=20=EB=AA=A9=EB=A1=9D=20-=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=EC=A1=B0=EA=B1=B4=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/ctr/CtrCntrlQueryRepository.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) 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 300b16e..3290def 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 @@ -183,24 +183,13 @@ public List listCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSn builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId())); } - if(rq.getStDate().equals(rq.getEndDate())) { - Calendar std = Calendar.getInstance(); - std.setTime(DateUtils.stringToDate(rq.getStDate())); - std.add(Calendar.DATE, -1); Calendar end = Calendar.getInstance(); end.setTime(DateUtils.stringToDate(rq.getEndDate())); 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()))); - } + builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate)); + if(!StringUtils.isEmpty(rq.getSearch1())) { builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%")); }