From e72cfda5e1d30bc6bf74b822680f9a3113381b25 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Fri, 23 Feb 2024 13:59:16 +0900
Subject: [PATCH] =?UTF-8?q?2024-02-23=2013:58=20=EC=9E=90=EB=8F=99=20?=
 =?UTF-8?q?=EB=B0=B0=EC=A0=95=20=EA=B1=B0=EC=A3=BC=EC=A7=80=20=EA=B4=80?=
 =?UTF-8?q?=EB=A0=A8=20=EC=8B=9C/=EA=B5=AC/=EA=B5=B0=EA=B9=8C=EC=A7=80=20?=
 =?UTF-8?q?=EC=A0=81=EC=9A=A9=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ve/edu/VEAutoAsgnm_MIX_SQL_Tibero.xml     | 58 ++++++++++++-------
 1 file changed, 38 insertions(+), 20 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEAutoAsgnm_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEAutoAsgnm_MIX_SQL_Tibero.xml
index a2cacbfb..6fa67c0d 100644
--- a/src/main/resources/egovframework/sqlmap/ve/edu/VEAutoAsgnm_MIX_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEAutoAsgnm_MIX_SQL_Tibero.xml
@@ -382,26 +382,44 @@
 		        	, vea_instr_indvd_mnt_tm bb	/*	강사의 월별 배정가능한 시수	*/
 		        	LEFT OUTER JOIN 
 		        	 (
-		        	 	/*	강사에게 교육이 할당(확정, 반려, 요청전, 요첮우 모두 포함)된 차시수	*/
-		        			SELECT
-		        				d.user_id,        				
-		        				sum(NVL(b.chasi, 0))                     AS instrSumChasi            				
-		                 FROM    ve_edu_aplct a ,
-		                         ve_edu_chasi b
-		                         LEFT OUTER JOIN ve_edu_chasi_instr_asgnm d
-		                         ON     (
-		                                         b.edu_aplct_ord=d.edu_aplct_ord
-		                                 AND     b.edu_chasi_ord=d.edu_chasi_ord
-		                                 )
-		                 WHERE   1                       =1
-		                 AND     a.edu_aplct_ord         =b.edu_aplct_ord
-		                 AND     NVL(A.USE_YN, 'Y')     <![CDATA[ <> ]]> 'N'
-		                 AND     a.LCTR_DIV_CD           = '10'
-		                 AND     a.aprvl_cd              = '60'
-		                 AND     1                       =1
-		                 AND 	b.edu_hope_dt LIKE #yr#||'.'||#eduHopeMnt#||'%'
-		                 AND     a.edu_slct_area_cd      =#eduSlctAreaCd#
-		                 GROUP BY d.user_id
+		        	 	/*	강사에게 교육이 할당(확정, 반려, 요청전, 요첮우 모두 포함)된 차시수(거주지에만)	*/		              
+		              
+							SELECT user_id
+								, sum(NVL(chasi, 0))                     AS instrSumChasi
+							FROM (
+									SELECT
+										d.user_id
+										,a.addr
+										,b.chasi
+										,e.rsdne
+										,regexp_substr(rsdne, '[^(]+',1,1) AS instrAddr1
+										,replace(regexp_substr(regexp_substr(rsdne, '[^(]+',1,2), '[^ ]+',1,1),')','')			 AS instrAddr2
+							
+									FROM
+										ve_edu_aplct a ,
+										ve_edu_chasi b
+									LEFT OUTER JOIN ve_edu_chasi_instr_asgnm d ON
+										( b.edu_aplct_ord = d.edu_aplct_ord
+											AND b.edu_chasi_ord = d.edu_chasi_ord )
+											, ve_instr_detail e
+									WHERE
+										1 = 1
+										AND a.edu_aplct_ord = b.edu_aplct_ord
+										AND NVL(A.USE_YN, 'Y') <![CDATA[ <> ]]> 'N'
+										AND a.LCTR_DIV_CD = '10'
+										AND a.aprvl_cd = '60'
+										AND 1 = 1
+						                AND b.edu_hope_dt LIKE #yr#||'.'||#eduHopeMnt#||'%'
+						                AND a.edu_slct_area_cd      =#eduSlctAreaCd#
+										AND d.user_id=e.user_id
+										AND e.use_yn='Y'
+								)aa00
+							WHERE 1=1
+								AND addr LIKE instraddr1||'%'
+								AND addr LIKE '%'||instraddr2||'%'		
+							GROUP BY user_id	              
+		              
+		                 
 		                )aa 
 		                on(
 							aa.user_id=bb.user_id