From c9daa8703e6abca471981be3ab06fc588f102585 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Tue, 19 Oct 2021 16:29:54 +0900 Subject: [PATCH] =?UTF-8?q?=EC=83=81=EC=84=B8=EA=B2=80=EC=83=89=ED=8C=9D?= =?UTF-8?q?=EC=97=85=20(=EA=B0=9C=EB=B0=9C=EC=A4=91)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/nlib/col/service/impl/RisDAO.java | 2 +- src/main/java/nlib/col/web/RisController.java | 2 +- .../nlib/sch/web/NlibSearchController.java | 19 ++ .../java/nlib/user/web/MemberController.java | 7 +- .../jsp/nlib/collection/searchList.jsp | 3 + .../search/getDetailedSearchFormPopup.jsp | 319 ++++++++++++++++++ src/main/webapp/WEB-INF/tiles/inc/header.jsp | 2 +- src/main/webapp/js/nlib.js | 7 +- 8 files changed, 352 insertions(+), 9 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp diff --git a/src/main/java/nlib/col/service/impl/RisDAO.java b/src/main/java/nlib/col/service/impl/RisDAO.java index 7efb3d01..5c54d811 100644 --- a/src/main/java/nlib/col/service/impl/RisDAO.java +++ b/src/main/java/nlib/col/service/impl/RisDAO.java @@ -77,7 +77,7 @@ public class RisDAO extends EgovComAbstractDAO * @return */ public RisVO selectRisInfo(RisVO vo) { - return selectOne("CollectionDAO.selectRisInfo", vo); + return selectOne("RisDAO.selectRisInfo", vo); } /** * 문화원 목록 조회(검색필터용) diff --git a/src/main/java/nlib/col/web/RisController.java b/src/main/java/nlib/col/web/RisController.java index c5d44bd6..30c41217 100644 --- a/src/main/java/nlib/col/web/RisController.java +++ b/src/main/java/nlib/col/web/RisController.java @@ -68,7 +68,7 @@ public class RisController extends NlibCommonController @RequestMapping(value="/ris/risDownload.do") public void risDownload(HttpServletRequest request,HttpServletResponse response) throws IOException { RisVO vo = new RisVO(); - vo.setMasterId(request.getParameter("masterId")); + vo.setMasterId(request.getParameter("risId")); vo = risService.selectRisInfo(vo); diff --git a/src/main/java/nlib/sch/web/NlibSearchController.java b/src/main/java/nlib/sch/web/NlibSearchController.java index 5749b483..cbd2870b 100644 --- a/src/main/java/nlib/sch/web/NlibSearchController.java +++ b/src/main/java/nlib/sch/web/NlibSearchController.java @@ -411,6 +411,25 @@ public class NlibSearchController extends NlibCommonController { return makeResponseEntityJson(retMap); } + + /** + * 상세검색 팝업. + * + * (2021.10.19 YJS 추가) + * + * @param request + * @param model + * @return + */ + @RequestMapping(value="/search/getDetailedSearchFormPopup.do") + public String getMemberQrcodeFormPopup(HttpServletRequest request, ModelMap model) { + + NlibLoginVO loginVO = getNlibLoginVO(request); + + model.addAttribute("loginVO", loginVO); + + return "nlib/search/getDetailedSearchFormPopup"; + } /** * 소장자료 상세 내용 조회한다. * diff --git a/src/main/java/nlib/user/web/MemberController.java b/src/main/java/nlib/user/web/MemberController.java index 6fd1e668..c76ac044 100644 --- a/src/main/java/nlib/user/web/MemberController.java +++ b/src/main/java/nlib/user/web/MemberController.java @@ -538,15 +538,16 @@ public class MemberController extends NlibCommonController{ @RequestMapping(value="/member/mobileCertNum.ajax" , method=RequestMethod.POST) public @ResponseBody void phoneCertNum(HttpServletResponse response,Authentication authentication,HttpServletRequest request,HttpSession session) throws Exception{ String mobileNo = request.getParameter("mobileNo"); + //회원가입페이지와 정보수정페이지의 프로세스 분기를위해 가져옴 String pageName = request.getParameter("pageName"); + //인증번호 생성 String CertNumber=memberService.numberGen(6,1); - System.out.println(CertNumber); + //세션에 저장 String jsessionId = session.getId(); - //내 정보 페이지 if("myInfo".equals(pageName)) { @@ -559,7 +560,7 @@ public class MemberController extends NlibCommonController{ OAuthUniversalUser oauthUser = SessionConfig.getNewMemberInfo(jsessionId); NlibLoginVO vo=oauthUser.getNlibVO(); //이미 생성된 VO가 없을때 - if(vo==null) + if(vo == null) vo= new NlibLoginVO(); vo.setMobileNo(mobileNo); diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp index 0af3f3c9..0159237e 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp @@ -268,6 +268,9 @@ function fn_search_article(pageIndex) { +        + +
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp b/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp new file mode 100644 index 00000000..baf98b82 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp @@ -0,0 +1,319 @@ +<% +/** + * 
+ * @Class Name : getDetailedSearchFormPopup.jsp
+ * 
+ * @Description : 상세검색 팝업 
+ * 
+ * 
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ * + * @ ------------ -------- --------------------------- + * @ 수정일 수정자 수정내용 + * @ ------------ -------- --------------------------- + * @ 2021. 10. 19. JSYOO 최초 생성 + * + * + * @author 이씨플라자 * DIGITALSHIP JSYOO + * @since 2021. 10. 19. + * @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} + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/tiles/inc/header.jsp b/src/main/webapp/WEB-INF/tiles/inc/header.jsp index 40c4ab32..82f722b5 100644 --- a/src/main/webapp/WEB-INF/tiles/inc/header.jsp +++ b/src/main/webapp/WEB-INF/tiles/inc/header.jsp @@ -28,7 +28,7 @@ String councilNm = (String)session.getAttribute("councilNm");
- +
'; html+='
'; html+='
'; html+='

서지정보 내보내기 (Export)

'; @@ -208,10 +209,10 @@ function risClose(){ } function risDownload(risId){ - $("#masterId").val(risId); + $("#risId").val(risId); - document.interestsForm.action="/ris/risDownload.do"; - document.interestsForm.submit(); + document.risDownloadForm.action="/ris/risDownload.do"; + document.risDownloadForm.submit(); } function insertInterest(masterId){