From 08c7c58d0ead94ff7ac68169acffb3f20a94ebf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?qkr7828=28=EB=B0=95=EC=9E=AC=EC=9A=B0=29?=
 <qkr7828@palnet.co.kr>
Date: Thu, 12 Oct 2023 15:45:55 +0900
Subject: [PATCH] detail merge

---
 .../api/ctr/cntrl/model/CtrCntrlDtlModel.java |  3 ++
 .../ctr/CtrCntrlQueryRepository.java          | 39 +++++++++++--------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/pav-server/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlDtlModel.java b/pav-server/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlDtlModel.java
index efb1ae5..11a4857 100644
--- a/pav-server/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlDtlModel.java
+++ b/pav-server/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlDtlModel.java
@@ -25,6 +25,9 @@ private String messageTypeCd;
 	private String ownerNm;
 	private String hpno;
 	private String telno;
+	private String corpRegYn;
+	private String aprvlYn;
+	private Instant aprvlDt;
 	
 	private String stAreaNm;
 	
diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java
index 8d3bb98..a0f2baf 100644
--- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java
+++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java
@@ -1251,33 +1251,40 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
 	 */
 	public CtrCntrlDtlModel detailCntrl(String controlId) {
 		QCtrCntrlBas ctr = QCtrCntrlBas.ctrCntrlBas;
-		QComArcrftBas bas = QComArcrftBas.comArcrftBas;
+		QComArcrftBas cBas = QComArcrftBas.comArcrftBas;
 		QComIdntfBas own = QComIdntfBas.comIdntfBas;
+		QFltPlanCtrCntrlRel rel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel;
+		QFltPlanBas fBas = QFltPlanBas.fltPlanBas;
 		
 		CtrCntrlDtlModel result = query.select(Projections.bean(CtrCntrlDtlModel.class , 
 				ctr.cntrlId ,
 				ctr.cntrlStDt ,
 				ctr.cntrlEndDt ,
-				bas.arcrftSno ,
-				bas.prdctNum ,
-				bas.arcrftTypeCd,
-				bas.arcrftModelNm ,
-				bas.prdctCmpnNm ,
-				bas.wghtTypeCd ,
-				bas.imageUrl , 
-				bas.cameraYn , 
-				bas.insrncYn , 
+				cBas.arcrftSno ,
+				cBas.prdctNum ,
+				cBas.arcrftTypeCd,
+				cBas.arcrftModelNm ,
+				cBas.prdctCmpnNm ,
+				cBas.wghtTypeCd ,
+				cBas.imageUrl , 
+				cBas.cameraYn , 
+				cBas.insrncYn , 
 				own.ownerNm , 
-				own.hpno 
+				own.hpno ,
+				fBas.corpRegYn ,
+				fBas.aprvlDt ,
+				fBas.aprvlYn
 				))
 				.from(ctr)
-				.leftJoin(own)
-				.on(ctr.idntfNum.eq(own.idntfNum))
-				.leftJoin(bas)
-				.on(own.arcrftSno.eq(bas.arcrftSno))
+				.leftJoin(cBas)
+				.on(own.arcrftSno.eq(cBas.arcrftSno))
+				.leftJoin(rel)
+				.on(ctr.cntrlId.eq(rel.cntrlId))
+				.leftJoin(fBas)
+				.on(rel.planSno.eq(fBas.planSno))
 				.where(ctr.cntrlId.eq(controlId))
 				
-				.where(bas.useYn.eq("Y"))
+				.where(cBas.useYn.eq("Y"))
 //				.where(ctr.objectId.ne("none"))
 				.fetchFirst();