From 9407d70f194aee86c5d61452c03ef4a759031d53 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Tue, 11 Nov 2025 12:30:07 +0900
Subject: [PATCH] =?UTF-8?q?2025-11-11=2012:29=20=EB=A7=88=EC=9D=B4?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=84=A4=EB=AC=B8=20=EB=85=B8?=
 =?UTF-8?q?=EC=B6=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eduEnd/web/EduEndTngrController.java      |   7 +
 .../ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml | 191 ++++++++----------
 .../WEB-INF/jsp/web/my/myPageDashBoard.jsp    |   1 +
 3 files changed, 96 insertions(+), 103 deletions(-)

diff --git a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java
index 48756cf0..7c0868ac 100644
--- a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java
+++ b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java
@@ -970,7 +970,9 @@ public class EduEndTngrController {
 				System.out.println(a_qustnrQesitmId.length);
 				System.out.println(a_qustnrQesitmId.length);
 				
+				int j = 0;
 				for (int i=0;i<i_chasiSrvyListSize;i++) {
+					String[]	a_answer		=	request.getParameterValues("answer");
 					//String	s_answer		=	request.getParameter("answer_"+Integer.toString(i+1));
 					String	s_responseRadio	=	request.getParameter("resultList["+Integer.toString(i)+"].responseRadio");
 
@@ -985,6 +987,8 @@ public class EduEndTngrController {
 					qustnrRespondInfoVO.setDissatisfied("0");
 					qustnrRespondInfoVO.setVeryDissatisfied("0");
 					
+					qustnrRespondInfoVO.setAnswer("");
+					
 					if ("5".equals(s_responseRadio)) {
 						qustnrRespondInfoVO.setVerySatisfied("1");
 												
@@ -1000,6 +1004,9 @@ public class EduEndTngrController {
 					}else if ("1".equals(s_responseRadio)) {						
 						qustnrRespondInfoVO.setVeryDissatisfied("1");
 						
+					}else {						
+						qustnrRespondInfoVO.setAnswer(a_answer[j]);
+						j=j+1;
 					} 
 					
 					//qustnrRespondInfoVO.setQustnrQesitmId(a_qustnrQesitmId[i]);
diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml
index a33a6238..ab5254e4 100644
--- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml
@@ -1789,15 +1789,27 @@
 			I10.qustnr_tmplat_id AS qustnrTmplatId ,
 			*/	
 			
+			I10.qestnr_id_10 as qestnrId10 ,
+			I20.qestnr_id_20 as qestnrId20 ,
+			I30.qestnr_id_30 as qestnrId30 ,			
+			
+			/*
 			COALESCE(I10.qestnr_id_10, qustnr01.QESTNR_ID_10) AS qestnrId10 ,
 			COALESCE(I20.qestnr_id_20, qustnr01.QESTNR_ID_20) AS qestnrId20 ,
 			COALESCE(I30.qestnr_id_30, qustnr01.QESTNR_ID_30) AS qestnrId30 ,
+			*/
 			
 			/*	답변	정보	*/					
-			
+			/*
 			COALESCE(qustnr01.QESTNR_ID_10_CNT,0) AS qestnrId10Cnt ,
 			COALESCE(qustnr01.QESTNR_ID_20_CNT,0) AS qestnrId20Cnt ,
 			COALESCE(qustnr01.QESTNR_ID_30_CNT,0) AS qestnrId30Cnt ,
+			*/
+			
+			coalesce(I10.qestnr_id_10_cnt, 0) as qestnrId10Cnt ,
+			0 as qestnrId20Cnt ,
+			0 as qestnrId30Cnt ,			
+			
 			a.lctr_div_cd AS lctrDivCd
 						
 		from
@@ -1810,58 +1822,6 @@
 			on a.edu_aplct_ord  = vadi.edu_aplct_ord  
 			and vpap.prcs_aplct_prd_ord = vadi.prcs_aplct_prd_ord 
 			
-		LEFT OUTER JOIN (
-		
-						SELECT 
-									aa.EDU_APLCT_ORD ,
-									aa.prcs_ord,
-									aa.QUSTNR_TMPLAT_ID ,
-									aa.user_id	
-									
-								, max(CASE WHEN bb.site_id_cd = '10' THEN aa.QESTNR_ID END) AS QESTNR_ID_10
-								, max(CASE WHEN bb.site_id_cd = '20' THEN aa.QESTNR_ID END) AS QESTNR_ID_20
-								, max(CASE WHEN bb.site_id_cd = '30' THEN aa.QESTNR_ID END) AS QESTNR_ID_30						
-						
-								, SUM(CASE WHEN bb.site_id_cd = '10' THEN 1 ELSE 0 END) AS QESTNR_ID_10_CNT
-								, SUM(CASE WHEN bb.site_id_cd = '20' THEN 1 ELSE 0 END) AS QESTNR_ID_20_CNT
-								, SUM(CASE WHEN bb.site_id_cd = '30' THEN 1 ELSE 0 END) AS QESTNR_ID_30_CNT					
-								
-						FROM (
-							SELECT
-									a.EDU_APLCT_ORD ,
-									a.prcs_ord,
-									b.QUSTNR_TMPLAT_ID ,
-									b.QESTNR_ID
-									, a.user_id
-						
-							FROM
-									ve_edu_aplct a ,
-									LETTNQESTNRRSLTDETAIL b
-							WHERE
-									1 = 1
-								AND a.edu_aplct_ord = b.edu_aplct_ord		
-								AND (b.EDU_CHASI_ORD IS NULL or b.EDU_CHASI_ORD = '')
-								AND a.user_id=#userId#
-						
-							)aa
-							, lettnqestnrinfo bb
-						WHERE <!-- aa.qustnr_tmplat_id=bb.qustnr_tmplat_id	
-							AND  -->aa.qestnr_id=bb.qestnr_id
-						
-							GROUP BY 
-									aa.EDU_APLCT_ORD ,
-									aa.prcs_ord,
-									aa.QUSTNR_TMPLAT_ID ,
-									aa.user_id		
-		
-		)	qustnr01
-		on(
-		
-		a.edu_aplct_ord 	= qustnr01.edu_Aplct_Ord
-		AND a.PRCS_ORD 		= qustnr01.prcs_Ord
-		
-		)			
-			
 			
 		LEFT OUTER JOIN (
 		/* 현재 진행가능한 설문 정보(기본, 선생님, 강사) 여러개가 있는 경우는 최근 등록된 설문 정보를 가져온다.*/
@@ -1888,60 +1848,85 @@
 			/*
 			SELECT site_id, min(qestnr_id_10) as qestnr_id_10
 			*/
-			SELECT	a0.prcs_ord, a0.site_id, a0.qestnr_id_10
-			FROM (
-				select
-					b0.prcs_ord,
-					a.QUSTNR_TMPLAT_ID ,
-					a.SITE_ID ,
-					/* (CASE WHEN a.STTUS = '1' THEN a.QESTNR_ID END) AS QESTNR_ID_10 */
-					(case
-						when a.STTUS = '1' then a.QESTNR_ID
-						else a.QESTNR_ID
-					end) as QESTNR_ID_10
-				from
-					LETTNQESTNRINFO a
-					, (
-					
-					select
-						a.prcs_ord ,
-						b.edu_strt_pnttm
-						, b.lctr_div_cd
-					from
-						ve_edu_aplct a
-						, ve_prcs_aplct_prd b
-					where
-						1 = 1
-						and a.user_id = #userId#
-						and a.prcs_ord=b.prcs_aplct_prd_ord		
-					
-					)b0
-				where
-					a.SITE_ID in ('60', '70', '80')/* 각 개별적인 분류를 볼때 a.SITE_ID = siteId */
-					and a.site_id=b0.lctr_div_cd
-					/*
-			           AND a.SITE_ID_CD IN ('10') */
-					/*
-			           AND a.STTUS IN ('1') */
-					
-						and replace(b0.edu_strt_pnttm,'.','') between coalesce(a.qustnr_bgnde,
-						'2000.01.01')
-			           and coalesce(a.qustnr_endde,
-						'9999.12.31')
-					
-					order by
-						coalesce(a.qustnr_bgnde,
-						'9999.12.31')			
-					)a0
-					/*
-			group by a0.site_id
-			*/
-			GROUP BY a0.prcs_ord, a0.site_id, a0.qestnr_id_10
-								
+			
+			select a00.prcs_ord,
+					a00.site_id,
+					a00.qestnr_id_10,
+					b00.cnt as qestnr_id_10_cnt, 
+					a00.edu_aplct_ord
+			from (			
+			
+					SELECT	a0.prcs_ord, a0.site_id, a0.qestnr_id_10, a0.edu_aplct_ord
+					FROM (
+						select
+							b0.prcs_ord,
+							a.QUSTNR_TMPLAT_ID ,
+							a.SITE_ID ,
+							/* (CASE WHEN a.STTUS = '1' THEN a.QESTNR_ID END) AS QESTNR_ID_10 */
+							(case
+								when a.STTUS = '1' then a.QESTNR_ID
+								else a.QESTNR_ID
+							end) as QESTNR_ID_10, 
+							b0.edu_aplct_ord
+						from
+							LETTNQESTNRINFO a
+							, (
+							
+							select
+								a.prcs_ord ,
+								b.edu_strt_pnttm , 
+								b.lctr_div_cd , 
+								a.edu_aplct_ord
+							from
+								ve_edu_aplct a
+								, ve_prcs_aplct_prd b
+							where
+								1 = 1
+								and a.user_id = #userId#
+								and a.prcs_ord=b.prcs_aplct_prd_ord		
+							
+							)b0
+						where
+							a.SITE_ID in ('60', '70', '80')/* 각 개별적인 분류를 볼때 a.SITE_ID = siteId */
+							and a.site_id=b0.lctr_div_cd
+							/*
+					           AND a.SITE_ID_CD IN ('10') */
+							/*
+					           AND a.STTUS IN ('1') */
+							
+								and replace(b0.edu_strt_pnttm,'.','') between coalesce(a.qustnr_bgnde,
+								'2000.01.01')
+					           and coalesce(a.qustnr_endde,
+								'9999.12.31')
+							
+							order by
+								coalesce(a.qustnr_bgnde,
+								'9999.12.31')			
+							)a0
+							/*
+					group by a0.site_id
+					*/
+					GROUP BY a0.prcs_ord, a0.site_id, a0.qestnr_id_10, a0.edu_aplct_ord
+				)a00
+		
+		
+				left outer join 
+				(				
+				
+					select b.edu_aplct_ord, b.qestnr_id, count(*) cnt
+					from LETTNQESTNRRSLTDETAIL b
+					where b.frst_register_id =#userId#
+					group by b.edu_aplct_ord, b.qestnr_id 				
+				
+				)b00
+				on(a00.qestnr_id_10=b00.qestnr_id
+				and a00.edu_aplct_ord=b00.edu_aplct_ord
+				)								
 								
 		) I10 ON
 		(1 = 1 and a.lctr_div_cd = I10.site_id
 		and a.prcs_ord = I10.prcs_ord
+		and a.edu_aplct_ord = I10.edu_aplct_ord
 		)			
 		
 		LEFT OUTER JOIN (
diff --git a/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp b/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp
index e74d939b..29ed7939 100644
--- a/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp
@@ -256,6 +256,7 @@
 							</c:if>
 						</td>
 						<td>
+						
 							<c:choose>
 								
 								<c:when test="${list.aprvlCd eq 60 and list.qestRsltExists}">