diff --git a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java b/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java index c923cd8a..b16ebf4f 100644 --- a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java +++ b/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java @@ -863,10 +863,13 @@ public class EduEndAdultController { @RequestMapping("eduEndQustnrNoLoginDetail.do") public String eduEndQustnrNoLoginDetail( - ModelMap model + @ModelAttribute("vEEduChasiVO") VEEduChasiVO vEEduChasiVO + , @ModelAttribute("qustnrRespondInfoVO") QustnrRespondInfoVO qustnrRespondInfoVO + , ModelMap model , HttpServletRequest request ) throws Exception { + /* //설문 정보 try { model = qustnrCommonUtil._qustnrQesItm( @@ -881,6 +884,44 @@ public class EduEndAdultController { }catch(Exception ex) { ex.printStackTrace(); } + */ + + String s_action = request.getParameter("action"); //insert or select + System.out.println("s_action"); + System.out.println(s_action); + System.out.println(vEEduChasiVO.getQustnrTmplatId()); + System.out.println(vEEduChasiVO.getQestnrId()); + System.out.println(vEEduChasiVO.getQustnrRespondId()); + + System.out.println(qustnrRespondInfoVO.getQustnrTmplatId()); + System.out.println(qustnrRespondInfoVO.getQestnrId()); + System.out.println(qustnrRespondInfoVO.getQustnrRespondId()); + //차시 정보 + try { + vEEduChasiVO.setInstrDiv(VeConstants.LCTR_DIV_CD_20); //10-청소년 강사, 20-성인강사 VE0001 + + VEEduChasiVO ChasiInfo = vEEduMIXService.selectChasiInfo(vEEduChasiVO); + ChasiInfo.setInstrNm(egovCryptoUtil.decrypt(ChasiInfo.getInstrNm())); + + ChasiInfo.setStrtTm(ChasiInfo.getStrtTm().substring(0,2)+":"+ChasiInfo.getStrtTm().substring(2,4)); + ChasiInfo.setEndTm(ChasiInfo.getEndTm().substring(0,2)+":"+ChasiInfo.getEndTm().substring(2,4)); + + model.addAttribute("chasiInfo", ChasiInfo); + + }catch(Exception ex) { + System.out.println("Exception vEEduAplctOnlnService.updateBulk"); + } + + //참석 답변 정보 + try { + List chasiSrvyList = egovQustnrRespondInfoService.selectChasiSrvyList202312(qustnrRespondInfoVO); + model.addAttribute("qestnrRespondent", chasiSrvyList.get(0).getQestnrRespondent()); + model.addAttribute("qestnrParticipant", chasiSrvyList.get(0).getQestnrParticipant()); + model.addAttribute("chasiSrvyList", chasiSrvyList); + model.addAttribute("chasiSrvyListSize", chasiSrvyList.size()); + }catch(Exception ex) { + System.out.println("Exception vEEduAplctOnlnService.updateBulk"); + } return "/web/ve/comm/eduEndQustnrNoLoginDetail"; } diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java index 9027434f..46b7be66 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java @@ -522,7 +522,7 @@ public class ScholInfoController { //차시 정보 try { - vEEduChasiVO.setInstrDiv(VeConstants.LCTR_DIV_CD_10); //10-청소년 강사, 20-성인강사 VE0001 + //vEEduChasiVO.setInstrDiv(VeConstants.LCTR_DIV_CD_10); //10-청소년 강사, 20-성인강사 VE0001 VEEduChasiVO ChasiInfo = vEEduMIXService.selectChasiInfo(vEEduChasiVO); ChasiInfo.setInstrNm(egovCryptoUtil.decrypt(ChasiInfo.getInstrNm())); diff --git a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java index 5eff0ba2..47e1c39e 100644 --- a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java +++ b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java @@ -1150,6 +1150,7 @@ public class EduEndTngrController { } + //사용자 QR 설문 페이지 - 성인, 청소년 공통 처리 @RequestMapping("eduEndQustnrNoLoginDetail.do") public String eduEndQustnrNoLoginDetail( @ModelAttribute("vEEduChasiVO") VEEduChasiVO vEEduChasiVO @@ -1187,7 +1188,7 @@ public class EduEndTngrController { System.out.println(qustnrRespondInfoVO.getQustnrRespondId()); //차시 정보 try { - vEEduChasiVO.setInstrDiv(VeConstants.LCTR_DIV_CD_10); //10-청소년 강사, 20-성인강사 VE0001 + //vEEduChasiVO.setInstrDiv(VeConstants.LCTR_DIV_CD_10); //10-청소년 강사, 20-성인강사 VE0001 VEEduChasiVO ChasiInfo = vEEduMIXService.selectChasiInfo(vEEduChasiVO); ChasiInfo.setInstrNm(egovCryptoUtil.decrypt(ChasiInfo.getInstrNm())); diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp index 0603a6ef..b0be4da5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp @@ -226,6 +226,8 @@ ,"qustnrTmplatId" : p_qustnrTmplatId ,"qestnrId" : p_qestnrId ,"qustnrRespondId" : p_qustnrRespondId + + ,"instrDiv" : "20" //10-청소년, 20-성인 }; commonPopLayeropen( diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPrintPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPrintPopList.jsp index 6c44bef6..b0bf8128 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPrintPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPrintPopList.jsp @@ -434,46 +434,7 @@ $(document).ready(function(){ -
- - - -
- -
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp index c1f86f98..23ae1645 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp @@ -457,6 +457,7 @@ $(document).ready(function(){ url += "&siteIdCd=${vEEduChasiVO.siteIdCd}"; url += "&eduAplctOrd=${vEEduChasiVO.eduAplctOrd}"; url += "&eduChasiOrd=${vEEduChasiVO.eduChasiOrd}"; + url += "&instrDiv=${vEEduChasiVO.instrDiv}"; makeCode(url); diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp index 881dae32..67901e29 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp @@ -156,6 +156,42 @@ , "scholPrintPop" ); } + + //설문 출력 팝업 - QR 코드만 + function fncQustnrQRPrintList( + id //aplctOrd + , chId //chasiOrd + , p_site_id_cd //10,20,30 + , p_action //select, insert + , p_qustnrTmplatId //select, insert + , p_qestnrId //select, insert + , p_qustnrRespondId //select, insert + ) { + + paramObj = { + "eduAplctOrd" : id + ,"eduChasiOrd" : chId + ,"siteIdCd" : p_site_id_cd + + ,"action" : p_action + + ,"qustnrTmplatId" : p_qustnrTmplatId + ,"qestnrId" : p_qestnrId + ,"qustnrRespondId" : p_qustnrRespondId + + ,"instrDiv" : "10" //10-청소년, 20-성인 + + }; + + commonPopLayeropen( + "${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/qustnrQRPrintPopList.do" + , 800 + , 700 + , paramObj + , "Y" + , "scholPrintPop" + ); + } function selectChasiStatus(id, chId, p_site_id_cd, action){ $.ajax({ @@ -1078,9 +1114,9 @@ - + - +