From 752c5d1174530f442196068cd74ea5856e15de37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?qkr7828=28=EB=B0=95=EC=9E=AC=EC=9A=B0=29?= <박재우@DESKTOP-EF7ECBO> Date: Wed, 28 Sep 2022 10:29:15 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=9D=B4=EB=A0=A5=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=EB=82=A0=EC=A7=9C=EA=B2=80=EC=83=89=EC=A1=B0?= =?UTF-8?q?=EA=B1=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/anls/hstry/service/AnlsHstryService.java | 13 +------------ .../repository/ctr/CtrCntrlQueryRepository.java | 16 +++++++++++----- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java b/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java index 5ec6b19..1bda77c 100644 --- a/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java +++ b/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java @@ -78,19 +78,8 @@ public class AnlsHstryService { ComnPagingRs response = new ComnPagingRs<>(); List returnList = new ArrayList<>(); - //당일만 검색할 시 나오지 않는 오류 방지용으로 끝나는 날짜에 1일 더함 - Calendar end = Calendar.getInstance(); - end.setTime(DateUtils.stringToDate(rq.getEndDate())); - end.add(Calendar.DATE, 1); - Date stDate = DateUtils.stringToDate(rq.getStDate()); - Date endDate = end.getTime(); - + Pageable pageable = PageRequest.of(rq.getPage()-1, rq.getRecord()); - String idntfNum = rq.getSearch1(); - - if(rq.getSearch1() == null) { - idntfNum = ""; - } PageImpl result = query.listCntrlBasRs(rq, userAccount, pageable); 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 d06e6bd..a75ef15 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 @@ -190,13 +190,19 @@ public class CtrCntrlQueryRepository{ BooleanBuilder builder = new BooleanBuilder(); - Calendar end = Calendar.getInstance(); - end.setTime(DateUtils.stringToDate(rq.getEndDate())); - end.add(Calendar.DATE, 1); - Date endDate = end.getTime(); + builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId())); builder.and(qCntrlBasEntity.cntrlStDt.goe(DateUtils.stringToDate(rq.getStDate()))); - builder.and(qCntrlBasEntity.cntrlEndDt.loe(endDate)); + + if(rq.getStDate().equals(rq.getEndDate())) { + Calendar end = Calendar.getInstance(); + end.setTime(DateUtils.stringToDate(rq.getEndDate())); + end.add(Calendar.DATE, 1); + Date endDate = end.getTime(); + builder.and(qCntrlBasEntity.cntrlEndDt.loe(endDate)); + }else { + builder.and(qCntrlBasEntity.cntrlEndDt.loe(DateUtils.stringToDate(rq.getEndDate()))); + } if(!StringUtils.isEmpty(rq.getSearch1())) { builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%"));