From b61c98b58e99e9c82a4f2245ca9b7422ec71ac25 Mon Sep 17 00:00:00 2001 From: myname Date: Fri, 26 Jan 2024 10:30:51 +0900 Subject: [PATCH 1/2] =?UTF-8?q?2024-01-26=2010:30=20QR=20=EC=84=A4?= =?UTF-8?q?=EB=AC=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qri/EgovQustnrRespondInfo_SQL_Tibero.xml | 44 ++++++++++++- .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 65 ++++++++++++++++--- 2 files changed, 99 insertions(+), 10 deletions(-) diff --git a/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Tibero.xml index 1ce6a9d6..9682b51a 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Tibero.xml @@ -691,11 +691,23 @@ , b.QUSTNR_RSLT_ID AS qustnrRsltId + + + /* , b.VERY_SATISFIED AS verySatisfied , b.SATISFIED AS satisfied , b.NEITHER AS neither , b.DISSATISFIED AS dissatisfied - , b.VERY_DISSATISFIED AS veryDissatisfied + , b.VERY_DISSATISFIED AS veryDissatisfied + */ + + , NVL(b.VERY_SATISFIED, cVERY_SATISFIED) AS verySatisfied + , NVL(b.SATISFIED, cSATISFIED) AS satisfied + , NVL(b.NEITHER, cNEITHER) AS neither + , NVL(b.DISSATISFIED, cDISSATISFIED) AS dissatisfied + , NVL(b.VERY_DISSATISFIED, cVERY_DISSATISFIED) AS veryDissatisfied + + , b.ANSWER AS answer , b.QUSTNR_IEM_ID AS qustnrIemId @@ -722,6 +734,36 @@ AND c.QUSTNR_RESPOND_ID = #qustnrRespondId# ) + + LEFT OUTER JOIN ( + SELECT + c.QUSTNR_TMPLAT_ID , + c.QESTNR_ID , + c.QUSTNR_QESITM_ID , + c.EDU_APLCT_ORD , + c.EDU_CHASI_ORD , + sum(c.very_satisfied) AS cvery_satisfied , + sum(c.satisfied) AS csatisfied , + sum(c.neither) AS cneither , + sum(c.dissatisfied) AS cdissatisfied , + sum(c.very_dissatisfied) AS cvery_dissatisfied + FROM + LETTNQESTNRRSLTEADetail c + GROUP BY + c.QUSTNR_TMPLAT_ID , + c.QESTNR_ID , + c.QUSTNR_QESITM_ID , + c.EDU_APLCT_ORD , + c.EDU_CHASI_ORD + )F ON + ( + a.QUSTNR_TMPLAT_ID = f.QUSTNR_TMPLAT_ID + AND a.QESTNR_ID = f.QESTNR_ID + AND a.QUSTNR_QESITM_ID = f.QUSTNR_QESITM_ID + AND f.EDU_APLCT_ORD = #eduAplctOrd# + AND f.EDU_CHASI_ORD = #eduChasiOrd# + ) + WHERE a.QUSTNR_TMPLAT_ID = #qustnrTmplatId# AND a.QESTNR_ID = #qestnrId# diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml index 13ba6a1f..43ce19dd 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml @@ -4469,10 +4469,10 @@ , H.oneway_dstnc AS onewayDstnc , A.rslt_atch_file_id AS rsltAtchFileId - , I.qustnr_tmplat_id AS qustnrTmplatId - , i.qestnr_id_10 AS qestnrId10 - , i.qestnr_id_20 AS qestnrId20 - , i.qestnr_id_30 AS qestnrId30 + , I10.qustnr_tmplat_id AS qustnrTmplatId + , I10.qestnr_id_10 AS qestnrId10 + , I20.qestnr_id_20 AS qestnrId20 + , I30.qestnr_id_30 AS qestnrId30 FROM VE_EDU_APLCT A @@ -4623,7 +4623,8 @@ LEFT OUTER JOIN ( - /* 현재 진행가능한 설문 정보(기본, 선생님, 강사) */ + /* 현재 진행가능한 설문 정보(기본, 선생님, 강사) */ + /* SELECT a.QUSTNR_TMPLAT_ID , a.SITE_ID , decode(a.site_id_cd,'10',a.QESTNR_ID) AS QESTNR_ID_10 @@ -4631,16 +4632,62 @@ , decode(a.site_id_cd,'30',a.QESTNR_ID) AS QESTNR_ID_30 FROM LETTNQESTNRINFO a - WHERE a.SITE_ID =#siteId# + WHERE a.SITE_ID =siteId AND a.SITE_ID_CD IN ('10','20','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 + LIMIT 1 + */ - - ) I + SELECT a.QUSTNR_TMPLAT_ID + , a.SITE_ID + , decode(a.site_id_cd,'10',a.QESTNR_ID) AS QESTNR_ID_10 + + FROM LETTNQESTNRINFO a + WHERE a.SITE_ID =#siteId# + 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 + + ) 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 1=1 AND NVL(A.USE_YN, 'Y') ]]> 'N' AND A.EDU_APLCT_ORD = B.EDU_APLCT_ORD From 557231c5fbf91af4045284b92e3d6a8a80b34d21 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Fri, 26 Jan 2024 10:51:46 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=ED=83=80?= =?UTF-8?q?=EC=9D=B4=ED=8B=80=20=EC=84=A0=EC=96=B8=20=EC=A4=91=EB=B3=B5=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0=20=EB=B0=8F=20=EB=82=B4=EC=95=8C=EB=A6=BC,?= =?UTF-8?q?=20=EA=B3=B5=EC=A7=80=EC=82=AC=ED=95=AD=20=ED=83=80=EC=9D=B4?= =?UTF-8?q?=ED=8B=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp | 5 +++-- src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp | 5 +++-- src/main/webapp/visitEdu/usr/publish/script/common.js | 7 ++++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp index e762cd9a..5200f2e7 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -14,13 +14,14 @@ <%-- 웹접근성 각 페이지 타이틀 변경 220125--%> $(document).ready(function (){ - var titleNm = ''; + /* 240126 - common.js에서도 title 선언이 되어 중복 제거를 위한 주석처리 */ + /* var titleNm = ''; if($('body').find('h2').length > 0){ titleNm = document.querySelector('h2').textContent; if(document.title.indexOf(titleNm) < 0){ document.title = titleNm + "<" + document.title; } - } + } */ }); diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp index 2d5656c8..422380d5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp @@ -136,7 +136,8 @@ function isMobile(){ } <%-- 웹접근성 각 페이지 타이틀 변경 220125--%> $(document).ready(function (){ - var titleNm = ''; +/* 240126 - common.js에서도 title 선언이 되어 중복 제거를 위한 주석처리 */ +/* var titleNm = ''; if($('body').find('h2').length > 0){ titleNm = document.querySelector('h2').textContent; if(document.title.indexOf(titleNm) < 0){ @@ -145,7 +146,7 @@ $(document).ready(function (){ document.title = titelNavi.eq(4).text() +"<"+titelNavi.eq(2).text()+"< 한국저작권위원회 저작권교육 시스템"; } - } + } */ }); diff --git a/src/main/webapp/visitEdu/usr/publish/script/common.js b/src/main/webapp/visitEdu/usr/publish/script/common.js index b953ff00..85a43574 100644 --- a/src/main/webapp/visitEdu/usr/publish/script/common.js +++ b/src/main/webapp/visitEdu/usr/publish/script/common.js @@ -25,11 +25,16 @@ $(document).ready(function () { else if($(".cont_tit h2").text() == "로그인"){ $("head title").text("로그인페이지 < 한국저작권위원회 저작권배움터"); } + else if(dep01_Text == ''){ + $("head title").text(dep02_Text+" < "+" 한국저작권위원회 저작권배움터"); + } else{ $("head title").text(dep02_Text+" < "+dep01_Text+" < "+" 한국저작권위원회 저작권배움터"); } - + if(dep01_Text == '' && dep02_Text == ''){ + $("head title").text($(".cont_tit h2").text() + " < "+" 한국저작권위원회 저작권배움터"); + } if($(".full_menu .depth01_li a:contains('ZOOM 신청 게시판(청소년)')").length == "1"){ $(".full_menu .depth01_li>a").css("width","24%");