2023-12-27 09:36 기반강화 수정

2023-12-27 09:36:37 +09:00 · 2023-12-27 09:36:37 +09:00 · ec91eef8c6
commit ec91eef8c6
parent a9ebb0654b
9 changed files with 777 additions and 50 deletions
--- 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<QustnrRespondInfoVO> 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";
+	}
+	
 	/**
 	 * 설문 출력 팝업 리스트
 	 */
--- 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<VEPrcsDetailVO> vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlList(vEPrcsDetailVO);
--- 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;
+	}
 	
 	
 	
--- 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 ,
 			<include refid="VEInstrDetailActvtHstryDAO.select_column_name"/>
+			
+			, c.cnt
+			, c.chasiSum
 		FROM 
 			<include refid="VEInstrDetailActvtHstryDAO.table_name"/> 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
+			
 		<isNotEmpty prepend="AND" property="searchKeyword">
 			b.INSTR_NM	=	#searchKeyword#
 		</isNotEmpty>
--- 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,
--- 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 @@
 						<colgroup>
 							<col style="width: 60px;">
 							<col style="width: 150px;">
-							<col style="width: 60px;">
+							<col style="width: 120px;">							
+							<col style="width: 120px;">
+							<col style="width: 120px;">
+							<col style="width: 120px;">
+							<col style="width: 120px;">
 							<col style="width: auto;">
-							<col style="width: 150px;">
-							<col style="width: 120px;">
-							<col style="width: 120px;">
-							<col style="width: 120px;">
-							<col style="width: 120px;">
 							
 <%-- 							<col style="width: 10%;"> --%>
 <%-- 							<col style="width: 10%;"> --%>
@ -187,14 +186,14 @@
 						<thead>
 							<tr>
 								<th>번호</th>
-								<th>강사명</th>
-								<th>성별</th>
-								<th>용도</th>
-								<th>사업자명<br/>사업자등록번호</th>
-								<th>신청일</th>
-								<th>처리일</th>
+								<th>항목</th>
 								<th>문서번호</th>
-								<th>발급상태</th>
+								<th>횟수</th>
+								<th>차시</th>
+								<th>성명</th>
+								<th>발급일자</th>
+								<th>비고</th>
+								
 							</tr>
 						</thead>
 						<tbody>
@ -204,33 +203,7 @@
 									<c:out value="${ ( paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1)*paginationInfo.recordCountPerPage) ) - status.index }"/>
 								</td>
 								<td>									
-									<c:out value="${list.instrNm }" />
-								</td>
-								<td>									
-									<c:out value="${list.sex }" />
-								</td>
-								<td>									
-									<c:out value="${list.purpose }" />
-								</td>
-								<td>									
-									<c:out value="${list.bsnsNm }" />
-									<br/>									
-									(<c:out value="${list.bsnsNmbr }" />)
-								</td>
-								
-								<td>
-									<c:out value="${list.aplctPnttm }" />
-									
-								</td>
-								<td>
-									<c:choose>
-										<c:when test="${list.stateCd eq 10 }">
-											-
-										</c:when>
-										<c:otherwise>
-											<c:out value="${list.statePnttm }" />
-										</c:otherwise>
-									</c:choose>
+									강사활동확인서
 								</td>
 								<td>									
 									<c:choose>
@ -243,7 +216,21 @@
 									</c:choose>		
 								</td>
 								<td>									
-									<ve:code codeId="VEA011" code="${list.stateCd}"/>
+									<c:out value="${list.cnt }" />
+								</td>
+								<td>									
+									<c:out value="${list.chasiSum }" />
+								</td>
+								<td>									
+									<c:out value="${list.instrNm }" />
+								</td>
+								
+								<td>
+									<c:out value="${list.aplctPnttm }" />
+									
+								</td>
+								<td>
+									-
 								</td>
 							</tr>
 						</c:forEach>
--- 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
@ -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"%>
+
+<script type="text/javascript" src="${pageContext.request.contextPath}/kccadrPb/usr/script/popup.js"></script>
+<script type="text/javaScript" language="javascript">
+
+/*
+	function fncGoScholList(){
+		linkPage(1);
+	}
+
+	function linkPage(pageNo){
+		var data = {
+			pageIndex : pageNo,
+			searchKeyword : $("#searchKeyword").val(),
+			searchCondition : $("#searchCondition").val(),
+			pageUnit : 5,
+			formId	:	$("#formId").val(),
+		}
+		fncScholList(data);
+	}
+	
+	function fncScholList(paramObj) {
+		if(paramObj == undefined || paramObj == ''){
+			paramObj = {
+				pageIndex : 1,
+				searchKeyword : "",
+				searchCondition : "",
+				pageUnit : 5,
+				formId	:	$("#formId").val(),
+			};
+		}
+		// 학교 리스트 팝업 호출
+		commonPopLayeropen(
+			"${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/scholPopList.do"
+			, 500
+			, 600
+			, paramObj
+			, "N"
+			, "scholPop"
+		);
+	}
+	*/
+	
+	function fncScholDataSlct_back(p_code, p_nm){
+		var fNm = "#"+$("#formId").val();		
+		$(fNm + " #stndrdScholCd").val(p_code);
+		$(fNm + " #scholInsttNm").val(p_nm);
+				
+		$(".btn_popup_close").click();		
+	}
+
+	function fncScholDataSlct(thisObj){
+		var inObj = $(thisObj).closest("td").find("input[type=hidden]");
+		var rsObj = new Object();
+		$.each(inObj, function(idx, value){
+			console.log(value.value);
+			rsObj[value.name] = value.value;
+		});
+		callBackSchPop(rsObj);
+		$(".btn_popup_close").click();
+	}
+
+	function replyCalculation(){
+		var qestnrParticipant = $("#qestnrParticipant").val(); //참석자 수량
+		var qestnrRespondent = $("#qestnrRespondent").val(); //응답자 수량
+		
+		if(qestnrParticipant == "" || qestnrParticipant == null){
+			alert("참석자 수량을 넣어주세요");
+			$("#qestnrParticipant").focus();
+			return
+		}
+		
+		if(qestnrRespondent == "" || qestnrRespondent == null){
+			alert("응답자 수량을 넣어주세요");
+			$("#qestnrParticipant").focus();
+			return
+		}
+		
+		if(Number(qestnrParticipant) < Number(qestnrRespondent)){
+			alert("응답자 수량이 참석자 수량보다 많습니다.");
+			$("#qestnrParticipant").focus();
+			return
+		}
+		
+		var responseRateTxt = (Number(qestnrRespondent) / Number(qestnrParticipant)*Number(100)).toFixed(1);
+		$("#responseRate").text(responseRateTxt + "%");
+		$("#noResponse").text(Number(qestnrParticipant) - Number(qestnrRespondent));
+	}	
+
+	function popupSrvySendSubmit(){
+		
+		var qestmSize = parseInt($("#qestmInfoSize").val()); //평가문항 수량
+		var qestnrParticipant = parseInt($("#qestnrParticipant").val()); //참석자 수량
+		var qestnrRespondent = parseInt($("#qestnrRespondent").val()); //응답자 수량
+		
+		if(qestnrParticipant == null || qestnrParticipant == ""){
+			alert("참석자 수량을 넣어주세요");
+			$("#qestnrParticipant").focus();
+			return
+		}
+		
+		if(qestnrRespondent == null || qestnrRespondent == ""){
+			alert("응답자 수량을 넣어주세요");
+			$("#qestnrRespondent").focus();
+			return
+		}
+		
+		if(qestnrParticipant < qestnrRespondent){
+			alert("응답자 수량이 참석자 수보다 많습니다 확인해 주세요");
+			$("#qestnrRespondent").focus();
+			return
+		}
+		
+		for(var i=0; i < qestmSize; i++){
+			var verySatisfied = $("#verySatisfied_"+i).val();
+			var satisfied = $("#satisfied_"+i).val();
+			var neither = $("#neither_"+i).val();
+			var dissatisfied = $("#dissatisfied_"+i).val();
+			var veryDissatisfied = $("#veryDissatisfied_"+i).val();
+			
+			if(verySatisfied == null || verySatisfied == ""){
+				alert((i+1)+"번 [매우만족] 만족도를 정확히 넣어주세요");
+				$("#verySatisfied_"+i).focus();
+				return
+			}
+			if(satisfied == null || satisfied == ""){
+				alert((i+1)+"번 [만족] 만족도를 정확히 넣어주세요");
+				$("#satisfied_"+i).focus();
+				return
+			}
+			if(neither == null || neither == ""){
+				alert((i+1)+"번 [보통] 만족도를 정확히 넣어주세요");
+				$("#neither_"+i).focus();
+				return
+			}
+			if(dissatisfied == null || dissatisfied == ""){
+				alert((i+1)+"번 [불만족] 만족도를 정확히 넣어주세요");
+				$("#dissatisfied_"+i).focus();
+				return
+			}
+			if(veryDissatisfied == null || veryDissatisfied == ""){
+				alert((i+1)+"번 [매우불만족] 만족도를 정확히 넣어주세요");
+				$("#veryDissatisfied_"+i).focus();
+				return
+			}
+			
+			var sum = Number(verySatisfied) + Number(satisfied) + Number(neither) + Number(dissatisfied) + Number(veryDissatisfied);
+			
+			if(qestnrRespondent != sum ){
+				alert((i+1)+"문항의 합계가 응답수량과 맞지 않습니다.");
+				$("#verySatisfied_"+i).focus();
+				return
+			}
+		}
+		
+		if(confirm("설문결과를 등록 하시겠습니까?")){
+// 			var frm = document.newSrvyPopupForm;
+			var data = new FormData(document.getElementById("newSrvyPopupForm"));
+			
+			$.ajax({
+				type:"POST"
+				,url:"${pageContext.request.contextPath}/web/ve/aplct/tngrVisitEdu/eduEnd/insertNewSrvyInfoAjax.do"
+				,data: data
+				,dataType:'json'
+				,async: false
+				,processData: false
+				,contentType: false
+				,cache: false
+				,success:function(returnData){
+					if(returnData.result == 'success'){
+						alert("설문결과가 등록 되었습니다.");
+						window.location.reload();
+					}else if(returnData.result == 'fail'){
+						alert(returnData.msg);
+						location.href="/web/user/login/ssoLogin.do?test=test";
+					}
+				}
+				,error:function(request , status, error){
+					alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+				}
+			});
+		}
+	}	
+	
+$(document).ready(function(){
+	/*
+	boardCaptionDetailToggle4();
+	
+	// 레이어팝업 포커싱 이동 수정
+	$(".tooltip-close").click(function(){
+		var activeTarget = $('[data-tooltip-con="sub36_pop02"]');
+		activeTarget.hide();
+		$('[data-tooltip="sub01_pop02"]').focus();
+	});
+	
+	//레이어팝업 초정 이동 시 필요한 data 값 추가
+	var btnLast = $('.popup_cont').find('.page').find('button:last-child');
+	btnLast.attr('data-focus-next','sub36_pop02');
+	btnLast.attr('data-focus','sub36_pop02_close');
+	*/
+
+})
+</script>
+<!-- 일정 상세 -->
+<form id="newSrvyPopupForm" name="newSrvyPopupForm" method="post" >
+	<input type="hidden" name="eduAplctOrd" id="eduAplctOrd" value="${chasiInfo.eduAplctOrd}">
+	<input type="hidden" name="eduChasiOrd" id="eduChasiOrd" value="${chasiInfo.eduChasiOrd}">
+	<input type="hidden" name="qustnrTmplatId" id="qustnrTmplatId" value="${chasiSrvyList[0].qustnrTmplatId}">
+	<input type="hidden" name="qestnrId" id="qestnrId" value="${chasiSrvyList[0].qestnrId}">
+	<input type="hidden" name="qestmInfoSize" id="qestmInfoSize" value="${fn:length(chasiSrvyList)}">
+
+<div class="popup_wrap popType01" tabindex="0" data-tooltip-con="sub36_pop02" data-focus="sub36_pop02" data-focus-prev="sub36_pop02_close">
+	<div class="popup_tit">
+		<p>강의만족도 결과 등록</p> <button class="btn_popup_close tooltip-close" data-focus="sub36_pop02_close" title="팝업 닫기"><i></i></button>
+	</div>
+
+	<div class="popup_cont">
+		<div class="cont_body">
+		
+			<div class="pop_tb_type02">
+						<table>
+							<caption>교육일, 차시, 구분, 대상, 배정강사, 인원, 설문완료 여부 등의 정보제공</caption>
+							<colgroup>
+								<col style="width: 10%;">
+								<col style="width: 15%;">
+								<col style="width: 8%;">
+								<col style="width: 10%;">
+								<col style="width: 10%;">
+								<col style="width: 8%;">
+								<col style="width: 10%;">
+							</colgroup>
+							<thead>
+								<tr>
+									<th scope="col">교육일</th>
+									<th scope="col">차시</th>
+									<th scope="col">구분</th>
+									<th scope="col">대상</th>
+									<th scope="col">배정강사</th>
+									<th scope="col">인원</th>
+									<th scope="col">설문완료 여부</th>
+								</tr>
+							</thead>
+							<tbody>
+								<tr>
+									<th scope="row" id="popupEduHopeDt">
+										<c:out value="${chasiInfo.eduHopeDt}" />
+									</th>
+									<td id="popupTm">
+										<c:out value="${chasiInfo.strtTm}" />~<c:out value="${chasiInfo.endTm}" />										
+									</td>
+									<td id="popupDivCd">
+										<c:out value="${chasiInfo.divCd}" />
+									</td>
+									<td id="popupTrgt">
+										<c:out value="${chasiInfo.trgt}" />
+									</td>
+									<td id="popupInstrNm">
+										<c:out value="${chasiInfo.instrNm}" />
+									</td>
+									<td id="popupPrsnl">
+										<c:out value="${chasiInfo.prsnl}" />
+									</td>
+									<td id="popupSrvyStatus">									
+										<c:choose>
+											<c:when test="${qestnrParticipant eq '' or qestnrParticipant eq null}">
+												설문진행중
+											</c:when>
+											<c:otherwise>
+												설문완료
+											</c:otherwise>
+										</c:choose>
+									</td>
+								</tr>
+							</tbody>
+						</table>
+						
+						<br/>			
+						<br/>
+			
+
+						<table>
+							<caption>참석자, 응답율, 응답자, 무응답에 대한 정보를 제공/입력</caption>
+							<colgroup>
+								<col style="width: 120px;">
+								<col style="width: auto;">
+								<col style="width: 120px;">
+								<col style="width: auto;">
+							</colgroup>
+							<tbody>
+								<tr>
+									<th scope="row">
+										<p>참석자</p>
+									</th>
+									<td>
+										<label for="qestnrParticipant" class="label">참석자 수 입력</label>
+										<input type="text" numberOnly class="popupInput" style="width: 50%;" 
+										id="qestnrParticipant" name="qestnrParticipant" value="<c:out value="${qestnrParticipant}" />">
+									</td>
+									<th scope="row">
+										<p>응답율</p>
+									</th>
+									<td id="responseRate">-</td>
+								</tr>
+								<tr>
+									<th scope="row">
+										<p>응답자</p>
+									</th>
+									<td>
+										<label for="qestnrRespondent" class="label">응답자 수 입력</label>
+										<input type="text" numberOnly class="popupInput" style="width: 50%;" 
+										id="qestnrRespondent" name="qestnrRespondent" value="<c:out value="${qestnrRespondent}" />" onblur="replyCalculation(); return false;">
+									</td>
+									<th scope="row">
+										<p>무응답</p>
+									</th>
+									<td id="noResponse">-</td>
+								</tr>
+							</tbody>
+						</table>
+						
+						<br/>
+						<br/>
+						
+						<table>
+							<caption>평가문항, 매우만족, 만족, 보통, 불만족, 매우 불만족 입력</caption>
+							<colgroup>
+								<col style="width: auto;">
+								<col style="width: 12%;">
+								<col style="width: 12%;">
+								<col style="width: 12%;">
+								<col style="width: 12%;">
+								<col style="width: 12%;">
+							</colgroup>
+							<thead>
+								<tr>
+									<th scope="col">평가문항</th>
+									<th scope="col">매우만족</th>
+									<th scope="col">만족</th>
+									<th scope="col">보통</th>
+									<th scope="col">불만족</th>
+									<th scope="col">매우불만족</th>
+								</tr>
+							</thead>
+							<tbody>
+								<c:forEach items="${chasiSrvyList}" var="QestmInfo" varStatus="status1">
+								
+									<c:set var="setQustnrRsltId" value="${QestmInfo.qustnrRsltId}"/>
+								
+								
+									<input type="hidden" name="qustnrQesitmId" value="${QestmInfo.qustnrQesitmId}">
+								
+								<tr>
+									<th scope="row" class="t_left">
+										${status1.count}) <c:out value="${QestmInfo.qestnCn}" escapeXml="false" />
+										<c:if test="${QestmInfo.mxmmChoiseCo >  1}">
+											<font color="red"><b>(최대선택건수 ${QestmInfo.mxmmChoiseCo})</b></font>
+										</c:if>
+										<input type="hidden" name="resultList[${status1.index}].qestnrId" value="${QestmInfo.qestnrId}">
+										<input type="hidden" name="resultList[${status1.index}].qestnrQesitmId" value="${QestmInfo.qustnrQesitmId}">
+										
+									</th>
+									<td>
+										<label for="verySatisfied_${status1.index}" class="label">매우만족</label>
+										<input type="text" numberOnly class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" 
+										title="매우만족" id="verySatisfied_${status1.index}" name="resultList[${status1.index}].verySatisfied" value="${QestmInfo.verySatisfied}" >
+									</td>
+									<td>
+										<label for="satisfied_${status1.index}" class="label">만족</label>
+										<input type="text" numberOnly class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" 
+										title="만족" id="satisfied_${status1.index}" name="resultList[${status1.index}].satisfied" value="${QestmInfo.satisfied}" >
+									</td>
+									<td>
+										<label for="neither_${status1.index}" class="label">보통</label>
+										<input type="text" numberOnly class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" 
+										title="보통" id="neither_${status1.index}" name="resultList[${status1.index}].neither" value="${QestmInfo.neither}" >
+									</td>
+									<td>
+										<label for="dissatisfied_${status1.index}" class="label">불만족</label>
+										<input type="text" numberOnly class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" 
+										title="불만족" id="dissatisfied_${status1.index}" name="resultList[${status1.index}].dissatisfied" value="${QestmInfo.dissatisfied}" >
+									</td>
+									<td>
+										<label for="veryDissatisfied_${status1.index}" class="label">매우불만족</label>
+										<input type="text" numberOnly class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" 
+										title="매우불만족" id="veryDissatisfied_${status1.index}" name="resultList[${status1.index}].veryDissatisfied" value="${QestmInfo.veryDissatisfied}" >
+									</td>
+								</tr>
+								</c:forEach>
+							</tbody>
+						</table>
+						
+						<br/>
+						<br/>						
+						
+						<c:choose>
+							<c:when test="${setQustnrRsltId eq '' or  setQustnrRsltId eq null}">
+								<!-- 응답이 없다. -->
+								
+								<div class="pop_btn_wrap btn_layout01">
+									<div class="btn_left">
+									</div>
+									<div class="btn_center">
+										
+										<button type="button" class="btnType05" id="popupSubmin" onclick="popupSrvySendSubmit();">제출</button>
+										
+										<button type="button" class="btnType02 tooltip-close" data-focus="sub37_pop01_close" data-focus-next="sub37_pop01">취소</button>
+									</div>
+									<div class="btn_right">
+									</div>
+								</div>										
+								
+							</c:when>
+							<c:otherwise>
+								<!-- 응답이 있다. -->
+								
+								<script>
+									replyCalculation();
+								</script>					
+								
+								<div class="pop_btn_wrap btn_layout01">
+									<div class="btn_left">
+									</div>
+									<div class="btn_center">
+										
+										<button type="button" class="btnType02 tooltip-close" data-focus="sub37_pop01_close" data-focus-next="sub37_pop01">닫기</button>
+									</div>
+									<div class="btn_right">
+									</div>
+								</div>										
+													
+							</c:otherwise>
+						</c:choose>
+											
+						
+				
+			
+				<!-- 
+				<table>
+					<caption>학교명 검색 학교급, 지역, 행정구, 선택 을/를 제공하는 표</caption>
+					<colgroup>
+						<col style="width: 20%;">
+						<col style="width: 20%;">
+						<col style="width: 20%;">
+						<col style="width: auto;">
+					</colgroup>
+					<thead>
+						<tr>
+							<th scope="col">학교급</th>
+							<th scope="col">지역</th>
+							<th scope="col">행정구</th>
+							<th scope="col">선택</th>
+						</tr>
+					</thead>
+					<tbody>
+						<c:forEach var="row" items="${scholList}" varStatus="status">
+						<tr>
+							<th scope="row"><c:out value="${row.scholGradeNm}" /></th>
+							<td><c:out value="${row.locNm}" /></td>
+							<td><c:out value="${row.newAddrDtl}" /></td>
+							<td class="c_ce4900">
+								<a href="#" onclick="fncScholDataSlct(this); return false;"><c:out value="${row.scholNm}" /></a>
+								<input type="hidden" name="scholId" value="${row.scholId}"/>
+								<input type="hidden" name="offcCd" value="${row.offcCd}"/>
+								<input type="hidden" name="offcNm" value="${row.offcNm}"/>
+								<input type="hidden" name="stndrdScholCd" value="${row.stndrdScholCd}"/>
+								<input type="hidden" name="scholNm" value="${row.scholNm}"/>
+								<input type="hidden" name="scholNmEng" value="${row.scholNmEng}"/>
+								<input type="hidden" name="scholGradeNm" value="${row.scholGradeNm}"/>
+								<input type="hidden" name="locNm" value="${row.locNm}"/>
+								<input type="hidden" name="cptntOrgnzNm" value="${row.cptntOrgnzNm}"/>
+								<input type="hidden" name="estbsNm" value="${row.estbsNm}"/>
+								<input type="hidden" name="newZipcd" value="${row.newZipcd}"/>
+								<input type="hidden" name="newAddr" value="${row.newAddr}"/>
+								<input type="hidden" name="newAddrDtl" value="${row.newAddrDtl}"/>
+								<input type="hidden" name="telNum" value="${row.telNum}"/>
+								<input type="hidden" name="homepage" value="${row.homepage}"/>
+								<input type="hidden" name="coeduDivsnNm" value="${row.coeduDivsnNm}"/>
+								<input type="hidden" name="faxNum" value="${row.faxNum}"/>
+								<input type="hidden" name="hsDivsnNm" value="${row.hsDivsnNm}"/>
+								<input type="hidden" name="indSpclCls" value="${row.indSpclCls}"/>
+								<input type="hidden" name="hsTypeNm" value="${row.hsTypeNm}"/>
+								<input type="hidden" name="spclPrpsHsLineNm" value="${row.spclPrpsHsLineNm}"/>
+								<input type="hidden" name="exmPrdDivsnNm" value="${row.exmPrdDivsnNm}"/>
+								<input type="hidden" name="dnDvisnNm" value="${row.dnDvisnNm}"/>
+								<input type="hidden" name="estbsDt" value="${row.estbsDt}"/>
+								
+								<input type="hidden" name="scholDivCd" value="${row.scholDivCd}"/>
+								<input type="hidden" name="isltnScholYn" value="${row.isltnScholYn}"/>
+								
+								<input type="hidden" name="isltnYn" value="${row.isltnYn}"/>
+								<input type="hidden" name="isltn2Yn" value="${row.isltn2Yn}"/>
+								<input type="hidden" name="isltn3Yn" value="${row.isltn3Yn}"/>
+								<input type="hidden" name="ppltnReducAreaYn" value="${row.ppltnReducAreaYn}"/>
+								
+							</td>
+						</tr>
+						</c:forEach>
+					</tbody>
+				</table>
+				 -->
+				 
+						<br/>
+						<br/>				 
+			</div>
+	</div>
+</div>
+</div>
+</form>
--- 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 = "<c:url value='/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.do'/>";
@ -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"
+		);
+	}
 </script>

 <!-- content -->
@ -388,6 +419,36 @@ $(document).ready(function(){
 									-
 								</c:otherwise>
 							</c:choose>
+							
+							<c:choose>
+								<c:when test="${list.qestRsltExists and list.aplctStateCd eq 20}">
+									<button type="button" class="btnType02" data-tooltip="sub37_pop20" 
+									onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','select'
+									,'${list.qustnrTmplatId}','${list.qestnrId10}',''
+									)" title="팝업 열림">설문완료</button>
+								</c:when>
+								<c:when test="${not empty list.qestnrId10 and list.aplctStateCd eq 20}">
+									<button type="button" class="btnType01" data-tooltip="sub37_pop20" 
+									onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','insert'
+									,'${list.qustnrTmplatId}','${list.qestnrId10}',''
+									)" title="팝업 열림">설문등록</button>
+									<!-- 
+									<button type="button" class="btnType04" data-tooltip="sub37_pop20" 
+									onclick="fncQustnrPrintList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','print'
+									,'${list.qustnrTmplatId}','${list.qestnrId10}',''
+									)" title="팝업 열림">설문출력</button>
+									
+									<button type="button" class="btnType04" data-tooltip="sub37_pop20" 
+									onclick="fncQustnrQRPrintList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','print'
+									,'${list.qustnrTmplatId}','${list.qestnrId10}',''
+									)" title="팝업 열림">설문QR</button>
+									 -->											
+								</c:when>
+								<c:otherwise>
+									-
+								</c:otherwise>
+							</c:choose>							
+							
 						</td>
 						<td>
 							<c:choose>
@ -426,7 +487,7 @@ $(document).ready(function(){

 		<!-- page -->
 		<div class="page">
-			<ui:pagination paginationInfo = "${paginationInfo}"  type="image" jsFunction="linkPage" />
+			<ui:pagination paginationInfo = "${paginationInfo}"  type="image" jsFunction="linkPageTop" />
 		</div>
 	</form:form>
 </div>
--- 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"
+		);
+	}	
 </script>

 <!-- content -->
@ -470,7 +504,6 @@
 							<tbody id="qestnTbody">
 							</tbody>
 						</table>
-					</div>
 						
 					<div class="pop_btn_wrap btn_layout01">
 						<div class="btn_left">
@ -486,6 +519,10 @@
 						<div class="btn_right">
 						</div>
 					</div>						
+						
+					</div>
+
+
 				</div>
 			</div>
 		</div>