diff --git a/src/main/java/kcc/let/my/web/MyPageController.java b/src/main/java/kcc/let/my/web/MyPageController.java index fca0fbed..6f35d776 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); //로그인 정보가 없으면 로그인 페이지로 이동한다. } /* @@ -297,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"; } @@ -308,22 +323,34 @@ 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()))); - +// vEPrcsDetailVOList.stream().forEach(t->t.setMberNm(egovCryptoUtil.decrypt(t.getMberNm()))); //대상 리스트, 페이징 정보 전달 model.addAttribute("list", vEPrcsDetailVOList); @@ -332,6 +359,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/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/web/EduAplctTngrController.java b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/web/EduAplctTngrController.java index 4f5f5e48..40af68c6 100644 --- a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/web/EduAplctTngrController.java +++ b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/web/EduAplctTngrController.java @@ -36,6 +36,9 @@ import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrMixService; +import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsMIXService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsOnlnCntntService; @@ -137,7 +140,11 @@ public class EduAplctTngrController { @Resource(name = "vEAStngService") private VEAStngService vEAStngService; - + + //rkdtk 관리 + @Resource(name = "vEInstrMixService") + private VEInstrMixService vEInstrMixService; + /* * START @@ -633,7 +640,7 @@ public class EduAplctTngrController { */ @RequestMapping("eduInstrAsgnmChkAjax.do") public ModelAndView eduInstrAsgnmChkAjax( - @ModelAttribute("vEAStngVO") VEAStngVO vEAStngVO + @ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO , ModelMap model , HttpServletRequest request ) throws Exception { @@ -649,9 +656,8 @@ public class EduAplctTngrController { System.out.println(request.getParameter("userId")); System.out.println(request.getParameter("eduAplctOrd")); System.out.println(request.getParameter("eduChasiOrd")); - - //String s_message = vEAStngMixService.eduAplctDateChkProcess(vEAStngVO, request, modelAndView); - + + VELctrDetailVO instrInfo = vEInstrMixService.findByIdFromVeInstr(vEInstrDetailVO); //vEAStngMixService.selectDetail_VEADPTQS(paramVO) //ㅁ /* diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrMixService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrMixService.java index 03ec22bc..45d22b1d 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrMixService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrMixService.java @@ -92,4 +92,6 @@ public interface VEInstrMixService { //교육실정통계-기반강화 List selectEduPrfrmInfoFndthEnhanceTrn(VEInstrDetailVO vEInstrDetailVO) throws Exception; + + VELctrDetailVO findByIdFromVeInstr(VEInstrDetailVO vEInstrDetailVO); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixDAO.java index 1abdf178..ca5deee0 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixDAO.java @@ -208,5 +208,9 @@ public class VEInstrMixDAO extends EgovAbstractDAO { List tlist = (List) list("VEInstrMixDAO.selectEduPrfrmInfoFndthEnhanceTrn", vEInstrDetailVO); return tlist; } + + public VELctrDetailVO findByIdFromVeInstr(VEInstrDetailVO vEInstrDetailVO) { + return (VELctrDetailVO) select("VEInstrMixDAO.findByIdFromVeInstr", vEInstrDetailVO); + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixServiceImpl.java index e79772b9..c1c6eaf2 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixServiceImpl.java @@ -154,4 +154,9 @@ public class VEInstrMixServiceImpl implements VEInstrMixService { public List selectEduPrfrmInfoFndthEnhanceTrn(VEInstrDetailVO vEInstrDetailVO) throws Exception{ return vEInstrMixDAO.selectEduPrfrmInfoFndthEnhanceTrn(vEInstrDetailVO); } + + @Override + public VELctrDetailVO findByIdFromVeInstr(VEInstrDetailVO vEInstrDetailVO) { + return vEInstrMixDAO.findByIdFromVeInstr(vEInstrDetailVO); + } } 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) diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Cubrid.xml index 84375926..a9d0bdcb 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Cubrid.xml @@ -1,2646 +1,2646 @@ - - - - - - - - - - - - - - ve_instr - - - - - user_id, - tngr_instr_yn, - adult_instr_yn, - frst_regist_pnttm, - frst_register_id, - last_updt_pnttm, - last_updusr_id - - - - - - a.user_id AS userId, - a.tngr_instr_yn AS tngrInstrYn, - a.adult_instr_yn AS adultInstrYn, - - DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d') AS frstRegistPnttm, - a.frst_register_id AS frstRegisterId, - DATE_FORMAT(a.last_updt_pnttm,'%Y-%m-%d') AS lastUpdtPnttm, - a.last_updusr_id AS lastUpdusrId - - - - - - ve_instr_detail - - - - - instr_div, - user_id, - instr_detail_ord, - - instr_nm, - phone, - email, - post, - addr, - addr_detail, - rsdne, - d_birth, - final_schol, - mjr, - appt_yr, - appt_div, - actvt_carer, - mn_lctr_cn, - pht_atch_file_id, - blng, - pstn, - prfsn_fld, - sbmt_yn, - sbmt_pnttm, - aprvl_cd, - aprvl_pnttm, - aprvl_id, - aprvl_cn, - frst_regist_pnttm, - frst_register_id, - last_updt_pnttm, - last_updusr_id, - - use_yn, - qlfct_end_yn, - qlfct_end_pnttm, - qlfct_end_cn - - - - - - a.instr_div AS instrDiv, - a.user_id AS userId, - a.instr_detail_ord AS instrDetailOrd, - - a.instr_nm AS instrNm, - a.phone AS phone, - a.email AS email, - a.post AS post, - a.addr AS addr, - a.addr_detail AS addrDetail, - a.rsdne AS rsdne, - a.d_birth AS dBirth, - a.final_schol AS finalSchol, - a.mjr AS mjr, - a.appt_yr AS apptYr, - a.appt_div AS apptDiv, - a.actvt_carer AS actvtCarer, - a.mn_lctr_cn AS mnLctrCn, - a.pht_atch_file_id AS phtAtchFileId, - a.blng AS blng, - a.pstn AS pstn, - a.prfsn_fld AS prfsnFld, - a.sbmt_yn AS sbmtYn, - a.sbmt_pnttm AS sbmtPnttm, - a.aprvl_cd AS aprvlCd, - - DATE_FORMAT(a.aprvl_pnttm,'%Y-%m-%d') AS aprvlPnttm, - - a.aprvl_id AS aprvlId, - a.aprvl_cn AS aprvlCn, - - DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d') AS frstRegistPnttm, - a.frst_register_id AS frstRegisterId, - DATE_FORMAT(a.last_updt_pnttm,'%Y-%m-%d') AS lastUpdtPnttm, - a.last_updusr_id AS lastUpdusrId, - - a.use_yn AS useYn, - a.qlfct_end_yn AS qlfctEndYn, - a.qlfct_end_pnttm AS qlfctEndPnttm, - a.qlfct_end_cn AS qlfctEndCn, - a.div_cd AS divCd - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UPDATE - - SET - use_yn = 'N' - WHERE - instr_div = #instrDiv# - AND user_id = #userId# - AND instr_detail_ord != #instrDetailOrd# - - - - - - UPDATE - - SET - pht_atch_file_id = '' - WHERE - instr_div = #instrDiv# - AND user_id = #userId# - AND instr_detail_ord != #instrDetailOrd# - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + ve_instr + + + + + user_id, + tngr_instr_yn, + adult_instr_yn, + frst_regist_pnttm, + frst_register_id, + last_updt_pnttm, + last_updusr_id + + + + + + a.user_id AS userId, + a.tngr_instr_yn AS tngrInstrYn, + a.adult_instr_yn AS adultInstrYn, + + DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d') AS frstRegistPnttm, + a.frst_register_id AS frstRegisterId, + DATE_FORMAT(a.last_updt_pnttm,'%Y-%m-%d') AS lastUpdtPnttm, + a.last_updusr_id AS lastUpdusrId + + + + + + ve_instr_detail + + + + + instr_div, + user_id, + instr_detail_ord, + + instr_nm, + phone, + email, + post, + addr, + addr_detail, + rsdne, + d_birth, + final_schol, + mjr, + appt_yr, + appt_div, + actvt_carer, + mn_lctr_cn, + pht_atch_file_id, + blng, + pstn, + prfsn_fld, + sbmt_yn, + sbmt_pnttm, + aprvl_cd, + aprvl_pnttm, + aprvl_id, + aprvl_cn, + frst_regist_pnttm, + frst_register_id, + last_updt_pnttm, + last_updusr_id, + + use_yn, + qlfct_end_yn, + qlfct_end_pnttm, + qlfct_end_cn + + + + + + a.instr_div AS instrDiv, + a.user_id AS userId, + a.instr_detail_ord AS instrDetailOrd, + + a.instr_nm AS instrNm, + a.phone AS phone, + a.email AS email, + a.post AS post, + a.addr AS addr, + a.addr_detail AS addrDetail, + a.rsdne AS rsdne, + a.d_birth AS dBirth, + a.final_schol AS finalSchol, + a.mjr AS mjr, + a.appt_yr AS apptYr, + a.appt_div AS apptDiv, + a.actvt_carer AS actvtCarer, + a.mn_lctr_cn AS mnLctrCn, + a.pht_atch_file_id AS phtAtchFileId, + a.blng AS blng, + a.pstn AS pstn, + a.prfsn_fld AS prfsnFld, + a.sbmt_yn AS sbmtYn, + a.sbmt_pnttm AS sbmtPnttm, + a.aprvl_cd AS aprvlCd, + + DATE_FORMAT(a.aprvl_pnttm,'%Y-%m-%d') AS aprvlPnttm, + + a.aprvl_id AS aprvlId, + a.aprvl_cn AS aprvlCn, + + DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d') AS frstRegistPnttm, + a.frst_register_id AS frstRegisterId, + DATE_FORMAT(a.last_updt_pnttm,'%Y-%m-%d') AS lastUpdtPnttm, + a.last_updusr_id AS lastUpdusrId, + + a.use_yn AS useYn, + a.qlfct_end_yn AS qlfctEndYn, + a.qlfct_end_pnttm AS qlfctEndPnttm, + a.qlfct_end_cn AS qlfctEndCn, + a.div_cd AS divCd + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UPDATE + + SET + use_yn = 'N' + WHERE + instr_div = #instrDiv# + AND user_id = #userId# + AND instr_detail_ord != #instrDetailOrd# + + + + + + UPDATE + + SET + pht_atch_file_id = '' + WHERE + instr_div = #instrDiv# + AND user_id = #userId# + AND instr_detail_ord != #instrDetailOrd# + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml index d1e35588..872bcb0c 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml @@ -3443,4 +3443,24 @@ on(bbb.prcs_aplct_prd_ord=aaa.prcsOrd) GROUP BY rollup(yr, bbb.prcs_nm) + + 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..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 @@ -395,7 +395,14 @@ AND TO_CHAR(qn.FRST_REGIST_PNTTM, 'YYYYMMDD') REPLACE(#searchSmbtEndDt#, '.' , '') - + + AND QNA_REGIST = #qnaRegist# + + + $searchQuery$ + + ORDER BY qn.FRST_REGIST_PNTTM desc + OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; 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 new file mode 100644 index 00000000..2e63a52b --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngDetail.jsp @@ -0,0 +1,130 @@ +<%@ 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..651c425c 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,43 @@ $(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){ + var form = document.deatilForm ; + form.prcsAplctPrdQnaOrd.value = p_pk ; + form.action = ""; + form.submit(); +} + + + +
-
- + +
-
- -
-
-
- - " /> - " />

내 교육문의

@@ -45,32 +61,17 @@ $(document).ready(function(){
- <%--
-
- - -
-
-
- - + +
+
+ +
- ~ -
- - -
- - -
-
--%> -
@@ -93,10 +94,10 @@ $(document).ready(function(){ - + ');" style="cursor:pointer;"> - + ');" style="cursor:pointer;"> @@ -116,7 +117,7 @@ $(document).ready(function(){ - + 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 @@