From 858c4cd53cf6a4ba225d5a6c583e52dfc15cb095 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Mon, 15 Nov 2021 14:31:18 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=ED=82=A4=EC=9B=8C=EB=93=9C=20=EC=B6=94?= =?UTF-8?q?=EC=B6=9C=20=EC=B5=9C=EB=8C=80=EC=A3=BC=20=EA=B0=80=EB=8A=A5=20?= =?UTF-8?q?=EC=88=98=EB=A7=8C=ED=8B=88=20=EC=B6=94=EC=B6=9C=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../egovframework/mapper/nlib/cmm/MainDAO_SQL.xml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml index 63d35303..f225d646 100644 --- a/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml @@ -7,12 +7,17 @@ - SELECT - A.MNG_ORG_CD - , B.DEPT_NM AS MNG_ORG_NM - FROM RG_MASTER A - LEFT OUTER JOIN SM_DEPT B ON A.MNG_ORG_CD = B.ORG_CD - WHERE A.MASTER_ID = #{masterId} - - + + + + + + + + INSERT INTO MB_VIEW_LOG( + MNG_ORG_CD + , MASTER_ID + , MB_INFO_ID + , REG_DD + ) VALUES ( + #{mngOrgCd} + , #{masterId} + , #{mbInfoId} + , SYSDATE() + ) + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp index 14f90ded..0178672a 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp @@ -247,7 +247,7 @@ function fn_listPops(typeDivCd) {
  • 생산년도-${itemOnline.creatYyyy }
    • -
    원문보기
    +
    원문보기
    RIS
    From b8b778b1605661a254ea94f096a7f36ced97b5d1 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Mon, 15 Nov 2021 15:56:47 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=EB=A9=94=EC=9D=B8=20:=20=EC=9D=B8=EA=B8=B0?= =?UTF-8?q?=EC=9E=90=EB=A3=8C=20=EC=B6=94=EA=B0=80=EB=90=9C=20=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=EB=B0=98=EC=98=81=20=EB=B0=8F=20=EC=A1=B0?= =?UTF-8?q?=EA=B1=B4=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/nlib/cmm/MainDAO_SQL.xml | 112 ++++++++++-------- src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp | 18 ++- 2 files changed, 73 insertions(+), 57 deletions(-) diff --git a/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml index f225d646..163c9a99 100644 --- a/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml @@ -7,29 +7,30 @@ @@ -42,14 +43,16 @@ , TYPE_DIV_NM , RPRS_THUMB_URL FROM ( - /* 문화원 PICK한 자료 */ - (SELECT + (/* 문화원 PICK한 자료 */ + SELECT 1 AS RNK , M1.MASTER_ID , M1.TITLE , M1.TYPE_DIV_CD , TDC.S_CODE_NM AS TYPE_DIV_NM , M1.RPRS_THUMB_URL + , M1.REG_DD + , M1.MOD_DD FROM BD_NLIB_RECOM_MASTER R INNER JOIN RG_MASTER M1 ON R.MASTER_ID = M1.MASTER_ID @@ -58,31 +61,33 @@ AND M1.OPEN_DIV_CD = '1' /* 공개구분 : 공개 */ AND M1.REG_STATUS = 'REG_OK' /* 등록상태 : 등록완료 */ AND M1.USE_FLAG = 'Y' + ORDER BY M1.MOD_DD DESC, M1.REG_DD DESC LIMIT 10) UNION - /* 문화원 PICK한 자료가 없거나 충분치 않은 경우, 대출/열람/온라인 가능 자료 중 최근 변경된 자료 */ - (SELECT + (/* 문화원 PICK한 자료가 없거나 충분치 않은 경우, 대출/열람/온라인 가능 자료 중 최근 변경된 자료로 대체 */ + SELECT 2 AS RNK , M2.MASTER_ID , M2.TITLE , M2.TYPE_DIV_CD , TDC.S_CODE_NM AS TYPE_DIV_NM , M2.RPRS_THUMB_URL + , M2.REG_DD + , M2.MOD_DD FROM RG_MASTER M2 JOIN SM_CODE_S TDC ON M2.TYPE_DIV_CD = TDC.S_CODE_ID AND TDC.L_CODE_ID = 'MASTER_TYPE_DIV_CD' WHERE M2.MNG_ORG_CD = #{mngOrgCd} - AND M2.OPEN_DIV_CD = '1' /* 공개구분 : 공개 */ - AND M2.REG_STATUS = 'REG_OK' /* 등록상태 : 등록완료 */ - AND M2.USE_FLAG = 'Y' - AND M2.OPER_OUT_RANGE_CD = '01' /* 대출구분 : 대출가능 */ - AND M2.OPER_READ_RANGE_CD = '01' /* 열람 : 전체열람 */ + AND M2.USE_FLAG = 'Y' + AND M2.OPEN_DIV_CD != '3' /* 공개구분 : 공개, 부분공개 */ + AND M2.REG_STATUS = 'REG_OK' /* 등록상태 : 등록완료 */ + AND (M2.OPER_OUT_RANGE_CD = '01' /* 대출구분 : 대출가능 */ + OR M2.OPER_READ_RANGE_CD = '01' /* 열람 : 전체열람 */ + OR M2.DIGITAL_READ_YN = 'Y') /* 디지탈열람여부 */ AND IFNULL(M2.PE_STATUS, '') = '' /* 보존상태 */ - AND IFNULL(M2.BOOKCASE_ID, '') != '' /* 서가아이디 존재 */ - AND M2.DIGITAL_READ_YN = 'Y' /* 디지탈열람여부 */ - ORDER BY M2.MOD_DD DESC + ORDER BY M2.MOD_DD DESC, M2.REG_DD DESC LIMIT 10 ) ) T - ORDER BY RNK + ORDER BY RNK, T.MOD_DD DESC, T.REG_DD DESC LIMIT 10 ]]> @@ -90,7 +95,7 @@ @@ -157,13 +165,13 @@ LEFT OUTER JOIN SM_CODE_S C1 ON M.TYPE_DIV_CD = C1.S_CODE_ID AND C1.L_CODE_ID = 'MASTER_TYPE_DIV_CD' LEFT OUTER JOIN SM_CODE_S C2 ON M.DTLS_TYPE_DIV_CD = C2.S_CODE_ID AND C2.L_CODE_ID = 'DTLS_TYPE_DIV_CD' WHERE M.MNG_ORG_CD = #{mngOrgCd} - AND M.OPEN_DIV_CD = '1' /* 공개구분 : 공개 */ - /* AND M.REG_STATUS = 'REG_OK' -- DDDDDDDDDDDDDDDDD 확인데이터 없어서 임시 주석 막음 */ /* 등록상태 : 등록완료 */ - AND M.USE_FLAG = 'Y' - AND IFNULL(M.PE_STATUS, '') = '' /* 보존상태 */ - AND M.DIGITAL_READ_YN = 'Y' /* 디지탈열람여부 */ + AND M.USE_FLAG = 'Y' + AND M.OPEN_DIV_CD != '3' /* 공개구분 : 공개 */ + AND M.REG_STATUS = 'REG_OK' /* 등록상태 : 등록완료 */ + /* AND IFNULL(M.PE_STATUS, '') = '' */ /* 보존상태 */ + AND M.DIGITAL_READ_YN = 'Y' /* 디지탈열람여부 */ AND IFNULL(M.M_INTERFACE_ID, '') != ''/* IF존재하는 건 */ - ORDER BY M.MOD_DD DESC + ORDER BY M.MOD_DD DESC, M.REG_DD DESC LIMIT 10 ]]> diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp index 4885da7f..e1c8d992 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp @@ -48,7 +48,14 @@ function fn_viewAncmnt(articleId) { return; } -function fn_viewQna(articleId) { +function fn_viewQna(articleId, secretYn, myQnaYn) { + + // 비밀글인 경우, 본인에 한하여 조회 가능 + if(secretYn == "Y" && myQnaYn == "N") { + alert("비공개 게시물은 작성자만 확인할 수 있습니다."); + return; + } + var form = document.createElement("form"); form.style.display = "none"; $(form).attr("action", "/bbs/selectQnaArticle.do"); @@ -101,7 +108,7 @@ function fn_listPops(typeDivCd) {
    플러스 아이콘
    - +
    열람관리
    열람 아이콘
    플러스 아이콘
    @@ -237,14 +244,15 @@ function fn_listPops(typeDivCd) {
    - 상세조회 + 썸네일
    ${itemOnline.title }
    • 자료유형-${itemOnline.typeDivNm }
    • 주제분야-${itemOnline.subjectNmUp }
    • 생산기관-${itemOnline.orgNm }
      • -
    • 생산년도-${itemOnline.creatYyyy }
      • +
    • 생산년도-${itemOnline.creatYyyy } + ${itemOnline.masterId }
    원문보기
    @@ -291,7 +299,7 @@ function fn_listPops(typeDivCd) {
    - +

    ${fn:substring(itemQna.regDd,8,10) }

    ${fn:substring(itemQna.regDd,2,4) }.${fn:substring(itemQna.regDd,5,7) }

    ${itemQna.title} From 369d8747ba94ba7e3c43b9dd045d7aac4ec750bc Mon Sep 17 00:00:00 2001 From: KNKIM Date: Mon, 15 Nov 2021 16:40:24 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=EC=98=A8=EB=9D=BC=EC=9D=B8=EC=9E=90?= =?UTF-8?q?=EB=A3=8C=EA=B4=80=20>=20=EC=8D=B8=EB=84=A4=EC=9D=BC=20?= =?UTF-8?q?=EC=A1=B4=EC=9E=AC=ED=95=98=EB=8A=94=20=EC=9E=90=EB=A3=8C?= =?UTF-8?q?=EC=97=90=20=ED=95=9C=EC=A0=95=20:=202021.11.15=20=EC=97=91?= =?UTF-8?q?=ED=8B=B0=EB=B2=84=20=EA=B9=80=ED=98=9C=EC=A4=80=EB=8C=80?= =?UTF-8?q?=EB=A6=AC=20=EB=82=B4=EB=B6=80=EA=B7=BC=EB=AC=B4=20=EA=B3=BC?= =?UTF-8?q?=EC=9E=A5=EB=8B=98=ED=86=B5=ED=95=B4=20=EC=9A=94=EC=B2=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../egovframework/mapper/nlib/cmm/MainDAO_SQL.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml index 163c9a99..a3462236 100644 --- a/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml @@ -166,11 +166,12 @@ LEFT OUTER JOIN SM_CODE_S C2 ON M.DTLS_TYPE_DIV_CD = C2.S_CODE_ID AND C2.L_CODE_ID = 'DTLS_TYPE_DIV_CD' WHERE M.MNG_ORG_CD = #{mngOrgCd} AND M.USE_FLAG = 'Y' - AND M.OPEN_DIV_CD != '3' /* 공개구분 : 공개 */ - AND M.REG_STATUS = 'REG_OK' /* 등록상태 : 등록완료 */ - /* AND IFNULL(M.PE_STATUS, '') = '' */ /* 보존상태 */ - AND M.DIGITAL_READ_YN = 'Y' /* 디지탈열람여부 */ - AND IFNULL(M.M_INTERFACE_ID, '') != ''/* IF존재하는 건 */ + AND M.OPEN_DIV_CD != '3' /* 공개구분 : 공개 */ + AND M.REG_STATUS = 'REG_OK' /* 등록상태 : 등록완료 */ + AND IFNULL(M.PE_STATUS, '') = '' /* 보존상태 */ + AND M.DIGITAL_READ_YN = 'Y' /* 디지탈열람여부 */ + AND IFNULL(M.M_INTERFACE_ID, '') != '' /* IF존재하는 건 */ + AND IFNULL(M.RPRS_THUMB_URL, '') != '' /* 썸네일 존재하는 자료에 한정 : 2021.11.15 엑티버 김혜준대리 내부근무 과장님통해 요청 */ ORDER BY M.MOD_DD DESC, M.REG_DD DESC LIMIT 10 ]]> From dc3f8591510707d2abbf751e95707b6fe0c0cc1e Mon Sep 17 00:00:00 2001 From: KNKIM Date: Mon, 15 Nov 2021 17:51:13 +0900 Subject: [PATCH 5/5] =?UTF-8?q?URL=20=EB=A7=81=ED=81=AC=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/tiles/inc/footer.jsp | 18 +++++++++--------- src/main/webapp/WEB-INF/tiles/inc/menu.jsp | 5 +++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/main/webapp/WEB-INF/tiles/inc/footer.jsp b/src/main/webapp/WEB-INF/tiles/inc/footer.jsp index 84a4671f..2e7a63d3 100644 --- a/src/main/webapp/WEB-INF/tiles/inc/footer.jsp +++ b/src/main/webapp/WEB-INF/tiles/inc/footer.jsp @@ -8,19 +8,19 @@

    관련 사이트

    diff --git a/src/main/webapp/WEB-INF/tiles/inc/menu.jsp b/src/main/webapp/WEB-INF/tiles/inc/menu.jsp index 02085875..fe3bf79a 100644 --- a/src/main/webapp/WEB-INF/tiles/inc/menu.jsp +++ b/src/main/webapp/WEB-INF/tiles/inc/menu.jsp @@ -57,18 +57,19 @@ $(document).ready(function() {
  • 대출관리
  • 방문열람관리
    • -
  • --- 이하 임시 추가 메뉴 ---
  • ID/PW찾기
  • 암호화
  • 환경설정갱신
  • 코드조회
  • API샘플
    • - --> + +