From 6f1a89e7de5a302612bbb6274085d63968c855f6 Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 13 Dec 2023 10:39:08 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20>=20=EB=82=B4=20=EB=AC=B8=EC=9D=98=EB=82=B4?= =?UTF-8?q?=EC=9A=A9=20=EB=A6=AC=EC=8A=A4=ED=8A=B8,=20=EC=83=81=EC=84=B8?= =?UTF-8?q?=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kcc/let/my/web/MyPageController.java | 57 +++++++- .../sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml | 8 +- .../WEB-INF/jsp/web/my/myQnaMngDetail.jsp | 129 ++++++++++++++++++ .../WEB-INF/jsp/web/my/myQnaMngList.jsp | 79 +++++------ 4 files changed, 230 insertions(+), 43 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/web/my/myQnaMngDetail.jsp diff --git a/src/main/java/kcc/let/my/web/MyPageController.java b/src/main/java/kcc/let/my/web/MyPageController.java index fca0fbed..bec3e493 100644 --- a/src/main/java/kcc/let/my/web/MyPageController.java +++ b/src/main/java/kcc/let/my/web/MyPageController.java @@ -21,6 +21,7 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.Font; @@ -89,6 +90,7 @@ import kcc.let.sym.site.service.SiteManagerVO; import kcc.let.uat.uia.service.SsoLoginVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; import kcc.let.utl.sim.service.EgovClntInfo; +import kcc.ve.aplct.fndtnEnhanceTrn.service.FndtnEnhanceTrnService; import kcc.ve.cmm.VeConstants; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiVO; @@ -139,6 +141,11 @@ public class MyPageController { @Resource(name = "vEPrcsService") private VEPrcsService vEPrcsService; + //온라인콘텐츠과정 관리 + @Resource(name = "fndtnEnhanceTrnService") + private FndtnEnhanceTrnService fndtnEnhanceTrnService; + + private static final Logger LOGGER = LoggerFactory.getLogger(MyPageController.class); @RequestMapping(value = { "/web/my/myPageDashBoard.do" }) @@ -149,9 +156,7 @@ public class MyPageController { SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); // SSO 로그인 정보 가져오기 if (loginVO == null || ssoLoginVO == null) { - // 이전 url 처리(beforeSiteUrl)_이준호_220228추가 return checkLoginUtil.getUserLoginPage(model, request); // 로그인 정보가 없으면 로그인 페이지로 이동한다. -// return checkLoginUtil.getUserLoginPage(model); //로그인 정보가 없으면 로그인 페이지로 이동한다. } /* @@ -308,23 +313,35 @@ public class MyPageController { , ModelMap model ) throws Exception { + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); // 권한에 따른 로그인 정보 가져오기 //1.pageing step1 PaginationInfo paginationInfo = this.setPagingStep1(vEPrcsDetailVO); //2. pageing step2 vEPrcsDetailVO = this.setPagingStep2(vEPrcsDetailVO, paginationInfo); + + vEPrcsDetailVO.setQnaRegist(loginVO.getUniqId()); + + + if(StringUtils.isNotEmpty(vEPrcsDetailVO.getSearchStatus())) { + String status = ""; + if("Y".equals(vEPrcsDetailVO.getSearchStatus())) + status = "IS NOT NULL"; + if("N".equals(vEPrcsDetailVO.getSearchStatus())) + status = "IS NULL"; + + vEPrcsDetailVO.setSearchQuery(" AND qn.QNA_ANSWER_CN "+status); + } List vEPrcsDetailVOList = vEPrcsService.selectQnaPagingList(vEPrcsDetailVO); //3.pageing step3 paginationInfo = this.setPagingStep3(vEPrcsDetailVOList, paginationInfo); - model.addAttribute("paginationInfo", paginationInfo); // 사용자 이름 디코딩 vEPrcsDetailVOList.stream().forEach(t->t.setMberNm(egovCryptoUtil.decrypt(t.getMberNm()))); - //대상 리스트, 페이징 정보 전달 model.addAttribute("list", vEPrcsDetailVOList); @@ -332,6 +349,38 @@ public class MyPageController { } + @RequestMapping(value = { "/web/my/myQnaMngDetail.do"}) + public String myQnaMngDetail( + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + , ModelMap model + , RedirectAttributes redirectAttributes + , HttpSession session + , HttpServletRequest request + ) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + if (loginVO == null || ssoLoginVO == null) { + //이전 url 처리(beforeSiteUrl)_이준호_220228추가 + return checkLoginUtil.getUserLoginPage(model, request); //로그인 정보가 없으면 로그인 페이지로 이동한다. + } + //로그인 처리==================================== + + //과정 조회 + VEPrcsDetailVO vEPrcsQnaDetail = vEPrcsService.selectQnaDetail(vEPrcsDetailVO); + vEPrcsQnaDetail.setMberNm(egovCryptoUtil.decrypt(vEPrcsQnaDetail.getMberNm())); + + model.addAttribute("info", vEPrcsQnaDetail); + //세부과정 목록 조회 + + return "web/my/myQnaMngDetail"; + } + + + ////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml index 4d1fa45f..10c7cd21 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml @@ -395,7 +395,13 @@ AND TO_CHAR(qn.FRST_REGIST_PNTTM, 'YYYYMMDD') REPLACE(#searchSmbtEndDt#, '.' , '') - + + AND QNA_REGIST = #qnaRegist# + + + $searchQuery$ + + OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; diff --git a/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngDetail.jsp new file mode 100644 index 00000000..2ced315e --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngDetail.jsp @@ -0,0 +1,129 @@ +<%@ page 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="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + + +<% pageContext.setAttribute("replaceChar", "\n"); %> + + + + + +
+ +
+
+
+

내 교육문의 상세

+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
질문자ID + +
질문자 이름 + +
질문내용 + +
답변상태 + + + 미완료 + + + 완료 + + +
답변일시 + + + - + + + + + +
답변내용 + +
+ + +
+
+
+
+
+
+
+ +
+
+ + +
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngList.jsp b/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngList.jsp index 76e8ccc3..a79a85aa 100644 --- a/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngList.jsp @@ -16,27 +16,45 @@ $(document).ready(function(){ - + $('#searchStatus').change(function(){ + fncGoList(); + }); }); + +function fncGoList(){ + linkPage(1); +} + +function linkPage(pageNo){ + var listForm = document.listForm ; + listForm.pageIndex.value = pageNo ; + listForm.action = ""; + listForm.submit(); +} + +function fncGoDetail(p_pk){ + console.log('p_pk: ', p_pk); + var form = document.deatilForm ; + form.prcsAplctPrdQnaOrd.value = p_pk ; + form.action = ""; + form.submit(); +} + + + +
-
- + + +
-
- -
-
-
- - " /> - " />

내 교육문의

@@ -45,32 +63,17 @@ $(document).ready(function(){
- <%--
-
- - -
-
-
- - + +
+
+ +
- ~ -
- - -
- - -
-
--%> -
@@ -93,10 +96,10 @@ $(document).ready(function(){ - + ');" style="cursor:pointer;"> - + ');" style="cursor:pointer;"> @@ -116,7 +119,7 @@ $(document).ready(function(){ - + From 9d9023647ce3f20c41c4c03310d145b7c08c67b6 Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 13 Dec 2023 10:57:12 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EB=82=B4=20=EA=B5=90=EC=9C=A1=20=EB=AC=B8=EC=9D=98?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kcc/let/my/web/MyPageController.java | 12 +- .../WEB-INF/jsp/web/my/myPageDashBoard.jsp | 120 ++++++++++++++++++ .../WEB-INF/jsp/web/my/myQnaMngDetail.jsp | 5 +- .../WEB-INF/jsp/web/my/myQnaMngList.jsp | 2 - 4 files changed, 134 insertions(+), 5 deletions(-) diff --git a/src/main/java/kcc/let/my/web/MyPageController.java b/src/main/java/kcc/let/my/web/MyPageController.java index bec3e493..6f35d776 100644 --- a/src/main/java/kcc/let/my/web/MyPageController.java +++ b/src/main/java/kcc/let/my/web/MyPageController.java @@ -302,6 +302,16 @@ public class MyPageController { } + { + + VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO(); + vEPrcsDetailVO.setRecordCountPerPage(3); + vEPrcsDetailVO.setFirstIndex(0); + vEPrcsDetailVO.setQnaRegist(loginVO.getUniqId()); + List qnaList = vEPrcsService.selectQnaPagingList(vEPrcsDetailVO); + model.addAttribute("qnaList", qnaList); + } + // return "/web/cop/bbs/FaqListAjax"; return "web/my/myPageDashBoard"; } @@ -340,7 +350,7 @@ public class MyPageController { model.addAttribute("paginationInfo", paginationInfo); // 사용자 이름 디코딩 - vEPrcsDetailVOList.stream().forEach(t->t.setMberNm(egovCryptoUtil.decrypt(t.getMberNm()))); +// vEPrcsDetailVOList.stream().forEach(t->t.setMberNm(egovCryptoUtil.decrypt(t.getMberNm()))); //대상 리스트, 페이징 정보 전달 model.addAttribute("list", vEPrcsDetailVOList); diff --git a/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp b/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp index 4ffc8a05..9b946149 100644 --- a/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp @@ -48,13 +48,26 @@ } + function qnaGoDetail(p_pk){ + var form = document.deatilForm ; + form.prcsAplctPrdQnaOrd.value = p_pk ; + form.action = ""; + form.submit(); + } + + + + +
+ +
@@ -401,6 +414,113 @@
+
+
+
+
+
내 문의 목록
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
내 문의 목록표
강의구분문의내용문의일시답변여부
');" style="cursor:pointer;"> + + ');" style="cursor:pointer;"> + + + + + + + - + + + 완료 + + + +
+
+ <%--
+
+
+
실무역량강화 교육
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
실무역량강화 교육 목록표
과정명교육시작일교육종료일신청결과
+ + + + + + + + + + + + + + +
+
--%> +
diff --git a/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngDetail.jsp index 2ced315e..2e63a52b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngDetail.jsp @@ -58,7 +58,7 @@ - + <%-- 질문자ID @@ -70,12 +70,13 @@ + --%> 질문내용 - + 답변상태 diff --git a/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngList.jsp b/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngList.jsp index a79a85aa..651c425c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngList.jsp @@ -33,7 +33,6 @@ function linkPage(pageNo){ } function fncGoDetail(p_pk){ - console.log('p_pk: ', p_pk); var form = document.deatilForm ; form.prcsAplctPrdQnaOrd.value = p_pk ; form.action = ""; @@ -51,7 +50,6 @@ function fncGoDetail(p_pk){
-
From cf37bc3a1ba7398becb78c501cb18eefa528b4a1 Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 13 Dec 2023 11:57:49 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=EA=B5=90=EC=9C=A1=EB=AC=B8=EC=9D=98=20sele?= =?UTF-8?q?ct=20list=20/=20order=20by=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml index 10c7cd21..9fd7e945 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml @@ -401,6 +401,7 @@ $searchQuery$ + ORDER BY qn.FRST_REGIST_PNTTM desc OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; From 73c93f2c55fd920b36442e0e9f9aca424e741340 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Wed, 13 Dec 2023 15:03:52 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=9A=B4?= =?UTF-8?q?=EC=98=81=EC=84=9C=EB=B2=84=20DB(svr)=20=EC=9A=B4=EC=98=81=20DB?= =?UTF-8?q?=EB=A1=9C=20=EC=97=B0=EA=B2=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/egovframework/egovProps/globals_svr.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/egovframework/egovProps/globals_svr.properties b/src/main/resources/egovframework/egovProps/globals_svr.properties index b2504aa9..66d75529 100644 --- a/src/main/resources/egovframework/egovProps/globals_svr.properties +++ b/src/main/resources/egovframework/egovProps/globals_svr.properties @@ -29,9 +29,9 @@ Globals.DriverClassName=com.tmax.tibero.jdbc.TbDriver #\ub85c\uceec DB #Globals.Url=jdbc:tibero:thin:@192.168.0.30:8633:tibero #\uc6b4\uc601 \uac1c\ubc1cDB - \ud14c\uc2a4\ud2b8 \uc644\ub8cc \ud6c4 \uc6b4\uc601 DB\ub85c \ubcc0\uacbd \uc608\uc815 -Globals.Url=jdbc:tibero:thin:@10.255.3.58:8629:copydb +#Globals.Url=jdbc:tibero:thin:@10.255.3.58:8629:copydb #\uc6b4\uc601 DB -#Globals.Url=jdbc:tibero:thin:@172.17.0.10:8629:copydb +Globals.Url=jdbc:tibero:thin:@172.17.0.10:8629:copydb # \uc800\uc791\uc704 \ubb38\uc790\uc804\uc1a1 DB(\uac1c\ubc1c) From d6395a9c5becdf3ce8bc360941d82fe20f8ffcb9 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Wed, 13 Dec 2023 16:01:54 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90=20=EC=B2=B4=ED=97=98=EA=B5=90=EC=8B=A4=20?= =?UTF-8?q?=EB=82=98=EC=9D=98=20=EA=B0=95=EC=9D=98=EC=8B=A4=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp | 7 +++++++ .../exprnClsrmInfo/exprnClsrmAplctDashboard.jsp | 8 +++++--- .../exprnClsrmInfo/exprnDocumentDashboard.jsp | 7 +++++++ 3 files changed, 19 insertions(+), 3 deletions(-) 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 318841bf..7dcfe1b5 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 @@ -262,6 +262,13 @@ } function validCheck(){ + var oathAtchFileId = '${info.oathAtchFileId}'; + + if(oathAtchFileId == null || oathAtchFileId == ''){ + alert("서약서를 제출해주세요."); + return false; + } + if($('#trgtGrade').val() == ''){ alert('대상학년/반을 입력해주세요.'); $("#trgtGrade").focus(); diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp index 6eb96129..f69034cc 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp @@ -21,14 +21,16 @@