From dba8979e715e21a3bedcfb44f9856a67011c4a93 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Fri, 6 Aug 2021 14:12:54 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B0=98=EB=82=A9=EC=97=B0=EA=B8=B0,=EC=83=81?= =?UTF-8?q?=EC=84=B8=EC=9E=90=EB=A3=8C=ED=99=94=EB=A9=B4=20=EA=B0=9C?= =?UTF-8?q?=EB=B0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataxml/uac.service.col.listItems_GET.xml | 49 +---- .../nlib/col/web/CollectionController.java | 2 - .../WEB-INF/jsp/nlib/collection/listItems.jsp | 90 +++++---- .../jsp/nlib/collection/selectItemInfo.jsp | 89 +++++++++ .../WEB-INF/jsp/nlib/rent/listPostpones.jsp | 170 ++++++++++++++++ .../jsp/nlib/rent/listReservations.jsp | 184 ------------------ 6 files changed, 321 insertions(+), 263 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/nlib/collection/selectItemInfo.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/nlib/rent/listPostpones.jsp diff --git a/data/dataxml/uac.service.col.listItems_GET.xml b/data/dataxml/uac.service.col.listItems_GET.xml index ce212483..432d9768 100644 --- a/data/dataxml/uac.service.col.listItems_GET.xml +++ b/data/dataxml/uac.service.col.listItems_GET.xml @@ -2,44 +2,15 @@ - 5 - 101 - Q&A - 공지사항 테스트 - 9uCh4qxBlFqap/+KiqoM68EqO8yYGpKa1c+BCgkOEa4= - - 15 - 2021-07-19 - 김아무 - 답변완료 - myid@digitalship.co.kr - 질문이 있습니다. - 111111=화면캡쳐.jpg;222222=화면캡쳐2.jpg; - 이렇게 답변 드립니다. - 333333=결과확인.jpg; - - - 1 - 1 - 2 - - 4 - 101 - Q&A - 이전의 글제목입니다. - 2021-07-19 - 김아무 - 답변완료 - - - 6 - 102 - Q&A - 다음의 글제목입니다. - 2021-07-20 - 홍아무 - 답변완료 - - + 2 + 경성기담 + 설명입니다.설명입니다.설명입니다.설명입니다.설명입니다.설명입니다.설명입니다.설명입니다.설명입니다.설명입니다.설명입니다.설명입니다.설명입니다.설명입니다.설명입니다.설명입니다. + 설명입니다.설명입니다.설명입니다.설명입니다.설명입니다.설명입니다. + + 2021-000084 + 홍길동 + 살림 + 2021-07-27 + 2021-08-31 diff --git a/src/main/java/nlib/col/web/CollectionController.java b/src/main/java/nlib/col/web/CollectionController.java index 1aef05a9..bcb349c8 100644 --- a/src/main/java/nlib/col/web/CollectionController.java +++ b/src/main/java/nlib/col/web/CollectionController.java @@ -158,8 +158,6 @@ public class CollectionController extends NlibCommonController // 반환 정보 model.addAttribute("articleNo" , articleNo); model.addAttribute("article" , resVO.getInfo()); // 게시물 상세 - model.addAttribute("preArticle" , resVO.getList().get(0)); // 이전글 정보 - model.addAttribute("nextArticle" , resVO.getList().get(1)); // 다음글 정보 model.addAttribute("message" , message); model.addAttribute("pageIndex" , pageIndex); model.addAttribute("pageSize" , pageSize); diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/listItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/listItems.jsp index f70aeb42..ede67de8 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/listItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/listItems.jsp @@ -36,27 +36,27 @@ -${pageTitle} + + +${pageTitle} + - + + + + + + +

${pageTitle }

+ +
+
+
+ +
+
+ +

저자 :

+

관리번호 :

+

출판사 :

+
+
+
+ +
+ + + +
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/listPostpones.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/listPostpones.jsp new file mode 100644 index 00000000..1a444771 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/listPostpones.jsp @@ -0,0 +1,170 @@ +<% +/** + * 
+ * @Class Name : listPostpones.jsp
+ * 
+ * @Description : 반납 연기 목록을 조회한다.
+ * 
+ * 
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ * + * @ ------------ -------- --------------------------- + * @ 수정일 수정자 수정내용 + * @ ------------ -------- --------------------------- + * @ 2021. 7. 30. JSYOO 최초 생성 + * + * + * @author 이씨플라자 * DIGITALSHIP JSYOO + * @since 2021. 7. 30. + * @version 1.0 + * + */ + %> +<%@ page language="java" contentType="text/html; charset=UTF-8" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> + +반납 연기 목록 + + + + +${pageTitle} + + + + + + + + + + + +

${pageTitle }

+ +
+ + + + + + + + +
+ + + + +
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/listReservations.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/listReservations.jsp index efd369c2..81251639 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/rent/listReservations.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/listReservations.jsp @@ -1,4 +1,3 @@ -<<<<<<< HEAD <% /** * 
@@ -186,186 +185,3 @@ function fn_search_article(pageSize, pageIndex) {
 
 
 
-=======
-<%
-/**
- * 
- * @Class Name : listReserVations.jsp
- * 
- * @Description : 대출 예약 목록을 조회한다.
- * 
- * 
- * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
- *
- * 

- *
- * @ ------------    --------    ---------------------------
- * @ 수정일                     수정자             수정내용
- * @ ------------    --------    ---------------------------
- * @ 2021. 7. 21.    JSYOO       최초 생성
- *
- * 
- * @author 이씨플라자 * DIGITALSHIP JSYOO
- * @since 2021. 7. 21.
- * @version 1.0
- *
- */
- %>
-<%@ page language="java" contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
-
-대출 예약
-
-
-
-
-${pageTitle}
-
-
-
-
-
-
-
-
-
-
-
대출 예약

-
-
 
-
-
-
-
-
-
-
-
-
-     
-
-    
-

-
-

-
-
-
-
-
->>>>>>> refs/remotes/origin/master