From f9448d6f1859f6819538339b6da25290996fb0fc Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Thu, 28 Dec 2023 14:15:51 +0900
Subject: [PATCH] =?UTF-8?q?2023-12-28=2014:15=20=EC=84=A4=EB=AC=B8=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aplct/comweb/CrownixAjaxController.java   | 131 +++++++++--------
 .../web/FndtnEnhanceTrnController.java        |   1 +
 .../sspnIdtmt/web/SspnIdtmtController.java    |   8 +-
 .../eduInfo/service/VEEduChasiVO.java         |   8 ++
 .../ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml     |   2 +-
 .../ve/tngr/VEACmpltCrtfcMix_SQL_Tibero.xml   |   5 +-
 .../popup/qustnrFndtnPopList.jsp              |   2 +-
 .../fndtnEnhanceTrn/fndtnEduAplctList.jsp     |   6 +-
 .../jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp | 123 +++++++++++-----
 .../jsp/web/ve/aplct/sspnIdtmt/main.jsp       |  93 ++++++++++--
 .../aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp | 132 ++++++++++++------
 11 files changed, 358 insertions(+), 153 deletions(-)

diff --git a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java
index ac193583..6621a45c 100644
--- a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java
+++ b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java
@@ -165,71 +165,80 @@ public class CrownixAjaxController {
 			System.out.println(request.getParameter("eduAplctOrd"));
 			System.out.println("----------------");
 			
-			VEACmpltCrtfcVO	vEACmpltCrtfcVO	=	new VEACmpltCrtfcVO();
-			vEACmpltCrtfcVO.setPrcsAplctPrdOrd(request.getParameter("prcsAplctPrdOrd"));
-			vEACmpltCrtfcVO.setEduAplctOrd(request.getParameter("eduAplctOrd"));
-			
-			vEACmpltCrtfcVO	=	vEACmpltCrtfcMixService.selectDetail_CC_1(vEACmpltCrtfcVO);
-			
-			vEACmpltCrtfcVO.setMberNm(egovCryptoUtil.decrypt(vEACmpltCrtfcVO.getMberNm()));
-			vEACmpltCrtfcVO.setInstrNm(egovCryptoUtil.decrypt(vEACmpltCrtfcVO.getInstrNm()));
-			
-			/*
-	    	modelAndView.addObject("data_t", "교육연수이수증X");
-			
-			modelAndView.addObject("data_1", "허은성");
-			modelAndView.addObject("data_2", "허은성");
-			modelAndView.addObject("data_3", "1986-08-02");
-			modelAndView.addObject("data_4", "직무연수");
-			modelAndView.addObject("data_5", "선율과 함꼐하는 저작권 여행");
-			modelAndView.addObject("data_6", "총15시간(1학점)");
-			modelAndView.addObject("data_7", "2023년5월15일~2023년05월26일");
-			
-			modelAndView.addObject("data_d", "2023년05월28일");
-			*/			
-			
-			//modelAndView.addObject("data_t", "교육연수이수증");
-			modelAndView.addObject("data_t", "<"+vEACmpltCrtfcVO.getEduCmpltCrtfcNmbr()+">");
-			
-			modelAndView.addObject("data_1", vEACmpltCrtfcVO.getPrcsNm());
+			try {
 
-			String s_birthDay	=	vEACmpltCrtfcVO.getBirthDay();
-			
-			if (s_birthDay.length()==6) {
-				int i_birthDay	=	Integer.parseInt(s_birthDay.substring(0,2));
+				VEACmpltCrtfcVO	vEACmpltCrtfcVO	=	new VEACmpltCrtfcVO();
+				vEACmpltCrtfcVO.setPrcsAplctPrdOrd(request.getParameter("prcsAplctPrdOrd"));
+				vEACmpltCrtfcVO.setEduAplctOrd(request.getParameter("eduAplctOrd"));
 				
-				if (i_birthDay>23) {
-					s_birthDay	=	"19"+s_birthDay.substring(0,2)+"."+s_birthDay.substring(2,4)+"."+s_birthDay.substring(4,6);	
+				vEACmpltCrtfcVO	=	vEACmpltCrtfcMixService.selectDetail_CC_1(vEACmpltCrtfcVO);
+				
+				vEACmpltCrtfcVO.setMberNm(egovCryptoUtil.decrypt(vEACmpltCrtfcVO.getMberNm()));
+				vEACmpltCrtfcVO.setInstrNm(egovCryptoUtil.decrypt(vEACmpltCrtfcVO.getInstrNm()));
+				
+				/*
+		    	modelAndView.addObject("data_t", "교육연수이수증X");
+				
+				modelAndView.addObject("data_1", "허은성");
+				modelAndView.addObject("data_2", "허은성");
+				modelAndView.addObject("data_3", "1986-08-02");
+				modelAndView.addObject("data_4", "직무연수");
+				modelAndView.addObject("data_5", "선율과 함꼐하는 저작권 여행");
+				modelAndView.addObject("data_6", "총15시간(1학점)");
+				modelAndView.addObject("data_7", "2023년5월15일~2023년05월26일");
+				
+				modelAndView.addObject("data_d", "2023년05월28일");
+				*/			
+				
+				//modelAndView.addObject("data_t", "교육연수이수증");
+				modelAndView.addObject("data_t", "<"+vEACmpltCrtfcVO.getEduCmpltCrtfcNmbr()+">");
+				
+				modelAndView.addObject("data_1", vEACmpltCrtfcVO.getPrcsNm());
+
+				String s_birthDay	=	vEACmpltCrtfcVO.getBirthDay();
+				
+				if (s_birthDay.length()==6) {
+					int i_birthDay	=	Integer.parseInt(s_birthDay.substring(0,2));
+					
+					if (i_birthDay>23) {
+						s_birthDay	=	"19"+s_birthDay.substring(0,2)+"."+s_birthDay.substring(2,4)+"."+s_birthDay.substring(4,6);	
+					}else {
+						s_birthDay	=	"20"+s_birthDay.substring(0,2)+"."+s_birthDay.substring(2,4)+"."+s_birthDay.substring(4,6);
+					}					
+				}
+				
+				
+				modelAndView.addObject("data_2", vEACmpltCrtfcVO.getMberNm()+"("+s_birthDay+")");
+				modelAndView.addObject("data_3", vEACmpltCrtfcVO.getEduStrtPnttm()+"~"+vEACmpltCrtfcVO.getEduDdlnPnttm());
+				
+				//강사명1,2,3
+				System.out.println("vEACmpltCrtfcVO.getDesc1()");
+				System.out.println(vEACmpltCrtfcVO.getInstrNm());
+				System.out.println(vEACmpltCrtfcVO.getDesc1());
+				
+				
+				if ("".equals(vEACmpltCrtfcVO.getDesc1()) || vEACmpltCrtfcVO.getDesc1()==null) {
+					modelAndView.addObject("data_41", vEACmpltCrtfcVO.getInstrNm());	
 				}else {
-					s_birthDay	=	"20"+s_birthDay.substring(0,2)+"."+s_birthDay.substring(2,4)+"."+s_birthDay.substring(4,6);
-				}					
-			}
-			
-			
-			modelAndView.addObject("data_2", vEACmpltCrtfcVO.getMberNm()+"("+s_birthDay+")");
-			modelAndView.addObject("data_3", vEACmpltCrtfcVO.getEduStrtPnttm()+"~"+vEACmpltCrtfcVO.getEduDdlnPnttm());
-			
-			//강사명1,2,3
-			
-			if ("".equals(vEACmpltCrtfcVO.getDesc1())) {
-				modelAndView.addObject("data_41", vEACmpltCrtfcVO.getInstrNm());	
-			}else {
-				//modelAndView.addObject("data_41", vEACmpltCrtfcVO.getInstrNm());
-				modelAndView.addObject("data_41", vEACmpltCrtfcVO.getDesc1());	
+					//modelAndView.addObject("data_41", vEACmpltCrtfcVO.getInstrNm());
+					modelAndView.addObject("data_41", vEACmpltCrtfcVO.getDesc1());	
+					
+				}			
 				
-			}			
-			
-			modelAndView.addObject("data_42", vEACmpltCrtfcVO.getDesc2());
-			modelAndView.addObject("data_43", vEACmpltCrtfcVO.getDesc3());
-			modelAndView.addObject("data_44", vEACmpltCrtfcVO.getDesc4());
-			
-			modelAndView.addObject("data_7", "위 사람은 한국저작권위원회에서 진행하는 '"+vEACmpltCrtfcVO.getPrcsNm()+"'을 수료 하였기에 위 교육이수증을 부여 합니다.");
-			
-			String s_rd	=	vEACmpltCrtfcVO.getRd();
-			s_rd	=	s_rd.substring(0,4)+"년 "+s_rd.substring(4,6)+"월 "+s_rd.substring(6,8)+"일";
-						
-			
-			modelAndView.addObject("data_d", s_rd);
+				modelAndView.addObject("data_42", vEACmpltCrtfcVO.getDesc2());
+				modelAndView.addObject("data_43", vEACmpltCrtfcVO.getDesc3());
+				modelAndView.addObject("data_44", vEACmpltCrtfcVO.getDesc4());
+				
+				modelAndView.addObject("data_7", "위 사람은 한국저작권위원회에서 진행하는 '"+vEACmpltCrtfcVO.getPrcsNm()+"'을 수료 하였기에 위 교육이수증을 부여 합니다.");
+				
+				String s_rd	=	vEACmpltCrtfcVO.getRd();
+				s_rd	=	s_rd.substring(0,4)+"년 "+s_rd.substring(4,6)+"월 "+s_rd.substring(6,8)+"일";
+				modelAndView.addObject("data_d", s_rd);
+				
+			}catch(Exception ex) {
+				ex.printStackTrace();
+			}
+
 			
 			return modelAndView;
 			
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 e6c0b233..1a51b9de 100644
--- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java
+++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java
@@ -232,6 +232,7 @@ public class FndtnEnhanceTrnController {
     		vEPrcsDetailVO.setPrcsDiv("10");//	과정구분 VE0015 10-산업종사자, 20-대학생, 30-공무원, 40-일반인, 50-청소년, 60-학부모
 		}
     	 */
+    	vEPrcsDetailVO.setSiteId("50");
     	List<VEPrcsDetailVO> vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlQustnrList(vEPrcsDetailVO);
 
         // 현재 날짜를 가져옵니다.
diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java
index c70393a9..429ea69d 100644
--- a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java
+++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java
@@ -215,7 +215,9 @@ public class SspnIdtmtController {
     		vEPrcsDetailVO.setPrcsDiv("10");//	과정구분 VE0015 10-산업종사자, 20-대학생, 30-공무원, 40-일반인, 50-청소년, 60-학부모
 		}
     	 */
-    	List<VEPrcsDetailVO> vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlList(vEPrcsDetailVO);
+    	vEPrcsDetailVO.setSiteId("50");
+    	List<VEPrcsDetailVO> vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlQustnrList(vEPrcsDetailVO);
+    	//List<VEPrcsDetailVO> vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlList(vEPrcsDetailVO);
 
         // 현재 날짜를 가져옵니다.
         LocalDate currentDate = LocalDate.now();
@@ -690,9 +692,11 @@ public class SspnIdtmtController {
 	    	if(StringUtil.isEmpty(vEPrcsDetailVO.getPrcsDiv())) {
 	    		
 	    		//vEPrcsDetailVO.setPrcsDiv("10");//	과정구분 VE0015 10-산업종사자, 20-대학생, 30-공무원, 40-일반인, 50-청소년, 60-학부모
+	    		vEPrcsDetailVO.setSiteId("60");
 	    		
 	    	}
-	    	List<VEPrcsDetailVO> vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlList(vEPrcsDetailVO);
+	    	//List<VEPrcsDetailVO> vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlList(vEPrcsDetailVO);
+	    	List<VEPrcsDetailVO> vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlQustnrList(vEPrcsDetailVO);
 
 
 	        // 현재 날짜를 가져옵니다.
diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java
index f0676dc3..e1a66726 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java
@@ -130,6 +130,8 @@ public class VEEduChasiVO extends ComDefaultVO implements Serializable {
 	private String sumScore;		//전체점수
 	private String avgScore;		//평균점수
 	
+	private String siteId;			//설문정보를 위해서 설문지의 대상값을 넣는다.	VE0011	10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소
+	
 	private String siteIdCd;		//사이트ID 구분		10-기본, 20-신청자, 30-강사
 	
 	private String prcsAplctPrdOrd;	//기간과정신청정보
@@ -715,5 +717,11 @@ public class VEEduChasiVO extends ComDefaultVO implements Serializable {
 	public void setEduTrgt(String eduTrgt) {
 		this.eduTrgt = eduTrgt;
 	}
+	public String getSiteId() {
+		return siteId;
+	}
+	public void setSiteId(String siteId) {
+		this.siteId = siteId;
+	}
 	
 }
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 c0e8c818..ff8da47b 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
@@ -793,7 +793,7 @@
 			vpap.edu_ddln_pnttm AS eduDdlnPnttm ,
 			
 			CASE 
-				WHEN to_char(sysdate, 'YYYY.MM.DD') > vpap.edu_ddln_pnttm THEN 1
+				WHEN to_char(sysdate, 'YYYY.MM.DD') > NVL(vpap.edu_ddln_pnttm,vpap.edu_strt_pnttm) THEN 1
 				ELSE 0
 			END 	AS	qestRsltExists,				
 			
diff --git a/src/main/resources/egovframework/sqlmap/ve/tngr/VEACmpltCrtfcMix_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/tngr/VEACmpltCrtfcMix_SQL_Tibero.xml
index c3fc9a3c..6d6a8350 100644
--- a/src/main/resources/egovframework/sqlmap/ve/tngr/VEACmpltCrtfcMix_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/tngr/VEACmpltCrtfcMix_SQL_Tibero.xml
@@ -34,9 +34,12 @@
 			, vadi.edu_cmplt_crtfc_nmbr	AS	eduCmpltCrtfcNmbr
 			*/	
 			, NVL(vadi.edu_cmplt_crtfc_nmbr,'이수번호발급전')    AS eduCmpltCrtfcNmbr
+			/*
 			, to_char(sysdate, 'YYYYMMDD')	AS	rd
+			*/
+			, to_char(NVL(vadi.aplct_pnttm,sysdate), 'YYYYMMDD')	AS	rd
 			
-               , vi.DESC_1					AS	desc1 
+               , NVL(vi.DESC_1,'')					AS	desc1 
                , vi.DESC_2					AS	desc2
                , vi.DESC_3					AS	desc3
                , vi.DESC_4   				AS	desc4
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
index 044fe766..2cf220a1 100644
--- 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
@@ -294,7 +294,7 @@ $(document).ready(function(){
 </form>
 
 <form id="newSrvyPopupForm" name="newSrvyPopupForm" method="post" >
-	<input type="hidden" name="siteId" id="siteId" value="50">
+	<input type="hidden" name="siteId" id="siteId" value="${vEEduChasiVO.siteId}">
 	<input type="hidden" name="eduAplctOrd" id="eduAplctOrd" value="${vEEduChasiVO.eduAplctOrd}">
 	<input type="hidden" name="eduChasiOrd" id="eduChasiOrd" value="${vEEduChasiVO.eduChasiOrd}">
 	<input type="hidden" name="qustnrTmplatId" id="qustnrTmplatId" value="${chasiSrvyList[0].qustnrTmplatId}">
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 43ba2bf2..4d4a0990 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
@@ -292,6 +292,7 @@ $(document).ready(function(){
 				"eduAplctOrd" : id
 				,"eduChasiOrd" : chId
 				,"siteIdCd" : p_site_id_cd
+				,"siteId" 	: "50"			//설문정보를 위해서 설문지의 대상값을 넣는다.	VE0011	10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소
 
 				,"action" : p_action
 
@@ -436,7 +437,7 @@ $(document).ready(function(){
 											)" title="팝업 열림">설문완료</button>
 										</c:when>
 										
-										<c:when test="${empty list.qestnrId10 and list.aplctStateCd eq 20}">
+										<c:when test="${empty list.qestnrId10 and list.aprvlCd eq 20}">
 										<!-- 대상 설문이 없다 -->
 											대상설문없음									
 										</c:when>		
@@ -477,7 +478,6 @@ $(document).ready(function(){
 									-
 								</c:otherwise>								
 							</c:choose>
-							
 						
 						</td>
 						<!-- <td>-</td> -->
@@ -599,7 +599,7 @@ $(document).ready(function(){
 		viewer.openFile('cmplt_crtfc_20231030.mrd', '/rf [http://192.168.0.59:3080/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']'
 				, {clientSidePdf: {embeddedFont: true}});
 		*/
-		//viewer.openFile('cmplt_crtfc_20231030.mrd', '/rf [http://192.168.0.59:3080/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']');
+		//viewer.openFile('cmplt_crtfc_20231030.mrd', '/rf [http://192.168.0.32:3080/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']');
 		viewer.openFile('cmplt_crtfc_20231030.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']');
 
  	 	}
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 a138dca2..c1e39de6 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
@@ -202,6 +202,7 @@
 				"eduAplctOrd" : id
 				,"eduChasiOrd" : chId
 				,"siteIdCd" : p_site_id_cd
+				,"siteId" 	: "50"			//설문정보를 위해서 설문지의 대상값을 넣는다.	VE0011	10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소
 
 				,"action" : p_action
 
@@ -211,12 +212,13 @@
 		};
 		
 		commonPopLayeropen(
-				"${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/qustnrPopList.do"
+				//"${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/qustnrPopList.do"
+				"${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/qustnrFndtnPopList.do"
 				, 800
 				, 700
 				, paramObj
 				, "Y"
-				, "scholPop"
+				, "QustnrList"
 		);
 	}	
 </script>
@@ -289,29 +291,31 @@
 						</td>
 						<td><kc:code codeId="VE0003" code="${list.aprvlCd}"/></td>
 						<td>
-							<c:choose>
-								<c:when test="${list.qustnrQesitmId10Cnt gt 0 and list.aprvlCd eq 20 and list.dateChk eq 1}">
-								<!-- 													 
-									<button type="button" class="btnType02" data-tooltip="sub37_pop20" 
-									onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduPrcsOrd}','10','select'
-									,'${list.qustnrTmplatId}','${list.qestnrId10}',''
-									)" title="팝업 열림">설문완료</button>
-									 -->
-									<button type="button" class="btnType01" data-tooltip="sub37_pop01" onclick="selectQestnInfo('${list.eduAplctOrd}','update')" title="팝업 열림">설문완료</button>
-								</c:when>
-								<c:when test="${not empty list.qestnrId10 and list.aprvlCd eq 20 and list.dateChk eq 1}">
-								<!-- 
-									<button type="button" class="btnType01" data-tooltip="sub37_pop20" 
-									onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduPrcsOrd}','10','insert'
-									,'${list.qustnrTmplatId}','${list.qestnrId10}',''
-									)" title="팝업 열림">설문등록</button>
-									 -->
-									<button type="button" class="btnType01" data-tooltip="sub37_pop01" onclick="selectQestnInfo('${list.eduAplctOrd}','insert')" title="팝업 열림">설문등록</button>									
-								</c:when>
-								<c:otherwise>
-									해당설문없음
-								</c:otherwise>
-							</c:choose>
+						
+						
+<%-- 							<c:choose> --%>
+<%-- 								<c:when test="${list.qustnrQesitmId10Cnt gt 0 and list.aprvlCd eq 20 and list.dateChk eq 1}"> --%>
+<!-- 																					 
+<!-- 									<button type="button" class="btnType02" data-tooltip="sub37_pop20"  -->
+<!-- 									onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduPrcsOrd}','10','select' -->
+<!-- 									,'${list.qustnrTmplatId}','${list.qestnrId10}','' -->
+<!-- 									)" title="팝업 열림">설문완료</button> -->
+<!-- 									 -->
+<%-- 									<button type="button" class="btnType01" data-tooltip="sub37_pop01" onclick="selectQestnInfo('${list.eduAplctOrd}','update')" title="팝업 열림">설문완료</button> --%>
+<%-- 								</c:when> --%>
+<%-- 								<c:when test="${not empty list.qestnrId10 and list.aprvlCd eq 20 and list.dateChk eq 1}"> --%>
+<!-- 								
+<!-- 									<button type="button" class="btnType01" data-tooltip="sub37_pop20"  -->
+<!-- 									onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduPrcsOrd}','10','insert' -->
+<!-- 									,'${list.qustnrTmplatId}','${list.qestnrId10}','' -->
+<!-- 									)" title="팝업 열림">설문등록</button> -->
+<!-- 									 -->
+<%-- 									<button type="button" class="btnType01" data-tooltip="sub37_pop01" onclick="selectQestnInfo('${list.eduAplctOrd}','insert')" title="팝업 열림">설문등록</button>									 --%>
+<%-- 								</c:when> --%>
+<%-- 								<c:otherwise> --%>
+<!-- 									해당설문없음 -->
+<%-- 								</c:otherwise> --%>
+<%-- 							</c:choose> --%>
 							
 													
 								<!-- 신청 승인상태 20 and 현재가 교육종료보다 이후 체크 1 -->								
@@ -327,20 +331,73 @@
 <%-- 								</c:otherwise> --%>
 <%-- 							</c:choose> --%>
 
-
-						</td>
-						<td>
 							<c:choose>
-								<c:when test="${list.qustnrQesitmId10Cnt gt 0 and list.aprvlCd eq 20 and list.dateChk eq 1}">
-									<button type="button" title="출력" class="btnType03" onclick="fncCmpltCrtfc('<c:out value="${list.prcsOrd}"/>', '<c:out value="${list.eduAplctOrd}"/>');">출력</button>
-								</c:when>								
-								<c:when test="${list.qustnrQesitmId10Cnt gt 0 and list.aprvlCd eq 20}">
-									교육완료
+								<c:when test="${list.aprvlCd eq 20 and list.qestRsltExists and list.aplctStateCd ne 10}">
+								<!-- 설문노출대상(승인처리를 받았음(20) && 교육기간이 지났음 list.qestRsltExists=true && 미이수가 아닌것(10) ) -->
+
+									<c:choose>
+										
+										<c:when test="${list.qestnrId10Cnt gt 0}">
+										<!-- 작성된 설문이 있다 -->
+											<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="${empty list.qestnrId10 and list.aprvlCd eq 20}">
+										<!-- 대상 설문이 없다 -->
+											대상설문없음									
+										</c:when>		
+										
+										<c:when test="${empty list.qestnrId10Cnt or list.qestnrId10Cnt eq 0}">
+										<!-- 작성된 설문이 없다 -->
+											<button type="button" class="btnType01" data-tooltip="sub37_pop20" 
+											onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','insert'
+											,'${list.qustnrTmplatId}','${list.qestnrId10}',''
+											)" title="팝업 열림">설문등록</button>						
+										</c:when>
+								
+										<c:otherwise>
+											-
+										</c:otherwise>
+									</c:choose>	
+
 								</c:when>
 								<c:otherwise>
+								<!-- 설문노출대상 아님 -->
 									-
 								</c:otherwise>
 							</c:choose>
+
+						</td>
+						<td>
+<%-- 							<c:choose> --%>
+<%-- 								<c:when test="${list.qustnrQesitmId10Cnt gt 0 and list.aprvlCd eq 20 and list.dateChk eq 1}"> --%>
+<%-- 									<button type="button" title="출력" class="btnType03" onclick="fncCmpltCrtfc('<c:out value="${list.prcsOrd}"/>', '<c:out value="${list.eduAplctOrd}"/>');">출력</button> --%>
+<%-- 								</c:when>								 --%>
+<%-- 								<c:when test="${list.qustnrQesitmId10Cnt gt 0 and list.aprvlCd eq 20}"> --%>
+<!-- 									교육완료 -->
+<%-- 								</c:when> --%>
+<%-- 								<c:otherwise> --%>
+<!-- 									- -->
+<%-- 								</c:otherwise> --%>
+<%-- 							</c:choose> --%>
+
+							<c:choose>
+								<c:when test="${list.qestnrId10Cnt gt 0}">
+									<button type="button" title="이수증"
+									style="height:30px;width:73px;" 
+									class="btnType01" onclick="fncCmpltCrtfc('<c:out value="${list.prcsAplctPrdOrd}"/>', '<c:out value="${list.eduAplctOrd}"/>');">이수증</button>
+								</c:when>
+								<c:when test="${list.aplctStateCd eq 20 and not list.qestRsltExists}">
+									설문등록 후 발급
+								</c:when>
+								<c:otherwise>
+									-
+								</c:otherwise>								
+							</c:choose>							
+							
 						</td>
 					</tr>
 				</c:forEach>
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp
index c2bf5504..5aa470bb 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp
@@ -107,6 +107,41 @@
 		form.submit();
 		
 	}	
+
+	//설문 팝업
+	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
+				,"siteId" 	: "60"			//설문정보를 위해서 설문지의 대상값을 넣는다.	VE0011	10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소
+
+				,"action" : p_action
+
+				,"qustnrTmplatId" 	: p_qustnrTmplatId
+				,"qestnrId" 		: p_qestnrId
+				,"qustnrRespondId" 	: p_qustnrRespondId
+		};
+		
+		commonPopLayeropen(
+				//"${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/qustnrPopList.do"
+				"${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/qustnrFndtnPopList.do"
+				, 800
+				, 700
+				, paramObj
+				, "Y"
+				, "QustnrList"
+		);
+	}		
 </script>
 
 <!-- content -->
@@ -149,7 +184,7 @@
 					<col style="width:;">
 					<col style="width:13%;">
 					<col style="width:13%;">
-					<col style="width:13%;">
+<%-- 					<col style="width:13%;"> --%>
 				</colgroup>
 				<thead>
 					<tr>
@@ -157,7 +192,7 @@
 						<th>교육일자</th>
 						<th>신청결과</th>
 						<th>설문조사</th>
-						<th>이수증</th>
+<!-- 						<th>이수증</th> -->
 					</tr>
 				</thead>
 				<tbody>
@@ -174,18 +209,59 @@
 						<td><kc:code codeId="VE0003" code="${list.aprvlCd}"/></td>
 						<td>
 								<!-- 신청 승인상태 20 and 현재가 교육종료보다 이후 체크 1 -->
+<%-- 							<c:choose> --%>
+<%-- 								<c:when test="${list.aprvlCd eq 20 and list.dateChk eq 1 and not list.qestRsltExists }"> --%>
+<!-- 									<button type="button" title="설문등록" class="btnType04" data-tooltip="edu_in">설문등록</button> -->
+<%-- 								</c:when> --%>
+<%-- 								<c:when test="${list.aprvlCd eq 20 and list.dateChk eq 1 and list.qestRsltExists }"> --%>
+<!-- 									설문완료 -->
+<%-- 								</c:when> --%>
+<%-- 								<c:otherwise> --%>
+<!-- 									- -->
+<%-- 								</c:otherwise> --%>
+<%-- 							</c:choose> --%>
+							
 							<c:choose>
-								<c:when test="${list.aprvlCd eq 20 and list.dateChk eq 1 and not list.qestRsltExists }">
-									<button type="button" title="설문등록" class="btnType04" data-tooltip="edu_in">설문등록</button>
-								</c:when>
-								<c:when test="${list.aprvlCd eq 20 and list.dateChk eq 1 and list.qestRsltExists }">
-									설문완료
+								<c:when test="${list.aprvlCd eq 20 and list.qestRsltExists and list.aplctStateCd ne 10}">
+								<!-- 설문노출대상(승인처리를 받았음(20) && 교육기간이 지났음 list.qestRsltExists=true && 미이수가 아닌것(10) ) -->
+
+									<c:choose>
+										
+										<c:when test="${list.qestnrId10Cnt gt 0}">
+										<!-- 작성된 설문이 있다 -->
+											<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="${empty list.qestnrId10 and list.aprvlCd eq 20}">
+										<!-- 대상 설문이 없다 -->
+											대상설문없음									
+										</c:when>		
+										
+										<c:when test="${empty list.qestnrId10Cnt or list.qestnrId10Cnt eq 0}">
+										<!-- 작성된 설문이 없다 -->
+											<button type="button" class="btnType01" data-tooltip="sub37_pop20" 
+											onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','insert'
+											,'${list.qustnrTmplatId}','${list.qestnrId10}',''
+											)" title="팝업 열림">설문등록</button>						
+										</c:when>
+								
+										<c:otherwise>
+											-
+										</c:otherwise>
+									</c:choose>	
+
 								</c:when>
 								<c:otherwise>
+								<!-- 설문노출대상 아님 -->
 									-
 								</c:otherwise>
-							</c:choose>
+							</c:choose>							
+							
 						</td>
+						<!-- 
 						<td>
 							<c:choose>
 								<c:when test="${list.qestRsltExists }">
@@ -199,6 +275,7 @@
 								</c:otherwise>
 							</c:choose>
 						</td>
+						 -->
 					</tr>
 				</c:forEach>
 				<c:if test="${empty list}">
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp
index 8aa09fdb..a98aa357 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp
@@ -371,7 +371,40 @@ $(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
+				,"siteId" 	: "60"			//설문정보를 위해서 설문지의 대상값을 넣는다.	VE0011	10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소
+
+				,"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 -->
@@ -514,49 +547,62 @@ $(document).ready(function(){
 									list.aplctStateCd ne 30  
 									list.aprvlCd ne 40     
 								-->
-							<c:choose>
-								<c:when test="${list.aprvlCd eq 20 
-												and list.dateChk eq 1 
-												and not list.qestRsltExists 
-												and list.aplctStateCd ne 30 
-												and list.aprvlCd ne 40
-												}">
-									<button type="button" class="btnType01" data-tooltip="sub37_pop01" onclick="selectQestnInfo('${list.eduAplctOrd}','insert')" title="팝업 열림">설문등록</button>
-								</c:when>
-								<c:when test="${list.aprvlCd eq 20 and list.dateChk eq 1 and list.qestRsltExists }">
-									<button type="button" class="btnType01" data-tooltip="sub37_pop01" onclick="selectQestnInfo('${list.eduAplctOrd}','update')" title="팝업 열림">설문수정</button>
-								</c:when>
-								<c:otherwise>
-									-
-								</c:otherwise>
-							</c:choose>
-						</td>
-<!-- 						<td> -->
-								<!-- 
-									취소상태
-									list.aplctStateCd ne 30  
-									list.aprvlCd ne 40     
-								-->
-					<%-- 		<c:choose>
-								<c:when test="${list.qestRsltExists }">
-									<button type="button" title="출력" class="btnType03">출력</button>
-								</c:when>
-								<c:when test="${list.dateChk eq 1 
-												and not list.qestRsltExists
-												and list.aplctStateCd ne 30 
-												and list.aprvlCd ne 40
-								}">
-									교육완료
-								</c:when>
-								<c:otherwise>
-									-
-								</c:otherwise>
-							</c:choose> --%>
+<%-- 							<c:choose> --%>
+<%-- 								<c:when test="${list.aprvlCd eq 20  --%>
+<%-- 												and list.dateChk eq 1  --%>
+<%-- 												and not list.qestRsltExists  --%>
+<%-- 												and list.aplctStateCd ne 30  --%>
+<%-- 												and list.aprvlCd ne 40 --%>
+<%-- 												}"> --%>
+<%-- 									<button type="button" class="btnType01" data-tooltip="sub37_pop01" onclick="selectQestnInfo('${list.eduAplctOrd}','insert')" title="팝업 열림">설문등록</button> --%>
+<%-- 								</c:when> --%>
+<%-- 								<c:when test="${list.aprvlCd eq 20 and list.dateChk eq 1 and list.qestRsltExists }"> --%>
+<%-- 									<button type="button" class="btnType01" data-tooltip="sub37_pop01" onclick="selectQestnInfo('${list.eduAplctOrd}','update')" title="팝업 열림">설문수정</button> --%>
+<%-- 								</c:when> --%>
+<%-- 								<c:otherwise> --%>
+<!-- 									- -->
+<%-- 								</c:otherwise> --%>
+<%-- 							</c:choose> --%>
 							
-<%-- 							<button type="button" title="이수증" class="btnType01" onclick="fncCmpltCrtfc('<c:out value="${list.prcsAplctPrdOrd}"/>', '<c:out value="${list.eduAplctOrd}"/>');">이수증테스트</button> --%>
-						
-<!-- 						</td> -->
-						<!-- <td>-</td> -->
+							<c:choose>
+								<c:when test="${list.aprvlCd eq 20 and list.qestRsltExists and list.aplctStateCd ne 10}">
+								<!-- 설문노출대상(승인처리를 받았음(20) && 교육기간이 지났음 list.qestRsltExists=true && 미이수가 아닌것(10) ) -->
+
+									<c:choose>
+										
+										<c:when test="${list.qestnrId10Cnt gt 0}">
+										<!-- 작성된 설문이 있다 -->
+											<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="${empty list.qestnrId10 and list.aprvlCd eq 20}">
+										<!-- 대상 설문이 없다 -->
+											대상설문없음									
+										</c:when>		
+										
+										<c:when test="${empty list.qestnrId10Cnt or list.qestnrId10Cnt eq 0}">
+										<!-- 작성된 설문이 없다 -->
+											<button type="button" class="btnType01" data-tooltip="sub37_pop20" 
+											onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','insert'
+											,'${list.qustnrTmplatId}','${list.qestnrId10}',''
+											)" title="팝업 열림">설문등록</button>						
+										</c:when>
+								
+										<c:otherwise>
+											-
+										</c:otherwise>
+									</c:choose>	
+
+								</c:when>
+								<c:otherwise>
+								<!-- 설문노출대상 아님 -->
+									-
+								</c:otherwise>
+							</c:choose>							
+						</td>
 					</tr>
 				</c:forEach>
 				<c:if test="${empty list}">