From 04bf2d7d103105e6f9152116f00e794035629ec4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9E=AC=EC=9A=B0?= <박재우@DESKTOP-EF7ECBO>
Date: Mon, 6 Feb 2023 13:25:36 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EC=A0=9C=20-=20=EC=BF=BC=EB=A6=AC=20?=
 =?UTF-8?q?=EC=B5=9C=EC=A0=81=ED=99=94=20=ED=9B=84=20planSno=EB=A1=9C=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20=EC=9C=A0=ED=9A=A8=ED=95=9C=20?=
 =?UTF-8?q?=EA=B0=92=EC=9D=B8=EC=A7=80=20=EC=B2=B4=ED=81=AC=ED=95=98?=
 =?UTF-8?q?=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ctr/cntrl/service/CtrCntrlService.java    |  4 +++-
 .../ctr/CtrCntrlQueryRepository.java          | 23 +++++++++++++++++++
 .../flt/FltPlanCtrCntrlRelRepository.java     |  4 +++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java
index 04f0255..d1f94eb 100644
--- a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java
+++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java
@@ -270,7 +270,9 @@ public class CtrCntrlService {
 			String idntfNum = cntrlBasRepository.getIdntfNum(cntrlId);
 			CtrCntrlHstry hisControl = query.getWarnHstryList(cntrlId);
 
-			int planSno = relRepository.getPlanSno(idntfNum);
+			int planSno = relRepository.getPlanSno(idntfNum).orElse(0);
+			if(query.checkPlanSno(planSno) < 1) return null;
+			
 			FltPlanArea planAreaData = query.getPlanData(planSno);
 			
 			List<FltPlanAreaCoord> coordList = planCoordRepository.getCoordinate(planAreaData.getPlanAreaSno());
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 b1b9665..0dac8d4 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
@@ -1222,7 +1222,30 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
 				.fetchFirst();
 		
 		return result;
+	}
+	
+	public long checkPlanSno(int planSno) {
+		QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
 		
+		BooleanBuilder builder = new BooleanBuilder();
+		Calendar end = Calendar.getInstance();
+		Date now = DateUtils.nowDate();
+		end.setTime(now);
+		Date endDate = end.getTime();
+		builder.and(qFltPlanBas.schFltStDt.loe(now));
+		builder.and(qFltPlanBas.schFltEndDt.goe(now));
+
+		builder.and(qFltPlanBas.planSno.eq(planSno));
+		
+		long result = 
+				query.select(Projections.bean(FltPlanBas.class,
+						qFltPlanBas.planSno
+						))
+						.from(qFltPlanBas)
+				.where(builder)
+				.fetchCount();
+		
+		return result;
 	}
 	
 	/**
diff --git a/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanCtrCntrlRelRepository.java b/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanCtrCntrlRelRepository.java
index 460ff04..f32cc5c 100644
--- a/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanCtrCntrlRelRepository.java
+++ b/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanCtrCntrlRelRepository.java
@@ -1,6 +1,8 @@
 package com.palnet.biz.jpa.repository.flt;
 
 
+import java.util.Optional;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -12,5 +14,5 @@ public interface FltPlanCtrCntrlRelRepository extends JpaRepository<FltPlanCtrCn
 	@Query(value = " select PLAN_SNO from FLT_PLAN_CTR_CNTRL_REL"
 			+ " where IDNTF_NUM = :idntfNum "
 			+ " order by PLAN_SNO desc limit 1 ", nativeQuery = true )
-	int getPlanSno(@Param("idntfNum") String idntfNum);
+	Optional<Integer> getPlanSno(@Param("idntfNum") String idntfNum);
 }