From c15090b4cfcd2e3385d76c7024e5898c175d4b28 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Tue, 7 Nov 2023 17:48:46 +0900
Subject: [PATCH] =?UTF-8?q?2023-11-07=2017:48=20=EC=88=99=EB=B0=95?=
 =?UTF-8?q?=EC=8B=A0=EC=B2=AD=20=EB=8F=99=EC=9D=BC=EB=82=A0=EC=A7=9C=20?=
 =?UTF-8?q?=EB=B6=88=EA=B0=80=EB=8A=A5=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/VEAcmdtAplctService.java          |  3 ++
 .../service/impl/VEAcmdtAplctDAO.java         |  4 ++
 .../service/impl/VEAcmdtAplctServiceImpl.java |  4 ++
 .../asgnmInfo/web/VEAsgnmController.java      |  2 +-
 .../ve/asgnm/VEAcmdtAplct_SQL_Tibero.xml      | 52 +++++++++++++++++++
 5 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAcmdtAplctService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAcmdtAplctService.java
index c2adfa53..bed08257 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAcmdtAplctService.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAcmdtAplctService.java
@@ -15,6 +15,9 @@ public interface VEAcmdtAplctService {
 	
 	VEInstrFeeAcmdtVO selectDetailByUser_r3(VEInstrFeeAcmdtVO paramVO) throws Exception;
 	
+	//상위 쿼리 대체
+	VEInstrFeeAcmdtVO selectDetailByUser_r3_new(VEInstrFeeAcmdtVO paramVO) throws Exception;
+	
 	VEInstrFeeAcmdtVO selectDcmdtAplctYesterday(VEInstrFeeAcmdtVO paramVO) throws Exception;
 	
 	
diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctDAO.java
index 03976e43..0afd3537 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctDAO.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctDAO.java
@@ -46,6 +46,10 @@ public class VEAcmdtAplctDAO extends EgovAbstractDAO {
 	public VEInstrFeeAcmdtVO selectDetailByUser_r3(VEInstrFeeAcmdtVO paramVO) throws Exception {
 		return (VEInstrFeeAcmdtVO) select("VEAcmdtAplctDAO.selectDetailByUser_r3", paramVO);
 	}
+
+	public VEInstrFeeAcmdtVO selectDetailByUser_r3_new(VEInstrFeeAcmdtVO paramVO) throws Exception {
+		return (VEInstrFeeAcmdtVO) select("VEAcmdtAplctDAO.selectDetailByUser_r3_new", paramVO);
+	}
 	
 	public VEInstrFeeAcmdtVO selectDcmdtAplctYesterday(VEInstrFeeAcmdtVO paramVO) throws Exception {
 		return (VEInstrFeeAcmdtVO) select("VEAcmdtAplctDAO.selectDcmdtAplctYesterday", paramVO);
diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctServiceImpl.java
index 524714f3..1dc90e61 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctServiceImpl.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctServiceImpl.java
@@ -56,6 +56,10 @@ public class VEAcmdtAplctServiceImpl implements VEAcmdtAplctService {
 		return vEAcmdtAplctDAO.selectDetailByUser_r3(paramVO);
 	}	
 	
+	public VEInstrFeeAcmdtVO selectDetailByUser_r3_new(VEInstrFeeAcmdtVO paramVO) throws Exception {
+		return vEAcmdtAplctDAO.selectDetailByUser_r3_new(paramVO);
+	}	
+	
 	@Override
 	public VEInstrFeeAcmdtVO selectDcmdtAplctYesterday(VEInstrFeeAcmdtVO paramVO) throws Exception {
 		return vEAcmdtAplctDAO.selectDcmdtAplctYesterday(paramVO);
diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java
index c74b31dd..e2f486e0 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java
@@ -496,7 +496,7 @@ public class VEAsgnmController {
 				//=== 교육 key로만 select해서 진행
 //				acmdtAplct = vEAcmdtAplctService.selectDetailByUser(acmdtAplct);
 				//acmdtAplct = vEAcmdtAplctService.selectDetailByUser_r2(acmdtAplct);
-				acmdtAplct = vEAcmdtAplctService.selectDetailByUser_r3(acmdtAplct);
+				acmdtAplct = vEAcmdtAplctService.selectDetailByUser_r3_new(acmdtAplct);
 				
 				
 				
diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Tibero.xml
index 1749a317..aaa0ec12 100644
--- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Tibero.xml
@@ -198,6 +198,58 @@
 			
 			
 	</select>
+	
+	<select id="VEAcmdtAplctDAO.selectDetailByUser_r3_new" parameterClass="VEInstrFeeAcmdtVO" resultClass="VEInstrFeeAcmdtVO">
+			/*	VEAcmdtAplctDAO.selectDetailByUser_r3_new	*/
+			SELECT bb.aprvlCd
+				, bb.aplctCn
+				, bb.acmdtFee
+				, bb.acmdtAplctOrd
+							
+			FROM (
+					SELECT a.EDU_HOPE_DT, b.USER_ID  
+					FROM ve_edu_chasi a
+						, ve_edu_chasi_instr_asgnm b
+					WHERE    1                 =1
+					        AND      a.edu_aplct_ord = #eduAplctOrd#
+					        AND      a.edu_chasi_ord = #eduChasiOrd# 
+					        AND      a.edu_aplct_ord = b.edu_aplct_ord
+					        AND      a.edu_chasi_ord = b.edu_chasi_ord   
+					        AND b.asgnm_aprvl_cd='30'
+				)aa
+				,
+				(
+					SELECT 
+					
+							b.EDU_HOPE_DT, c.USER_ID
+							, a.acmdt_aplct_ord 
+							
+							, a.aprvl_cd        AS aprvlCd 
+							, a.aplct_cn        AS aplctCn 
+							, a.acmdt_fee       AS acmdtFee 
+							, a.acmdt_aplct_ord AS AcmdtAplctOrd		
+							
+					FROM ve_acmdt_aplct a
+						, ve_edu_chasi b
+						, ve_edu_chasi_instr_asgnm c
+					WHERE    1                 =1
+							AND NVL(a.APRVL_CD,'10') ='10'
+							AND a.SBMT_YN ='Y'
+							AND a.USE_YN ='Y'
+					        AND      a.edu_aplct_ord = b.edu_aplct_ord
+					        AND      a.edu_chasi_ord = b.edu_chasi_ord   	
+					        
+					        AND      b.edu_aplct_ord = c.edu_aplct_ord
+					        AND      b.edu_chasi_ord = c.edu_chasi_ord   	        	
+				)bb
+			WHERE 1=1
+				AND aa.edu_hope_dt=bb.edu_hope_dt
+				AND aa.user_id=bb.user_id
+			ORDER BY bb.acmdtAplctOrd desc
+			limit 1
+			
+			
+	</select>	
 		
 	<select id="VEAcmdtAplctDAO.selectDcmdtAplctYesterday" parameterClass="VEInstrFeeAcmdtVO" resultClass="VEInstrFeeAcmdtVO">
 		SELECT