diff --git a/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java b/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java index b6657e11..e3fe48b2 100644 --- a/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java +++ b/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java @@ -3717,6 +3717,102 @@ public class EgovBBSManageController { } + @RequestMapping(value= {"/web/cop/bbs/selectDataBoardList.do"}) + public String selectDataBoardListWeb(HttpServletRequest request, @ModelAttribute("searchVO") BoardMasterVO boardMasterVO, ModelMap model , + BoardVO boardVO , RedirectAttributes redirectAttributes) throws Exception { + + + return "web/cop/bbs/DataBoardList"; + + + } + + @RequestMapping(value= {"/web/cop/bbs/selectDataBoardListAjax.do"}) + public String selectDataBoardListAjaxWeb(HttpServletRequest request, @ModelAttribute("searchVO") BoardMasterVO boardMasterVO, ModelMap model , + BoardVO boardVO , RedirectAttributes redirectAttributes) throws Exception { + + + BoardMasterVO bmVO = new BoardMasterVO(); + bmVO.setBbsId(boardVO.getBbsId()); + bmVO = bbsAttrbService.selectBBSMasterInf(bmVO); + + if (bmVO == null || ("N").equals(bmVO.getUseAt())) { + redirectAttributes.addFlashAttribute("message", egovMessageSource.getMessage("fail.common.imposbl")); + return "redirect:/web/main/mainPage.do"; + } + + boardVO.setPageUnit(Integer.parseInt(bmVO.getListNum())); + boardVO.setPageSize(Integer.parseInt(bmVO.getPageNum())); + + PaginationInfo paginationInfo = new PaginationInfo(); + + paginationInfo.setCurrentPageNo(boardVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(boardVO.getPageUnit()); + paginationInfo.setPageSize(boardVO.getPageSize()); + + boardVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + boardVO.setLastIndex(paginationInfo.getLastRecordIndex()); + boardVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + + Map map = bbsMngService.selectBoardArticlesWeb(boardVO, null); + int totCnt = Integer.parseInt((String) map.get("resultCnt")); + paginationInfo.setTotalRecordCount(totCnt); + + + List resultList = (List)map.get("resultList"); + + //모바일 + PaginationInfo paginationInfoMobile = new PaginationInfo(); + paginationInfoMobile.setCurrentPageNo(paginationInfo.getCurrentPageNo()); + paginationInfoMobile.setTotalRecordCount(paginationInfo.getTotalRecordCount()); + paginationInfoMobile.setPageSize(5); + paginationInfoMobile.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + + model.addAttribute("resultList", resultList); + model.addAttribute("resultCnt", map.get("resultCnt")); + model.addAttribute("boardVO", boardVO); + model.addAttribute("brdMstrVO", bmVO); + model.addAttribute("paginationInfo", paginationInfo); + model.addAttribute("paginationInfoMobile", paginationInfoMobile); + + return "web/cop/bbs/DataBoardListAjax"; + + + } + + + @RequestMapping(value= {"/web/cop/bbs/selectDataBoardDetail.do"} ) +public String selectDataBoardArticleWeb(HttpServletRequest request, @ModelAttribute("searchVO") BoardVO boardVO, + BoardMasterVO masterVO, + ModelMap model , + @RequestParam Map commandMap, + RedirectAttributes redirectAttributes) throws Exception { + + BoardMasterVO bmVO = new BoardMasterVO(); + bmVO.setBbsId(boardVO.getBbsId()); + bmVO = bbsAttrbService.selectBBSMasterInf(bmVO); + BoardVO bdVO = bbsMngService.selectBoardArticleWeb(boardVO); + if (bmVO == null || ("N").equals(bmVO.getUseAt())) { + redirectAttributes.addFlashAttribute("message", egovMessageSource.getMessage("fail.common.imposbl")); + return "redirect:/web/main/mainPage.do"; + } + + // 조회수 증가 여부 지정 + boardVO.setPlusCount(true); + bbsMngService.updateBoardArticleInqireCo(boardVO); + + //게시판 마스터 옵션 정보 + BoardMasterVO searchVO = new BoardMasterVO(); + searchVO.setBbsId(boardVO.getBbsId()); + BoardMasterVO resultBbsMsInfo = bbsAttrbService.selectBBSMasterInf(searchVO); + + model.addAttribute("result", bdVO); + model.addAttribute("brdMstrVO", bmVO); + model.addAttribute("resultBbsMsInfo", resultBbsMsInfo); + + return "web/cop/bbs/EgovDataNoticeInqire"; +} + public String getDateDay(String date, String dateType) throws Exception { String day = "" ; SimpleDateFormat dateFormat = new SimpleDateFormat(dateType) ; diff --git a/src/main/java/kcc/let/my/web/MyPageController.java b/src/main/java/kcc/let/my/web/MyPageController.java index dfb82706..6cebe351 100644 --- a/src/main/java/kcc/let/my/web/MyPageController.java +++ b/src/main/java/kcc/let/my/web/MyPageController.java @@ -197,10 +197,10 @@ public class MyPageController { vEEduChasiVO.setPageUnit(vEEduAplctVO.getPageUnit()); vEEduChasiVO.setPageSize(vEEduAplctVO.getPageSize()); - List vEEduChasiVOList = vEEduMIXService.selectChasiListMypage(vEEduChasiVO); + List adultList = vEEduMIXService.selectChasiListMypage(vEEduChasiVO); - Map tngrMap = vEEduChasiVOList.stream() + Map tngrMap = adultList.stream() .collect(Collectors.partitioningBy(vo -> "30".equals(vo.getAsgnmAprvlCd()), Collectors.counting())) .entrySet().stream() .collect(Collectors.toMap( @@ -210,6 +210,7 @@ public class MyPageController { ); model.addAttribute("adultMap", tngrMap); + model.addAttribute("adultList", adultList); } // return "/web/cop/bbs/FaqListAjax"; return "web/my/myPageDashBoard"; diff --git a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java index 88541df7..e1d3c056 100644 --- a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java +++ b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java @@ -90,6 +90,7 @@ public class EgovCryptoUtil { if (!"".equals(p_vEEduAplctVO.getEmail())) p_vEEduAplctVO.setEmail(this.decrypt(p_vEEduAplctVO.getEmail())); if (!"".equals(p_vEEduAplctVO.getInstrNm())) p_vEEduAplctVO.setInstrNm(this.decrypt(p_vEEduAplctVO.getInstrNm())); if (!"".equals(p_vEEduAplctVO.getUserNm())) p_vEEduAplctVO.setUserNm(this.decrypt(p_vEEduAplctVO.getUserNm())); + if (!"".equals(p_vEEduAplctVO.getInstrPhone())) p_vEEduAplctVO.setInstrPhone(this.decrypt(p_vEEduAplctVO.getInstrPhone())); return p_vEEduAplctVO; } diff --git a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java index 178e4609..1dc50ef8 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -334,6 +334,10 @@ public class FndtnEnhanceTrnController { model.addAttribute("list", vEPrcsDetailVOList); { + + vEPrcsDetailVO.setFirstIndex(0); + vEPrcsDetailVO.setRecordCountPerPage(10); + vEPrcsDetailVOList = vEPrcsAplctPrdService.selectPagingList4Fndth(vEPrcsDetailVO); // 이달의 과정 LIST // 날짜 형식 설정 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd"); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java index 3399326a..6a9eb984 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java @@ -347,6 +347,8 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { private String type; //첨부파일 삭제 종류 private String table; //첨부파일 삭제 테이블 + private String instrPhone; //강사 휴대폰 + public String getPrcsAplctPrdOrd() { return prcsAplctPrdOrd; @@ -1840,6 +1842,12 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { public void setSspnIdtmtTrgtOrdList(List sspnIdtmtTrgtOrdList) { this.sspnIdtmtTrgtOrdList = sspnIdtmtTrgtOrdList; } + public String getInstrPhone() { + return instrPhone; + } + public void setInstrPhone(String instrPhone) { + this.instrPhone = instrPhone; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java index 34e15253..1d39dfd4 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java @@ -101,4 +101,6 @@ public interface VEEduMIXService { List selectExprnEndPagingList(VEEduAplctVO paramVO) throws Exception; List selectEduCmpltCrtfcNmbrList(VEEduAplctVO vEEduAplctVO) throws Exception; + + List selectCndtnList(VEEduAplctVO paramVO); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java index ea597c3a..a8aef157 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java @@ -250,5 +250,9 @@ public class VEEduMIXDAO extends EgovAbstractDAO { public List selectEduCmpltCrtfcNmbrList(VEEduAplctVO vEEduAplctVO) { return (List) list("VEEduMIXDAO.selectEduCmpltCrtfcNmbrList", vEEduAplctVO); } + + public List selectCndtnList(VEEduAplctVO paramVO) { + return (List) list("VEEduMIXDAO.selectCndtnList", paramVO); + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java index bcafdf66..315d109c 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java @@ -221,5 +221,10 @@ public class VEEduMIXServiceImpl implements VEEduMIXService { @Override public List selectEduCmpltCrtfcNmbrList(VEEduAplctVO vEEduAplctVO) throws Exception { return vEEduMIXDAO.selectEduCmpltCrtfcNmbrList(vEEduAplctVO); + } + + @Override + public List selectCndtnList(VEEduAplctVO paramVO) { + return vEEduMIXDAO.selectCndtnList(paramVO); } } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java index e2c117a3..aa1a14f5 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java @@ -671,7 +671,8 @@ public class CndtnPrcsInfoMngController { - List vEPrcsDetailVOList = vEEduMIXService.selectList(paramVO); +// List vEPrcsDetailVOList = vEEduMIXService.selectList(paramVO); + List vEPrcsDetailVOList = vEEduMIXService.selectCndtnList(paramVO); vEPrcsDetailVOList = egovCryptoUtil.decryptVeEduAplctList(vEPrcsDetailVOList); 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 2f4a8af0..ff755cf0 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 @@ -147,7 +147,68 @@ a.EDU_APLCT_ORD = vadi.EDU_APLCT_ORD /* AND vpap.PRCS_APLCT_PRD_ORD = vadi.PRCS_APLCT_PRD_ORD */ JOIN LETTNGNRLMBER le ON - a.USER_ID = le.MBER_ID + a.USER_ID = le.ESNTL_ID + WHERE + 1=1 + + AND a.prcs_ord=#prcsOrd# + + + AND a.sbmt_yn=#sbmtYn# + + + + AND a.aprvl_cd = #searchSelStatus# + + + + $searchQuery$ + + + + AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') = ]]> REPLACE(#searchSmbtStartDt#, '.' , '') + + + + AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') REPLACE(#searchSmbtEndDt#, '.' , '') + + + AND a.use_yn = 'Y' + AND a.aprvl_cd != '40' /* 취소된 내역 안 보여줌 */ + + + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp index adc66de8..b4a39ab9 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp @@ -506,6 +506,7 @@ + " /> diff --git a/src/main/webapp/WEB-INF/jsp/web/cop/bbs/DataBoardList.jsp b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/DataBoardList.jsp new file mode 100644 index 00000000..76ef6bef --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/DataBoardList.jsp @@ -0,0 +1,63 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> + +
+ + + + +
+
+
+

자료실

+
+ +
    +
    • +
    • +
    • +
+ +
+ +
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/cop/bbs/DataBoardListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/DataBoardListAjax.jsp new file mode 100644 index 00000000..85519875 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/DataBoardListAjax.jsp @@ -0,0 +1,174 @@ + <%-- + Class Name : EgovNoticeList.jsp + Description : (사용자)게시물 목록화면 + Modification Information + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2009.03.19 이삼섭 최초 생성 + 2011.08.31 JJY 경량환경 버전 생성 + + author : 공통서비스 개발팀 이삼섭 + since : 2009.03.19 +--%> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> + + + +
+ + + + +
+
+ + +
+
+ + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호제목첨부작성일작성자조회수
+

+ 		+ ', '');"> + + + + + 첨부파일 있음 + +
+ 검색된 내용이 없습니다. +
+
+ +
+ +
    +
  • + 번호 + + + +
    • +
  • + 제목 + + ', '');"> + + + +
    • + +
  • + + 첨부 + 첨부파일 있음 + +
    • +     +
  • + 작성일 + +
    • +
  • + 작성자 + +
    • + + +
  • + 조회수 + +
    • +     +
+ + <%-- 게시물이 없을때 --%> + + + +
+ +
+
+
+
+
+
+ㅈ
+
+ +
+ +
+ + diff --git a/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovDataNoticeInqire.jsp b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovDataNoticeInqire.jsp new file mode 100644 index 00000000..1850f7ba --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovDataNoticeInqire.jsp @@ -0,0 +1,91 @@ +<%-- + Class Name : EgovNoticeInqire.jsp + Description : (사용자)게시물 조회 화면 + Modification Information + + 수정일 수정자 수정내용 + ---------- -------- --------------------------- + 2009.03.23 이삼섭 최초 생성 + 2009.06.26 한성곤 2단계 기능 추가 (댓글관리, 만족도조사) + 2011.08.31 JJY 경량환경 버전 생성 + 2013.05.23 이기하 상세보기 오류수정 + + author : 공통서비스 개발팀 이삼섭 + since : 2009.03.23 +--%> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> +<%@ 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"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%pageContext.setAttribute("crlf", "\r\n"); %> + + + + + + + + + + +
+
+

+
+
+
+ +
+
+

+
+

날짜

+

작성자

+

조회수

+
+
+
+

+ + + + + + +

+
+ +
+ + + + +
+ +
+
+
+
+
+
+
+ +
+
+ +
+ 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 72c2fc39..64458d42 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 @@ -11,10 +11,10 @@ 교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템 -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> + + + +