From 61648ab9b2e6902925962ede5ab5dbf7bb22f54a 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: Fri, 30 Sep 2022 10:52:35 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=9D=B4=EB=A0=A5=20?=
 =?UTF-8?q?=EA=B2=80=EC=83=89=EC=A1=B0=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

---
 .../ctr/CtrCntrlQueryRepository.java          | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 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 1dac49a..30c7753 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
@@ -1,5 +1,8 @@
 package com.palnet.biz.jpa.repository.ctr;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -44,6 +47,7 @@ import com.querydsl.core.types.dsl.StringTemplate;
 import com.querydsl.jpa.JPAExpressions;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 
+import io.netty.handler.codec.http.multipart.HttpPostRequestDecoder.EndOfDataDecoderException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 
@@ -199,19 +203,15 @@ public class CtrCntrlQueryRepository{
 		QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea;
 		
 		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())));
-		
-		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())));
-		}
+		builder.and(qCntrlBasEntity.cntrlEndDt.loe(endDate));
+
 		
 		if(!StringUtils.isEmpty(rq.getSearch1())) {
 			builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%"));