2023-12-13 16:52 설문 관리자 화면 수정

src/main/resources/egovframework/sqlmap/let/uat/uap/EgovLoginPolicy_SQL_Tibero.xml

@@ -112,9 +112,9 @@
                    ,#dplctPermAt#
                    ,#lmttAt#
                    ,#userId#
-                   ,now()
+                   ,SYSDATE
                    ,#userId#
-                   ,now())
+                   ,SYSDATE)
         ]]>
     </insert>
 
@@ -125,7 +125,7 @@
                   ,DPLCT_PERM_AT = #dplctPermAt#
                   ,LMTT_AT = #lmttAt#
                   ,LAST_UPDUSR_ID = #userId#
-                  ,LAST_UPDT_PNTTM = now()
+                  ,LAST_UPDT_PNTTM = SYSDATE
              WHERE EMPLYR_ID = #emplyrId#
         ]]>
     </update>
@@ -166,9 +166,15 @@
             	   IP_INFO ipInfo,
 			       IP_DC ipDc,
 			       FRST_REGISTER_ID frstRegisterId,
+			       /*
 			       DATE_FORMAT(FRST_REGIST_PNTTM, '%Y-%m-%d %H:%i:%S') frstRegistPnttm,
+			       */
+			       TO_CHAR(FRST_REGIST_PNTTM, 'YYYY-MM-DD HH24:MI:SS') frstRegistPnttm,
 			       LAST_UPDUSR_ID lastUpdusrId,
+			       /*
 			       DATE_FORMAT(LAST_UPDT_PNTTM, '%Y-%m-%d %H:%i:%S') lastUpdtPnttm
+			       */
+			       TO_CHAR(LAST_UPDT_PNTTM, 'YYYY-MM-DD HH24:MI:SS') lastUpdtPnttm
 			FROM   LETTNLOGINGROUPPOLICY  
             WHERE 1 = 1
             <isNotEmpty property="ipGroupId">
@@ -231,9 +237,16 @@
 				IP_INFO ipInfo,
 				IP_DC ipDc,
 				FRST_REGISTER_ID frstRegisterId,
+				/*
 				DATE_FORMAT(FRST_REGIST_PNTTM, '%Y-%m-%d %H:%i:%S') frstRegistPnttm,
+				*/
+				TO_CHAR(FRST_REGIST_PNTTM, 'YYYY-MM-DD HH24:MI:SS') frstRegistPnttm,
 				LAST_UPDUSR_ID lastUpdusrId,
-				DATE_FORMAT(LAST_UPDT_PNTTM, '%Y-%m-%d %H:%i:%S') lastUpdtPnttm 
+				/*
+				DATE_FORMAT(LAST_UPDT_PNTTM, '%Y-%m-%d %H:%i:%S') lastUpdtPnttm
+				*/
+				TO_CHAR(LAST_UPDT_PNTTM, 'YYYY-MM-DD HH24:MI:SS') lastUpdtPnttm
+				
 				FROM   LETTNLOGINGROUPPOLICY  
             WHERE 1 = 1
     </select>
@@ -270,7 +283,7 @@
        	 	,#ipInfo# 
          	, #ipDc#   
          	, #frstRegisterId#    
-         	, now() 
+         	, SYSDATE 
           )
   	</insert>
     
@@ -286,7 +299,7 @@
                SET IP_INFO = #ipInfo#
                   ,IP_DC  = #ipDc#
                   ,LAST_UPDUSR_ID = #lastUpdusrId#
-                  ,LAST_UPDT_PNTTM = now()
+                  ,LAST_UPDT_PNTTM = SYSDATE
              WHERE IP_GROUP_ID = #ipGroupId#
     </update>
     

src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml

@@ -3838,7 +3838,18 @@
 		, D.APRVL_ID                                  AS aprvlId
 		, E.prfrn_fld_cd                              AS prfrnFldCd
 		, E.APRVL_CN                                  AS aprvlCn
+		
+		, (SELECT F.qustnr_respond_id
+           FROM lettnqustnrrespondinfo f                 
+           WHERE  
+                 		  B.edu_aplct_ord = F.edu_aplct_ord
+                 AND      B.edu_chasi_ord = F.edu_chasi_ord
+           ORDER BY F.qustnr_respond_id DESC
+		   LIMIT 1
+           )	AS qustnrRespondId		
+		/*
 		, F.qustnr_respond_id                         AS qustnrRespondId
+		*/
 		, G.sbmt_yn                                   AS acmdtSbmtYn
 		, G.aprvl_cd                                  AS acmdtAprvlCd
 		, H.oneway_dstnc                              AS onewayDstnc
@@ -3866,11 +3877,14 @@
 					AND E.instr_div = #instrDiv#
 					AND E.USE_YN = 'Y'
 				)
+				/*
 			LEFT OUTER JOIN lettnqustnrrespondinfo F
 				ON	(
 					B.edu_aplct_ord = F.edu_aplct_ord
 					AND B.edu_chasi_ord = F.edu_chasi_ord
 				)
+				*/
+				
 				
 				/*
 			LEFT OUTER JOIN ve_acmdt_aplct G

src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml

@@ -412,7 +412,18 @@
             ,d.prfrn_fld_cd	               AS     prfrnFldCd
             ,d.onln_psbl_yn	               AS     onlnPsblYn
             , d.zoom_yn AS zoomYn
+            /*
             , IF (sun_lctr_yn='Y',1,0) + IF (mon_lctr_yn='Y',1,0) + IF (tue_lctr_yn='Y',1,0) + IF (wed_lctr_yn='Y',1,0) + IF (thu_lctr_yn='Y',1,0) + IF (fri_lctr_yn='Y',1,0) + IF (sat_lctr_yn='Y',1,0) weekCnt
+            */
+            
+            , DECODE (sun_lctr_yn,'Y',1,0) 
+              + DECODE (mon_lctr_yn,'Y',1,0) 
+              + DECODE (tue_lctr_yn,'Y',1,0) 
+              + DECODE (wed_lctr_yn,'Y',1,0) 
+              + DECODE (thu_lctr_yn,'Y',1,0) 
+              + DECODE (fri_lctr_yn,'Y',1,0) 
+              + DECODE (sat_lctr_yn,'Y',1,0)                 
+              AS weekCnt 
             
             , (
 	            SELECT
@@ -438,8 +449,16 @@
             ,eee.pnlty_cnt AS pnltyCnt
             
             ,ccccc.lrn_tm_sum_yr AS lrnTmSumYr 
-            ,d.yr_mxmm_asgnm_tm AS yrMxmmAsgnmTm    
+            ,d.yr_mxmm_asgnm_tm AS yrMxmmAsgnmTm   
-            ,IF(d.yr_mxmm_asgnm_tm>0,round(CAST(ccccc.lrn_tm_sum_yr as NUMBER)/CAST(d.yr_mxmm_asgnm_tm as NUMBER)*100,0),0)	AS yrPer          
+            ,
+                 CASE 
+                 	WHEN	d.yr_mxmm_asgnm_tm>0	THEN  ROUND(CAST(ccccc.lrn_tm_sum_yr AS NUMBER)/CAST(d.yr_mxmm_asgnm_tm AS NUMBER)*100,0)
+                 	ELSE 0
+                 END	AS yrPer
+                  
+            /*
+            ,IF(d.yr_mxmm_asgnm_tm>0,round(CAST(ccccc.lrn_tm_sum_yr as NUMBER)/CAST(d.yr_mxmm_asgnm_tm as NUMBER)*100,0),0)	AS yrPer
+            */          
             
             
         FROM     ve_instr a
@@ -584,7 +603,7 @@
 			
 		</isNotEmpty>
 				
-		ORDER BY 1=1
+		ORDER BY 1
 			
 		<isEmpty property="orderByQuery">
 			, b.user_id desc

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

@@ -156,8 +156,12 @@
 		        
 		        , b.qestn_sn AS qestnSn
 		        
+		        /*
 		        , d.QESTNR_RESPONDENT_COUNT AS qestnrParticipant 
-		        , d.QESTNR_PARTICIPANT_COUNT AS qestnrRespondent 
+		        , d.QESTNR_PARTICIPANT_COUNT AS qestnrRespondent
+		        */
+		        , e.QESTNR_RESPONDENT_COUNT AS qestnrParticipant 
+		        , e.QESTNR_PARTICIPANT_COUNT AS qestnrRespondent 
 		        , d.QUSTNR_RESPOND_ID AS qestnrRespondId
 			
 		
@@ -173,11 +177,41 @@
 			           AND c.EDU_CHASI_ORD = #eduChasiOrd#	
 			
 			)
-			
+			/*
-			LEFT OUTER JOIN LETTNQUSTNRRESPONDINFO d ON ( c.QESTNR_ID = d.QESTNR_ID
+			LEFT OUTER JOIN LETTNQUSTNRRESPONDINFO d 
+			ON ( c.QESTNR_ID = d.QESTNR_ID
 			           AND c.EDU_APLCT_ORD = d.EDU_APLCT_ORD
 			           AND c.EDU_CHASI_ORD = d.EDU_CHASI_ORD )	
+			*/
 			
+			/*	중복답변 처리	*/
+               LEFT OUTER JOIN (               
+								SELECT d0.QUSTNR_TMPLAT_ID 
+									, d0.QESTNR_ID 
+									, d0.EDU_APLCT_ORD 
+									, d0.EDU_CHASI_ORD 
+									, MAX(d0.QUSTNR_RESPOND_ID)	AS	QUSTNR_RESPOND_ID 
+								FROM LETTNQUSTNRRESPONDINFO d0
+								GROUP BY d0.QUSTNR_TMPLAT_ID 
+									, d0.QESTNR_ID 
+									, d0.EDU_APLCT_ORD 
+									, d0.EDU_CHASI_ORD
+               ) d
+               ON     (
+                             c.QESTNR_ID     = d.QESTNR_ID
+                      AND    c.EDU_APLCT_ORD = d.EDU_APLCT_ORD
+                      AND    c.EDU_CHASI_ORD = d.EDU_CHASI_ORD
+                      )
+                      
+               LEFT OUTER JOIN LETTNQUSTNRRESPONDINFO e
+               on
+               (
+                             d.QUSTNR_TMPLAT_ID =e.QUSTNR_TMPLAT_ID 
+                      AND 	 d.QESTNR_ID =e.QESTNR_ID 
+                      AND 	 d.QUSTNR_RESPOND_ID =e.QUSTNR_RESPOND_ID 
+                      AND    d.EDU_APLCT_ORD = d.EDU_APLCT_ORD
+                      AND    d.EDU_CHASI_ORD = d.EDU_CHASI_ORD               
+               )			
 		WHERE a.site_id=#siteId#
 			AND a.SITE_ID_CD =#siteIdCd#
 			AND b.QUSTNR_TMPLAT_ID =a.QUSTNR_TMPLAT_ID 

src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp

@@ -1061,6 +1061,7 @@
 				</th>
 				<td colspan="3"><p><c:out value='${fn:replace(info.rqstCn, replaceChar, "<br/>")}' escapeXml="false" /></p></td>
 			</tr>
+			<!-- 
 			<tr>
 				<th scope="row">
 					<p>설문출력</p>
@@ -1069,6 +1070,7 @@
 					<button type="button" class="btnType01" data-tooltip="sub37_pop02" title="팝업 열림">설문출력</button>
 				</td>
 			</tr>
+			 -->
 			
 			<tr>
 				<th scope="row"><p>강사 참석 확인서</p></th>
@@ -1204,6 +1206,11 @@
 									onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','insert'
 									,'${list.qustnrTmplatId}','${list.qestnrId10}','${list.qustnrRespondId10}'
 									)" title="팝업 열림">설문등록</button>
+									
+									<button type="button" class="btnType04" data-tooltip="sub37_pop20" 
+									onclick="fncQustnrPrintList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','print'
+									,'${list.qustnrTmplatId}','${list.qestnrId10}','${list.qustnrRespondId10}'
+									)" title="팝업 열림">설문출력</button>									
 								</c:when>
 								
 								

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp

@@ -178,7 +178,7 @@
 						</a>
 					</td>
 					<td>
-					<!-- 프로세스 변경 후 적용-->${list.aprvlCd}
+					<!-- 프로세스 변경 후 적용-->
 						<c:choose>
 							
 							<c:when test="${list.aprvlCd eq VeConstants.EXPRN_APRVL_CD_10}">
@@ -218,6 +218,7 @@
 								-
 							</c:otherwise>
 						</c:choose>
+						(${list.aprvlCd})
 					</td>
 				</tr>
 			</c:forEach>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp

@@ -1010,6 +1010,7 @@
 					</c:if>
 				</td>
 			</tr>
+			<!-- 
 			<tr>
 				<th scope="row">
 					<p>설문지출력</p>
@@ -1019,6 +1020,7 @@
 					<span class="table_req_text">교육 수강 인원 대상 강의 만족도 설문 요청 드립니다. 설문 완료 후 하단 설문등록을 통해 값을 입력 부탁드립니다.</span>
 				</td>
 			</tr>
+			 -->
 			</tbody>
 		</table>
 	</div>