2024-01-26 12:30 설문오류 수정

src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java

@@ -116,7 +116,7 @@ public class EgovCryptoUtil {
 		//if (!"".equals(p_vEAQestnrVO.getPhone())) p_vEAQestnrVO.setPhone(this.decrypt(p_vEAQestnrVO.getPhone()));		
 		//if (!"".equals(p_vEAQestnrVO.getEmail())) p_vEAQestnrVO.setEmail(this.decrypt(p_vEAQestnrVO.getEmail()));
 		//if (!"".equals(p_vEAQestnrVO.getInstrNm())) p_vEAQestnrVO.setInstrNm(this.decrypt(p_vEAQestnrVO.getInstrNm()));
-		//if (!"".equals(p_vEAQestnrVO.getUserNm())) p_vEAQestnrVO.setUserNm(this.decrypt(p_vEAQestnrVO.getUserNm()));
+		if (!"".equals(p_vEAQestnrVO.getFrstRegisterNm())) p_vEAQestnrVO.setFrstRegisterNm(this.decrypt(p_vEAQestnrVO.getFrstRegisterNm()));
 		return p_vEAQestnrVO;
 	}
     //////////////////////////////////////////////////

src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml

@@ -903,17 +903,17 @@
 			
 			
 			/*	설문지 정보	*/
-			I.qustnr_tmplat_id AS qustnrTmplatId ,	
+			I10.qustnr_tmplat_id AS qustnrTmplatId ,	
 			
-			NVL(qustnr01.QESTNR_ID_10, i.qestnr_id_10) AS qestnrId10 ,
+			NVL(qustnr01.QESTNR_ID_10, I10.qestnr_id_10) AS qestnrId10 ,
-			NVL(qustnr01.QESTNR_ID_20, i.qestnr_id_20) AS qestnrId20 ,
+			NVL(qustnr01.QESTNR_ID_20, I20.qestnr_id_20) AS qestnrId20 ,
-			NVL(qustnr01.QESTNR_ID_30, i.qestnr_id_30) AS qestnrId30 ,
+			NVL(qustnr01.QESTNR_ID_30, I30.qestnr_id_30) AS qestnrId30 ,
 			
 			/*	답변	정보	*/					
 			
-			qustnr01.QESTNR_ID_10_CNT AS qestnrId10Cnt ,
+			NVL(qustnr01.QESTNR_ID_10_CNT,0) AS qestnrId10Cnt ,
-			qustnr01.QESTNR_ID_20_CNT AS qestnrId20Cnt ,
+			NVL(qustnr01.QESTNR_ID_20_CNT,0) AS qestnrId20Cnt ,
-			qustnr01.QESTNR_ID_30_CNT AS qestnrId30Cnt
+			NVL(qustnr01.QESTNR_ID_30_CNT,0) AS qestnrId30Cnt
 						
 						
 			/*
@@ -999,25 +999,72 @@
 			SELECT
 				a.QUSTNR_TMPLAT_ID ,
 				a.SITE_ID ,
-				max(decode(a.site_id_cd, '10', a.QESTNR_ID)) AS QESTNR_ID_10 ,
+				decode(a.site_id_cd, '10', a.QESTNR_ID) AS QESTNR_ID_10
-				max(decode(a.site_id_cd, '20', a.QESTNR_ID)) AS QESTNR_ID_20 ,
-				max(decode(a.site_id_cd, '30', a.QESTNR_ID)) AS QESTNR_ID_30
 			FROM
 				LETTNQESTNRINFO a
 			WHERE
 				a.SITE_ID = #siteId#
-				AND a.SITE_ID_CD IN ('10', '20', '30')
+				AND a.SITE_ID_CD IN ('10')
 					AND TO_CHAR(SYSDATE,
 					'YYYY.MM.DD') BETWEEN NVL(a.qustnr_bgnde,
 					'2000.01.01')
 		           AND NVL(a.qustnr_endde,
 					'9999.12.31')
+ 			ORDER BY nvl(a.qustnr_bgnde,'9999.12.31')
+			LIMIT 1					
+					/*
 				GROUP BY
 					a.QUSTNR_TMPLAT_ID ,
-					a.SITE_ID 
+					a.SITE_ID
-		) I ON
+					*/ 
+		) I10 ON
 		(1 = 1)			
 			
+		LEFT OUTER JOIN (
+		/* 현재 진행가능한 설문 정보(기본, 선생님, 강사) 여러개가 있는 경우는 최근 등록된 설문 정보를 가져온다.*/
+			SELECT
+				a.QUSTNR_TMPLAT_ID ,
+				a.SITE_ID ,
+				decode(a.site_id_cd, '20', a.QESTNR_ID) AS QESTNR_ID_20
+
+			FROM
+				LETTNQESTNRINFO a
+			WHERE
+				a.SITE_ID = #siteId#
+				AND a.SITE_ID_CD IN ('20')
+					AND TO_CHAR(SYSDATE,
+					'YYYY.MM.DD') BETWEEN NVL(a.qustnr_bgnde,
+					'2000.01.01')
+		           AND NVL(a.qustnr_endde,
+					'9999.12.31')
+ 			ORDER BY nvl(a.qustnr_bgnde,'9999.12.31')
+			LIMIT 1
+		) I20 ON
+		(1 = 1)	
+		
+		LEFT OUTER JOIN (
+		/* 현재 진행가능한 설문 정보(기본, 선생님, 강사) 여러개가 있는 경우는 최근 등록된 설문 정보를 가져온다.*/
+			SELECT
+				a.QUSTNR_TMPLAT_ID ,
+				a.SITE_ID ,
+				decode(a.site_id_cd, '30', a.QESTNR_ID) AS QESTNR_ID_30
+
+			FROM
+				LETTNQESTNRINFO a
+			WHERE
+				a.SITE_ID = #siteId#
+				AND a.SITE_ID_CD IN ('30')
+					AND TO_CHAR(SYSDATE,
+					'YYYY.MM.DD') BETWEEN NVL(a.qustnr_bgnde,
+					'2000.01.01')
+		           AND NVL(a.qustnr_endde,
+					'9999.12.31')
+ 
+ 			ORDER BY nvl(a.qustnr_bgnde,'9999.12.31')
+			LIMIT 1
+ 
+		) I30 ON
+		(1 = 1)						
 			
 		where 
 			a.lctr_div_cd = #lctrDivCd#

src/main/resources/egovframework/sqlmap/ve/qustnr/VEALettnQestnrMIX_SQL_Tibero.xml

@@ -20,7 +20,7 @@
 			, a.qustnr_tmplat_id		qustnrTmplatId
 			, TO_CHAR(a.frst_regist_pnttm,'YYYY-MM-DD')		frstRegistPnttm
 			, a.frst_register_id
-			, (select user_nm from comvnusermaster where esntl_id = a.frst_register_id) frstRegisterNm
+			, (select user_nm from comvnusermaster where esntl_id = a.frst_register_id	LIMIT 1) frstRegisterNm
 			, a.last_updt_pnttm
 			, a.last_updusr_id
 			, a.site_id					siteId

src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp

@@ -346,7 +346,6 @@
 							<c:choose>
 								<c:when test="${list.aprvlCd eq 20 and list.qestRsltExists and list.aplctStateCd ne 10}">
 								<!-- 설문노출대상(승인처리를 받았음(20) && 교육기간이 지났음 list.qestRsltExists=true && 미이수가 아닌것(10) ) -->
-
 									<c:choose>
 										
 										<c:when test="${list.aplctStateCd eq 20 and list.qestnrId10Cnt gt 0}">