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 46b7be66..0e271025 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 @@ -356,6 +356,75 @@ public class ScholInfoController { return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList"; } + /** + * 설문 팝업 리스트 - 실무, 기소 + */ + @RequestMapping("popup/qustnrFndtnPopList.do") + public String qustnrFndtnPopList( + @ModelAttribute("vEEduChasiVO") VEEduChasiVO vEEduChasiVO + , QustnrRespondInfoVO qustnrRespondInfoVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + 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_10); //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); + }catch(Exception ex) { + System.out.println("Exception vEEduAplctOnlnService.updateBulk"); + } + + + //설문 참여 정보 + /* + try { + model = qustnrCommonUtil._qustnrQesItm( + model + , VeConstants.LCTR_DIV_CD_10 //청소년 -10, 성인-20, ...VE0012 + , "10" //10-기본설문, 20-신청자설문, 30-강사설문 VEA012 + , "QTMPLA_0000000000001" + , vEALettnQestnrMIXService + , egovQustnrRespondInfoService + ); + + }catch(Exception ex) { + ex.printStackTrace(); + } + */ + + return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrFndtnPopList"; + } + /** * 설문 출력 팝업 리스트 */ 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 7a589d85..caa70c81 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -420,6 +420,7 @@ public class FndtnEnhanceTrnController { if(StringUtil.isEmpty(vEPrcsDetailVO.getPrcsDiv())) { //vEPrcsDetailVO.setPrcsDiv("10");// 과정구분 VE0015 10-산업종사자, 20-대학생, 30-공무원, 40-일반인, 50-청소년, 60-학부모 + vEPrcsDetailVO.setSiteId("50"); } List vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlList(vEPrcsDetailVO); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryVO.java index 8d8a78e4..a87ea799 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryVO.java @@ -57,6 +57,10 @@ public class VEInstrDetailActvtHstryVO extends ComDefaultVO implements Serializa private String docuNmbrDp = ""; //문서번호-표시용 + private String cnt = ""; //횟수 + private String chasiSum = ""; //차시 합계 + + public String getInstrDetailActvtHstryOrd() { return instrDetailActvtHstryOrd; @@ -208,6 +212,18 @@ public class VEInstrDetailActvtHstryVO extends ComDefaultVO implements Serializa public void setDocuNmbrDp(String docuNmbrDp) { this.docuNmbrDp = docuNmbrDp; } + public String getCnt() { + return cnt; + } + public void setCnt(String cnt) { + this.cnt = cnt; + } + public String getChasiSum() { + return chasiSum; + } + public void setChasiSum(String chasiSum) { + this.chasiSum = chasiSum; + } diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml index 6168c758..5fe96e69 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml @@ -133,15 +133,38 @@ TO_CHAR(a.state_pnttm, 'YYYY') ||'-'||a.docu_nmbr||'호' AS docuNmbrDp , b.INSTR_NM AS instrNm , + + , c.cnt + , c.chasiSum FROM a JOIN ve_instr_detail b ON a.user_id = b.user_id AND a.instr_detail_ord = b.instr_detail_ord - + left outer join + ( + + SELECT c.USER_ID AS userId + , count(*) AS cnt + , sum(b.chasi) AS chasiSum + FROM ve_edu_aplct a + , ve_edu_chasi b + , ve_edu_chasi_instr_asgnm c + WHERE a.EDU_APLCT_ORD =b.EDU_APLCT_ORD + AND b.EDU_APLCT_ORD =c.EDU_APLCT_ORD + AND b.EDU_CHASI_ORD =c.EDU_CHASI_ORD + AND a.aprvl_cd='60' + AND c.asgnm_aprvl_Cd='30' + GROUP BY c.USER_ID + + )c + on( + a.user_id=c.userId + ) WHERE 1=1 AND a.docu_nmbr IS not null + b.INSTR_NM = #searchKeyword# diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml index 7c7d5019..5a3ee940 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml @@ -649,7 +649,9 @@ LETTNQESTNRRSLTDETAIL lersltD WHERE lersltD.respond_id = a.USER_ID - AND a.edu_aplct_ord = lersltD.edu_aplct_ord ) THEN 1 + AND a.edu_aplct_ord = lersltD.edu_aplct_ord + AND i.qestnr_id_10 = lersltD.qestnr_id + ) THEN 1 ELSE 0 END AS qestRsltExists @@ -726,7 +728,7 @@ FROM LETTNQESTNRINFO a WHERE - a.SITE_ID = '10' + a.SITE_ID = #siteId# AND a.SITE_ID_CD IN ('10', '20', '30') AND TO_CHAR(SYSDATE, 'YYYY.MM.DD') BETWEEN NVL(a.qustnr_bgnde, diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/instrActvtHstrySignMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/instrActvtHstrySignMngList.jsp index 17b2173a..f9522ff4 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/instrActvtHstrySignMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/instrActvtHstrySignMngList.jsp @@ -172,13 +172,12 @@ - + + + + + - - - - - <%-- --%> <%-- --%> @@ -187,14 +186,14 @@ 번호 - 강사명 - 성별 - 용도 - 사업자명
사업자등록번호 - 신청일 - 처리일 + 항목 문서번호 - 발급상태 + 횟수 + 차시 + 성명 + 발급일자 + 비고 + @@ -204,35 +203,9 @@ - + 강사활동확인서 - - - - - - - -
- () - - - - - - - - - - - - - - - - - - @@ -242,8 +215,22 @@ + + + + + + + + + + - + + + + + - diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrFndtnPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrFndtnPopList.jsp new file mode 100644 index 00000000..a6c032cd --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrFndtnPopList.jsp @@ -0,0 +1,531 @@ +<%-- + + Class Name : qustnrFndtnPopList.jsp + Description : 설문팝업 + Modification Information + + 1.강의 종류(청소년, 성인 ... VE0011) 및 설문 종류 (10-기본, 20-신청자, 30-강사) 및 상태(등록, 완료) 에 맞는 설문 레이어 팝업을 만든다. + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2021.12.02 조용준 내용 + + author : 조용준 + since : 2021.12.02 + +--%> +<%@ 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"%> + + + + +
+ + + + + + +
+
+

강의만족도 결과 등록

+
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
교육일, 차시, 구분, 대상, 배정강사, 인원, 설문완료 여부 등의 정보제공
교육일차시구분대상배정강사인원설문완료 여부
+ + + ~ + + + + + + + + + + + + 설문진행중 + + + 설문완료 + + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
참석자, 응답율, 응답자, 무응답에 대한 정보를 제공/입력
+

참석자

+ 		+ + "> + +

응답율

+ 		-
+

응답자

+ 		+ + " onblur="replyCalculation(); return false;"> + +

무응답

+ 		-
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
평가문항, 매우만족, 만족, 보통, 불만족, 매우 불만족 입력
평가문항매우만족만족보통불만족매우불만족
+ ${status1.count}) + + (최대선택건수 ${QestmInfo.mxmmChoiseCo}) + + + + + + + + + + + + + + + + + + + +
+ +
+
+ + + + + +
+
+
+
+ + + + +
+
+
+
+ + + + + + + +
+
+
+
+ + +
+
+
+
+ + + + + + + + + +
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp index df73014e..2411d164 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp @@ -49,7 +49,7 @@ $(document).ready(function(){ } } - function linkPage(pageNo){ + function linkPageTop(pageNo){ var listForm = document.listForm ; listForm.pageIndex.value = pageNo ; listForm.action = ""; @@ -65,7 +65,7 @@ $(document).ready(function(){ function fncGoList(){ - linkPage(1); + linkPageTop(1); } function fncReset(thisObj){ @@ -277,7 +277,38 @@ $(document).ready(function(){ }); } - + //설문 팝업 + function fncQustnrList( + 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 + }; + + commonPopLayeropen( + "${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/qustnrFndtnPopList.do" + , 800 + , 700 + , paramObj + , "Y" + , "QustnrList" + ); + } @@ -388,6 +419,36 @@ $(document).ready(function(){ - + + + + + + + + + + + - + + + @@ -426,7 +487,7 @@ $(document).ready(function(){
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp index 64e825d4..a138dca2 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp @@ -185,6 +185,40 @@ }); } + + + //설문 팝업 + function fncQustnrList( + 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 + }; + + commonPopLayeropen( + "${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/qustnrPopList.do" + , 800 + , 700 + , paramObj + , "Y" + , "scholPop" + ); + } @@ -470,8 +504,7 @@ - - +
@@ -485,7 +518,11 @@
+ + + +