From 38ba4076eed309793f048159c5487c22afd4b4d7 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:40:57 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=20=EC=8B=9C=EB=AE=AC?=
 =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=85=98=20-=20=EA=B2=80=EC=83=89=20?=
 =?UTF-8?q?=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          | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 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 3290def..b1e14b0 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
@@ -61,24 +61,12 @@ public class CtrCntrlQueryRepository{
 		
 		builder.and(qCntrlBasEntity.statusCd.eq("99"));
 		log.debug("Params ===> " +rq.toString());
-		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())));
-			}
+		Calendar end = Calendar.getInstance(); 
+		end.setTime(DateUtils.stringToDate(rq.getEndDate()));
+		end.add(Calendar.DATE, 1);
+		Date endDate = end.getTime();
+		builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate())));
+		builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate));
 		if(!StringUtils.isEmpty(rq.getSearch1())) {
 			builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%"));
 		}