diff --git a/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBoard_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBoard_SQL_Tibero.xml index cb5dc196..4c0fddfc 100644 --- a/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBoard_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBoard_SQL_Tibero.xml @@ -170,13 +170,13 @@ - SELECT IFNULL(MAX(SORT_ORDR),0)+1 AS NTT_NO FROM LETTNBBS + SELECT NVL(MAX(SORT_ORDR),0)+1 AS NTT_NO FROM LETTNBBS WHERE BBS_ID = #bbsId# - NOW(), + SYSDATE, - SELECT IFNULL(MAX(NTT_NO),0)+1 AS NTT_NO FROM LETTNBBS + SELECT NVL(MAX(NTT_NO),0)+1 AS NTT_NO FROM LETTNBBS WHERE BBS_ID = #bbsId# AND SORT_ORDR = #sortOrdr# @@ -250,7 +250,7 @@ a.REPORT_TY_CD, d.CODE_NM as REPORT_TY_NM, /* CASE - WHEN DATE(SUBDATE(NOW(), + WHEN DATE(SUBDATE(SYSDATE, INTERVAL 7 DAY)) < DATE(FRST_REGIST_PNTTM) THEN 'Y' ELSE 'N' END AS NEW_FLAG, @@ -381,7 +381,7 @@ /* , CASE - WHEN DATE(SUBDATE(NOW(), + WHEN DATE(SUBDATE(SYSDATE, INTERVAL 7 DAY)) < DATE(FRST_REGIST_PNTTM) THEN 'Y' ELSE 'N' END AS NEW_FLAG @@ -396,7 +396,7 @@ , a.SORT_ORDR , a.NTT_NO , - /** IFNULL(e.ANSWER_CNT, 0) as ANSWER_CNT, 댓글 카운트 */ + /** NVL(e.ANSWER_CNT, 0) as ANSWER_CNT, 댓글 카운트 */ (SELECT COUNT(*) FROM LETTNCOMMENT WHERE NTT_Id = A.NTT_ID AND USE_AT = 'Y' @@ -531,10 +531,10 @@ a.NTCE_BGNDE, a.NTCE_ENDDE, a.NOTICE_AT, a.SECRET_AT, - IFNULL(c.ATCH_FILE_CNT, 0) AS ATCH_FILE_CNT, IFNULL(c.FILE_SN, 0) AS FILE_SN, + NVL(c.ATCH_FILE_CNT, 0) AS ATCH_FILE_CNT, NVL(c.FILE_SN, 0) AS FILE_SN, a.REPORT_TY_CD, d.CODE_NM as REPORT_TY_NM, CASE - WHEN DATE(SUBDATE(NOW(), + WHEN DATE(SUBDATE(SYSDATE, INTERVAL 7 DAY)) < DATE(FRST_REGIST_PNTTM) THEN 'Y' ELSE 'N' END AS NEW_FLAG, @@ -542,7 +542,7 @@ LEAD(a.PARNTSCTT_NO) OVER(ORDER BY a.SORT_ORDR DESC, a.NTT_NO ASC) as ANSWER_PR_ID, a.SORT_ORDR, a.NTT_NO, - IFNULL(e.ANSWER_CNT, 0) as ANSWER_CNT, + NVL(e.ANSWER_CNT, 0) as ANSWER_CNT, PUB_PERIOD, PUB_TIME, PUB_LINK, PUB_LOC , LAST_UPDT_PNTTM FROM LETTNBBS a @@ -632,10 +632,10 @@ a.NTCE_BGNDE, a.NTCE_ENDDE, a.NOTICE_AT, a.SECRET_AT, - IFNULL(c.ATCH_FILE_CNT, 0) AS ATCH_FILE_CNT, IFNULL(c.FILE_SN, 0) AS FILE_SN, + NVL(c.ATCH_FILE_CNT, 0) AS ATCH_FILE_CNT, NVL(c.FILE_SN, 0) AS FILE_SN, a.REPORT_TY_CD, d.CODE_NM as REPORT_TY_NM, CASE - WHEN DATE(SUBDATE(NOW(), + WHEN DATE(SUBDATE(SYSDATE, INTERVAL 7 DAY)) < DATE(FRST_REGIST_PNTTM) THEN 'Y' ELSE 'N' END AS NEW_FLAG, @@ -643,7 +643,7 @@ LEAD(a.PARNTSCTT_NO) OVER(ORDER BY a.SORT_ORDR DESC, a.NTT_NO ASC) as ANSWER_PR_ID, a.SORT_ORDR, a.NTT_NO, - IFNULL(e.ANSWER_CNT, 0) as ANSWER_CNT, + NVL(e.ANSWER_CNT, 0) as ANSWER_CNT, PUB_PERIOD, PUB_TIME, PUB_LINK, PUB_LOC , LAST_UPDT_PNTTM FROM LETTNBBS a @@ -857,7 +857,7 @@ @@ -869,7 +869,7 @@ USE_AT = 'N', NTCR_IP = #ntcrIp#, LAST_UPDUSR_ID = #lastUpdusrId#, - LAST_UPDT_PNTTM = NOW() + LAST_UPDT_PNTTM = SYSDATE WHERE BBS_ID = #bbsId# AND NTT_ID = #nttId# ]]> @@ -881,7 +881,7 @@ USE_AT = 'Y', NTCR_IP = #ntcrIp#, LAST_UPDUSR_ID = #lastUpdusrId#, - LAST_UPDT_PNTTM = NOW() + LAST_UPDT_PNTTM = SYSDATE WHERE BBS_ID = #bbsId# AND NTT_ID = #nttId# ]]> @@ -1113,7 +1113,7 @@ ,#nttSj# ,#nttCn# ,#frstRegisterNm# - ,NOW() + ,SYSDATE ,#frstRegisterId# ,#ntcrIp# ) @@ -1123,7 +1123,7 @@ 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 d95668c5..b9cef63d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -232,11 +232,13 @@ function usrJoin(){
- - +
+ +

교육기부 우수기관

+
<%-- diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctList.jsp index a1c40601..d5eab0fb 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctList.jsp @@ -50,7 +50,7 @@
-

교육신청목록

+

신청목록

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp index 9bd4cc96..3ac3fc82 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp @@ -490,7 +490,7 @@
-

교육신청등록

+

교육신청

@@ -667,7 +667,7 @@

필수입력 항목*

신청내용

- + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp index e6beae01..d22c9d6f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp @@ -843,7 +843,7 @@
-

교육완료 상세

+

완료상세

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndList.jsp index e533810a..ed1f1aaf 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndList.jsp @@ -81,7 +81,7 @@
-

교육완료목록

+

완료목록

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp index 0387edb4..60517d15 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp @@ -242,7 +242,7 @@
-

운영내역상세

+

운영상세

@@ -709,7 +709,8 @@
- + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp index 5e52e262..b6df89ea 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp @@ -46,7 +46,7 @@ " />
-

운영내역목록

+

운영목록

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp index 608f690e..77d1b810 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp @@ -113,7 +113,7 @@
-

운영신청상세

+

신청상세

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp index a3d04cca..388ea4b8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp @@ -79,7 +79,7 @@
-

운영신청등록 안내

+

운영신청 안내

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp index 3ff4b579..994d7095 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp @@ -85,7 +85,7 @@ " />
-

운영신청목록

+

신청목록

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp index a74bbf7e..88a3cffe 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp @@ -707,7 +707,8 @@
- + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp index 8ba41da2..4ebbf100 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp @@ -137,7 +137,7 @@
-

교육신청 상세

+

신청상세

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp index c4d9e023..ea1110bc 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp @@ -105,7 +105,7 @@ $(document).ready(function(){
-

강의신청목록

+

신청목록

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp index 21a9de79..91a8c1e8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp @@ -48,7 +48,7 @@
-

기반강화연수 대시보드

+

대시보드

  • 신청중 강의

  • diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp index cc0814c3..4022783e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp @@ -240,7 +240,7 @@
    -

    교육신청 상세

    +

    신청상세

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp index d72591d6..71e22692 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp @@ -51,7 +51,7 @@
    -

    기소유예 대시보드

    +

    대시보드

    • 신청중 강의

    • diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp index 3347ac0b..744bfcfb 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp @@ -105,7 +105,7 @@ $(document).ready(function(){
      -

      강의신청목록

      +

      신청목록

      diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp index c8dfaca5..83cea3fb 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp @@ -499,7 +499,7 @@
      -

      교육신청 상세

      +

      신청상세

      diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.jsp index dac5f3ed..97b1c7d6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.jsp @@ -52,7 +52,7 @@ " />
      -

      교육신청목록

      +

      신청목록

      diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfy.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfy.jsp index 1f2b7899..6a41bc55 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfy.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfy.jsp @@ -676,7 +676,7 @@
      -

      교육신청수정

      +

      신청수정

      diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp index 6d5cfde3..330dcf5a 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp @@ -803,7 +803,7 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
      -

      교육신청등록

      +

      교육신청

      diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp index 051d9125..293215ca 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp @@ -776,7 +776,7 @@
      -

      교육완료 상세

      +

      완료상세

      diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndList.jsp index 9c33c9b3..288ce0e1 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndList.jsp @@ -81,7 +81,7 @@
      -

      교육완료목록

      +

      완료목록