From 258c5a4d6b7a6d7523bf38dd6ca4bd298c202d17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lkd9125=28=EC=9D=B4=EA=B2=BD=EB=8F=84=29?=
 <lkd9125@naver.com>
Date: Fri, 17 Nov 2023 11:06:39 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=84=EC=A0=95=EC=83=81=EC=83=81=ED=99=A9?=
 =?UTF-8?q?=ED=86=B5=EA=B3=84=20=EC=83=81=EB=8B=A8=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=ED=84=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ctr/CtrCntrlWarnLogQueryRepository.java   | 29 +++++++------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlWarnLogQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlWarnLogQueryRepository.java
index a3cd6d80..fd568cae 100644
--- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlWarnLogQueryRepository.java
+++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlWarnLogQueryRepository.java
@@ -53,13 +53,12 @@ public class CtrCntrlWarnLogQueryRepository {
 		List<FlightStcsValueModel> queryResult = query
 			.select(
 				Projections.bean(FlightStcsValueModel.class,
-					qCtrCntrlWarnLog.idntfNum.as("name"), // 결과 객체의 프로퍼티 이름을 지정
-					qCtrCntrlWarnLog.cntrlId.countDistinct().as("value") // 결과 객체의 프로퍼티 이름을 지정
-				)
-			)
+						qCtrCntrlWarnLog.idntfNum.as("name")
+					)
+				)					
 			.from(qCtrCntrlWarnLog)
 			.leftJoin(qFltPlanCtrCntrlRel)
-				.on(qFltPlanCtrCntrlRel.cntrlId.eq(qCtrCntrlWarnLog.cntrlId))
+				.on(qCtrCntrlWarnLog.cntrlId.eq(qFltPlanCtrCntrlRel.cntrlId))
 			.leftJoin(qFltPlanBas)
 				.on(qFltPlanCtrCntrlRel.planSno.eq(qFltPlanBas.planSno))
 			.where(builder)
@@ -92,7 +91,7 @@ public class CtrCntrlWarnLogQueryRepository {
 	}
 
 
-	private String getWarnDay(String idntfNum, String cate, boolean authCheck, String serviceType){
+	private Long getWarnDay(String idntfNum, String cate, boolean authCheck, String serviceType){
 		QCtrCntrlWarnLog bas = QCtrCntrlWarnLog.ctrCntrlWarnLog;
 		QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel;
 		QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
@@ -108,10 +107,8 @@ public class CtrCntrlWarnLogQueryRepository {
 		.eq(LocalDate.now().toString()));
 
 		return query
-			.select(
-				Projections.bean(String.class,					
-					bas.cntrlId.countDistinct() // 결과 객체의 프로퍼티 이름을 지정
-				)
+			.select(								
+				bas.cntrlId.countDistinct() // 결과 객체의 프로퍼티 이름을 지정				
 			)
 			.from(bas)
 			.leftJoin(qFltPlanCtrCntrlRel)
@@ -122,7 +119,7 @@ public class CtrCntrlWarnLogQueryRepository {
             .fetchOne();
 	}
 
-	private String getWarnMonth(String idntfNum, String cate, boolean authCheck, String serviceType){
+	private Long getWarnMonth(String idntfNum, String cate, boolean authCheck, String serviceType){
 		QCtrCntrlWarnLog bas = QCtrCntrlWarnLog.ctrCntrlWarnLog;
 		QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel;
 		QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
@@ -137,9 +134,7 @@ public class CtrCntrlWarnLogQueryRepository {
 
 		return query
 			.select(
-				Projections.bean(String.class,					
-					bas.cntrlId.countDistinct() // 결과 객체의 프로퍼티 이름을 지정
-				)
+				bas.cntrlId.countDistinct() // 결과 객체의 프로퍼티 이름을 지정
 			)
 			.from(bas)
 			.leftJoin(qFltPlanCtrCntrlRel)
@@ -150,7 +145,7 @@ public class CtrCntrlWarnLogQueryRepository {
             .fetchOne();
 	}
 
-	private String getWarnYear(String idntfNum, String cate, boolean authCheck, String serviceType){
+	private Long getWarnYear(String idntfNum, String cate, boolean authCheck, String serviceType){
 		QCtrCntrlWarnLog bas = QCtrCntrlWarnLog.ctrCntrlWarnLog;
 		QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel;
 		QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
@@ -165,9 +160,7 @@ public class CtrCntrlWarnLogQueryRepository {
 
 		return query
 			.select(
-				Projections.bean(String.class,					
-					bas.cntrlId.countDistinct() // 결과 객체의 프로퍼티 이름을 지정
-				)
+				bas.cntrlId.countDistinct() // 결과 객체의 프로퍼티 이름을 지정
 			)
 			.from(bas)
 			.leftJoin(qFltPlanCtrCntrlRel)