2023-12-28 16:28 관리자 화면 수정

src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java

@@ -232,7 +232,7 @@ public class FndtnEnhanceTrnController {
     		vEPrcsDetailVO.setPrcsDiv("10");//	과정구분 VE0015 10-산업종사자, 20-대학생, 30-공무원, 40-일반인, 50-청소년, 60-학부모
 		}
     	 */
-    	vEPrcsDetailVO.setSiteId("50");
+    	vEPrcsDetailVO.setSiteId("50");		//설문정보를 위해서 설문지의 대상값을 넣는다.	VE0011	10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소
     	List<VEPrcsDetailVO> vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlQustnrList(vEPrcsDetailVO);
 
         // 현재 날짜를 가져옵니다.
@@ -421,7 +421,7 @@ public class FndtnEnhanceTrnController {
     	if(StringUtil.isEmpty(vEPrcsDetailVO.getPrcsDiv())) {
     		
     		//vEPrcsDetailVO.setPrcsDiv("10");//	과정구분 VE0015 10-산업종사자, 20-대학생, 30-공무원, 40-일반인, 50-청소년, 60-학부모
-    		vEPrcsDetailVO.setSiteId("50");
+    		vEPrcsDetailVO.setSiteId("50");	//설문정보를 위해서 설문지의 대상값을 넣는다.	VE0011	10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소
     		
     	}
     	List<VEPrcsDetailVO> vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlQustnrList(vEPrcsDetailVO);

src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java

@@ -215,7 +215,7 @@ public class SspnIdtmtController {
     		vEPrcsDetailVO.setPrcsDiv("10");//	과정구분 VE0015 10-산업종사자, 20-대학생, 30-공무원, 40-일반인, 50-청소년, 60-학부모
 		}
     	 */
-    	vEPrcsDetailVO.setSiteId("50");
+    	vEPrcsDetailVO.setSiteId("50");		//설문정보를 위해서 설문지의 대상값을 넣는다.	VE0011	10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소
     	List<VEPrcsDetailVO> vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlQustnrList(vEPrcsDetailVO);
     	//List<VEPrcsDetailVO> vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlList(vEPrcsDetailVO);
 

src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java

@@ -162,8 +162,6 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable {
 	
 	private String eduCmpltCrtfcNmbr;
 
-	
-
 	private List<String> eduAplctOrdList;	//교육신청순번
 	private List<String> sspnIdtmtTrgtOrdList;	//교육신청순번
 	
@@ -353,6 +351,10 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable {
 	
 	private String instrPhone; //강사 휴대폰
 	
+	private String qestnrId10Cnt;	
+	private String qestnrId10;
+	private String qustnrTmplatId;
+	
 	
 	public String getPrcsAplctPrdOrd() {
 		return prcsAplctPrdOrd;
@@ -2002,6 +2004,24 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable {
 	public void setApptDiv(String apptDiv) {
 		this.apptDiv = apptDiv;
 	}
+	public String getQestnrId10Cnt() {
+		return qestnrId10Cnt;
+	}
+	public void setQestnrId10Cnt(String qestnrId10Cnt) {
+		this.qestnrId10Cnt = qestnrId10Cnt;
+	}
+	public String getQestnrId10() {
+		return qestnrId10;
+	}
+	public void setQestnrId10(String qestnrId10) {
+		this.qestnrId10 = qestnrId10;
+	}
+	public String getQustnrTmplatId() {
+		return qustnrTmplatId;
+	}
+	public void setQustnrTmplatId(String qustnrTmplatId) {
+		this.qustnrTmplatId = qustnrTmplatId;
+	}
 	
 	
 }

src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java

@@ -940,6 +940,7 @@ public class CndtnPrcsInfoMngController {
 			}
 			
 			
+			paramVO.setSiteId("60");	//설문정보를 위해서 설문지의 대상값을 넣는다.	VE0011	10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소
 			List<VEEduAplctVO> vEPrcsDetailVOList = vEEduMIXService.selectTrgtList(paramVO);
 			vEPrcsDetailVOList = egovCryptoUtil.decryptVeEduAplctList(vEPrcsDetailVOList);
 			

src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java

@@ -40,6 +40,7 @@ import kcc.let.utl.fcc.service.EgovCryptoUtil;
 import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctService;
 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.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmService;
@@ -380,6 +381,7 @@ public class FndthPrcsAplctPrdMngController {
 			
 			
 			
+			paramVO.setSiteId("50");	//설문정보를 위해서 설문지의 대상값을 넣는다.	VE0011	10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소 
 			List<VEEduAplctVO> vEPrcsDetailVOList = vEEduMIXService.selectList(paramVO);
 			vEPrcsDetailVOList = egovCryptoUtil.decryptVeEduAplctList(vEPrcsDetailVOList);
 			System.out.println("====");
@@ -1213,7 +1215,44 @@ public class FndthPrcsAplctPrdMngController {
 		return "/oprtn/fndthEnhanceTrn/popup/lctrEvalPopup";
 	}	
 	
+	/** 
+	 * @methodName	: instrCostPopup 
+	 * @author		: 이호영
+	 * @date		: 2023.11.27 
+	 * @description	: 
+	 * @param vEPrcsDetailVO
+	 * @param model
+	 * @param request
+	 * @return
+	 * @throws Exception 
+	 */
+	@RequestMapping("/kccadr/oprtn/fndthEnhanceTrn/popup/lctrEvalNewPopup.do")
+	public String lctrEvalNewPopup(
+			@ModelAttribute("vEEduChasiVO") VEEduChasiVO vEEduChasiVO
+			, QustnrRespondInfoVO qustnrRespondInfoVO
+			, ModelMap model 
+			, HttpServletRequest request 
+			) throws Exception {
 
+		String s_action	=	request.getParameter("action");	//insert or select
+	
+		//참석 답변 정보
+		try {
+			List<QustnrRespondInfoVO> chasiSrvyList = egovQustnrRespondInfoService.selectChasiSrvyFndtnList202312(qustnrRespondInfoVO);
+			//model.addAttribute("qestnrRespondent", chasiSrvyList.get(0).getQestnrRespondent());
+			//model.addAttribute("qestnrParticipant", chasiSrvyList.get(0).getQestnrParticipant());
+			//System.out.println("chasiSrvyList.get(0).getPrcsAplctPrdOrd()");
+			//System.out.println(chasiSrvyList.get(0).getPrcsAplctPrdOrd());
+			//System.out.println(chasiSrvyList.get(0).getPrcsAplctPrdOrd());
+			model.addAttribute("chasiSrvyList", chasiSrvyList);
+			model.addAttribute("chasiSrvyListCnt", chasiSrvyList.size());
+		}catch(Exception ex) {
+			System.out.println("Exception vEEduAplctOnlnService.updateBulk");
+		}
+
+		
+		return "/oprtn/fndthEnhanceTrn/popup/lctrEvalNewPopup";
+	}
 
 	@RequestMapping("/kccadr/oprtn/fndthEnhanceTrn/selectSrvyInfoAjax.do")
     public ModelAndView fndtnInAdminSelectSrvyInfoAjax( HttpServletRequest request

src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml

@@ -135,17 +135,29 @@
 			a.FLD  AS fld ,
 			a.LCTR_YN  AS lctrYn ,
 			a.PRVS_QS  AS prvsQs ,			
+					
 			CASE
-				WHEN EXISTS (/* 설문조사 */
+				WHEN to_char(sysdate,
-				SELECT
+				'YYYY.MM.DD') > NVL(vpap.edu_ddln_pnttm,
-					1
+				vpap.edu_strt_pnttm) THEN 1
-				FROM
-					LETTNQESTNRRSLTDETAIL lersltD
-				WHERE
-					lersltD.respond_id = a.USER_ID
-					AND a.edu_aplct_ord = lersltD.edu_aplct_ord ) THEN 1
 				ELSE 0
-			END AS qestRsltExists
+			END AS qestRsltExists,	
+			
+			
+			/* 설문지 정보 */
+			I.qustnr_tmplat_id AS qustnrTmplatId ,
+			NVL(qustnr01.QESTNR_ID_10,
+			i.qestnr_id_10) AS qestnrId10 ,
+			NVL(qustnr01.QESTNR_ID_20,
+			i.qestnr_id_20) AS qestnrId20 ,
+			NVL(qustnr01.QESTNR_ID_30,
+			i.qestnr_id_30) AS qestnrId30 ,
+			/* 답변 정보 */
+			qustnr01.QESTNR_ID_10_CNT AS qestnrId10Cnt ,
+			qustnr01.QESTNR_ID_20_CNT AS qestnrId20Cnt ,
+			qustnr01.QESTNR_ID_30_CNT AS qestnrId30Cnt			
+			
+			
 		FROM 
 			<include refid="VEEduMIXDAO.table_name"/> a
 		JOIN ve_prcs_aplct_prd vpap ON
@@ -155,6 +167,72 @@
 			/* AND vpap.PRCS_APLCT_PRD_ORD  = vadi.PRCS_APLCT_PRD_ORD */ 
 		JOIN LETTNGNRLMBER le ON
 			a.USER_ID = le.ESNTL_ID
+			
+					
+		LEFT OUTER JOIN (
+			SELECT
+				aa.EDU_APLCT_ORD ,
+				aa.prcs_ord,
+				aa.QUSTNR_TMPLAT_ID ,
+				aa.user_id ,
+				max(decode(bb.site_id_cd, '10', aa.QESTNR_ID)) AS QESTNR_ID_10 ,
+				max(decode(bb.site_id_cd, '20', aa.QESTNR_ID)) AS QESTNR_ID_20 ,
+				max(decode(bb.site_id_cd, '30', aa.QESTNR_ID)) AS QESTNR_ID_30 ,
+				SUM(decode(bb.site_id_cd, '10', 1, 0)) AS QESTNR_ID_10_CNT ,
+				SUM(decode(bb.site_id_cd, '20', 1, 0)) AS QESTNR_ID_20_CNT ,
+				SUM(decode(bb.site_id_cd, '30', 1, 0)) AS QESTNR_ID_30_CNT
+			FROM
+				(
+				SELECT
+					a.EDU_APLCT_ORD ,
+					a.prcs_ord,
+					b.QUSTNR_TMPLAT_ID ,
+					b.QESTNR_ID ,
+					a.user_id
+				FROM
+					ve_edu_aplct a ,
+					LETTNQESTNRRSLTDETAIL b
+				WHERE
+					1 = 1 /*
+		           AND b.respond_id = a.user_id */
+					AND a.edu_aplct_ord = b.edu_aplct_ord
+					AND b.EDU_CHASI_ORD IS NULL		 
+					)aa ,
+				lettnqestnrinfo bb
+			WHERE
+				aa.qustnr_tmplat_id = bb.qustnr_tmplat_id
+				AND aa.qestnr_id = bb.qestnr_id
+			GROUP BY
+				aa.EDU_APLCT_ORD ,
+				aa.prcs_ord,
+				aa.QUSTNR_TMPLAT_ID ,
+				aa.user_id ) qustnr01 ON
+			( a.edu_aplct_ord = qustnr01.edu_Aplct_Ord
+				AND a.PRCS_ORD = qustnr01.prcs_Ord )	
+			
+		LEFT OUTER JOIN (/* 현재 진행가능한 설문 정보(기본, 선생님, 강사) 여러개가 있는 경우는 최근 등록된 설문 정보를 가져온다.*/
+			SELECT
+				a.QUSTNR_TMPLAT_ID ,
+				a.SITE_ID ,
+				max(decode(a.site_id_cd, '10', a.QESTNR_ID)) AS QESTNR_ID_10 ,
+				max(decode(a.site_id_cd, '20', a.QESTNR_ID)) AS QESTNR_ID_20 ,
+				max(decode(a.site_id_cd, '30', a.QESTNR_ID)) AS QESTNR_ID_30
+			FROM
+				LETTNQESTNRINFO a
+			WHERE
+				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,
+					'2000.01.01')
+		           AND NVL(a.qustnr_endde,
+					'9999.12.31')
+				GROUP BY
+					a.QUSTNR_TMPLAT_ID ,
+					a.SITE_ID ) I ON
+			(1 = 1)				
+			
+			
 		WHERE
 			1=1
 			<isNotEmpty property="prcsOrd">
@@ -255,17 +333,28 @@
 			vsit.sspn_idtmt_trgt_ord AS sspnIdtmtTrgtOrd,
 			vsit.clphone AS vs_clphone,
 			vsit.d_birth AS dBirth ,
+
+		
 			CASE
-				WHEN EXISTS (/* 설문조사 */
+				WHEN to_char(sysdate,
-				SELECT
+				'YYYY.MM.DD') > NVL(vpap.edu_ddln_pnttm,
-					1
+				vpap.edu_strt_pnttm) THEN 1
-				FROM
-					LETTNQESTNRRSLTDETAIL lersltD
-				WHERE
-					lersltD.respond_id = a.USER_ID
-					AND a.edu_aplct_ord = lersltD.edu_aplct_ord ) THEN 1
 				ELSE 0
-			END AS qestRsltExists
+			END AS qestRsltExists,
+			/* 설문지 정보 */
+			I.qustnr_tmplat_id AS qustnrTmplatId ,
+			NVL(qustnr01.QESTNR_ID_10,
+			i.qestnr_id_10) AS qestnrId10 ,
+			NVL(qustnr01.QESTNR_ID_20,
+			i.qestnr_id_20) AS qestnrId20 ,
+			NVL(qustnr01.QESTNR_ID_30,
+			i.qestnr_id_30) AS qestnrId30 ,
+			/* 답변 정보 */
+			qustnr01.QESTNR_ID_10_CNT AS qestnrId10Cnt ,
+			qustnr01.QESTNR_ID_20_CNT AS qestnrId20Cnt ,
+			qustnr01.QESTNR_ID_30_CNT AS qestnrId30Cnt
+
+
 		FROM 
 			<include refid="VEEduMIXDAO.table_name"/> a
 		JOIN ve_prcs_aplct_prd vpap ON
@@ -279,6 +368,70 @@
 			a.USER_ID = qe.FRST_REGISTER_ID 
 		LEFT JOIN VEA_SSPN_IDMT_TRGT vsit 
 			ON a.user_id = vsit.user_id
+			
+					
+		LEFT OUTER JOIN (
+			SELECT
+				aa.EDU_APLCT_ORD ,
+				aa.prcs_ord,
+				aa.QUSTNR_TMPLAT_ID ,
+				aa.user_id ,
+				max(decode(bb.site_id_cd, '10', aa.QESTNR_ID)) AS QESTNR_ID_10 ,
+				max(decode(bb.site_id_cd, '20', aa.QESTNR_ID)) AS QESTNR_ID_20 ,
+				max(decode(bb.site_id_cd, '30', aa.QESTNR_ID)) AS QESTNR_ID_30 ,
+				SUM(decode(bb.site_id_cd, '10', 1, 0)) AS QESTNR_ID_10_CNT ,
+				SUM(decode(bb.site_id_cd, '20', 1, 0)) AS QESTNR_ID_20_CNT ,
+				SUM(decode(bb.site_id_cd, '30', 1, 0)) AS QESTNR_ID_30_CNT
+			FROM
+				(
+				SELECT
+					a.EDU_APLCT_ORD ,
+					a.prcs_ord,
+					b.QUSTNR_TMPLAT_ID ,
+					b.QESTNR_ID ,
+					a.user_id
+				FROM
+					ve_edu_aplct a ,
+					LETTNQESTNRRSLTDETAIL b
+				WHERE
+					1 = 1 /*
+		           AND b.respond_id = a.user_id */
+					AND a.edu_aplct_ord = b.edu_aplct_ord
+					AND b.EDU_CHASI_ORD IS NULL )aa ,
+				lettnqestnrinfo bb
+			WHERE
+				aa.qustnr_tmplat_id = bb.qustnr_tmplat_id
+				AND aa.qestnr_id = bb.qestnr_id
+			GROUP BY
+				aa.EDU_APLCT_ORD ,
+				aa.prcs_ord,
+				aa.QUSTNR_TMPLAT_ID ,
+				aa.user_id ) qustnr01 ON
+			( a.edu_aplct_ord = qustnr01.edu_Aplct_Ord
+				AND a.PRCS_ORD = qustnr01.prcs_Ord )
+		LEFT OUTER JOIN (/* 현재 진행가능한 설문 정보(기본, 선생님, 강사) 여러개가 있는 경우는 최근 등록된 설문 정보를 가져온다.*/
+			SELECT
+				a.QUSTNR_TMPLAT_ID ,
+				a.SITE_ID ,
+				max(decode(a.site_id_cd, '10', a.QESTNR_ID)) AS QESTNR_ID_10 ,
+				max(decode(a.site_id_cd, '20', a.QESTNR_ID)) AS QESTNR_ID_20 ,
+				max(decode(a.site_id_cd, '30', a.QESTNR_ID)) AS QESTNR_ID_30
+			FROM
+				LETTNQESTNRINFO a
+			WHERE
+				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,
+					'2000.01.01')
+		           AND NVL(a.qustnr_endde,
+					'9999.12.31')
+				GROUP BY
+					a.QUSTNR_TMPLAT_ID ,
+					a.SITE_ID ) I ON
+			(1 = 1)			
+			
+			
 		WHERE
 			1=1
 			<isNotEmpty property="prcsOrd">

src/main/resources/egovframework/sqlmap/ve/tngr/VEACmpltCrtfcMix_SQL_Tibero.xml

@@ -77,5 +77,7 @@
 			AND vadi.EDU_APLCT_ORD =vea.edu_aplct_ord
 			AND l.mber_id=vea.user_id
 			
+		LIMIT 1
+			
 	</select>						
 </sqlMap>

src/main/webapp/WEB-INF/jsp/oprtn/cmm/instrActvtHstrySignMngList.jsp

@@ -198,7 +198,8 @@
 						</thead>
 						<tbody>
 						<c:forEach var="list" items="${list}" varStatus="status">
-							<tr onclick="fn_goDetail('${list.instrDetailActvtHstryOrd}')" style="cursor:pointer;">
+<%-- 							<tr onclick="fn_goDetail('${list.instrDetailActvtHstryOrd}')" style="cursor:pointer;"> --%>
+							<tr>
 								<td>
 									<c:out value="${ ( paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1)*paginationInfo.recordCountPerPage) ) - status.index }"/>
 								</td>

src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp

@@ -273,10 +273,50 @@
 			alert("발송되었습니다.");
 				
 		 }
+
+		//설문조사 결과
+		function fncInstrCostNewInfo(
+				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
+				) { //메뉴생성 화면 호출	
+			var form = document.popupNewForm;	
+
+			form.eduAplctOrd.value 	= id;
+			form.eduChasiOrd.value 	= chId;
+			form.siteIdCd.value 	= p_site_id_cd;
+			form.siteId.value 		= "50";
+
+			form.action.value 		= p_action;
+
+			form.qustnrTmplatId.value = p_qustnrTmplatId;
+			form.qestnrId.value = p_qestnrId;
+			form.qustnrRespondId.value = p_qustnrRespondId;
+
+			
+			form.action = "<c:url value='/kccadr/oprtn/fndthEnhanceTrn/popup/lctrEvalNewPopup.do'/>";
+		    openPopupAndSubmitForm('popupNewForm', 'popupNewForm', 900, 1200);
+		}	 
 </script>
 
 </head>
 <body>
+<form id="popupNewForm" name="popupNewForm" method="post">
+	<input type="hidden" name="eduAplctOrd" id="eduAplctOrd" value=""/>
+	<input type="hidden" name="eduChasiOrd" id="eduChasiOrd"/>
+	<input type="hidden" name="siteIdCd" id="siteIdCd"/>
+	<input type="hidden" name="siteId" id="siteId"/>
+	
+	<input type="hidden" name="action" id="action"/>
+	
+	<input type="hidden" name="qustnrTmplatId" id="qustnrTmplatId"/>
+	<input type="hidden" name="qestnrId" id="qestnrId"/>
+	<input type="hidden" name="qustnrRespondId" id="qustnrRespondId"/>
+</form>
 <form id="popupForm" name="popupForm" method="post">
 	<input type="hidden" name="prcsAplctPrdOrd" id="prcsAplctPrdOrd" value="<c:out value='${vEPrcsDetailVO.prcsAplctPrdOrd}' />"/>
 	<input type="hidden" name="eduAplctOrd" id="eduAplctOrd"/>
@@ -562,6 +602,42 @@
 													미입력 
 												</c:otherwise>
 											</c:choose>
+
+							<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.aplctStateCd eq 20 and list.qestnrId10Cnt gt 0}">
+										<!-- 작성된 설문이 있다 -->
+											<button type="button" class="btn_type04" data-tooltip="sub37_pop20" 
+											onclick="fncInstrCostNewInfo('${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}">
+										<!-- 작성된 설문이 없다 -->
+											등록된 설문없음						
+										</c:when>
+								
+										<c:otherwise>
+											-
+										</c:otherwise>
+									</c:choose>	
+
+								</c:when>
+								<c:otherwise>
+								<!-- 설문노출대상 아님 -->
+									-
+								</c:otherwise>
+							</c:choose>											
 										</td>
 										<td>
 											<c:choose>
@@ -572,6 +648,18 @@
 												-
 												</c:otherwise>
 											</c:choose>
+											
+											<c:choose>
+												<c:when test="${list.aplctStateCd eq 20 and list.qestnrId10Cnt gt 0}">
+													<button type="button" title="이수증" class="btn_type01" onclick="fncCmpltCrtfc('<c:out value="${list.prcsOrd}"/>', '<c:out value="${list.eduAplctOrd}"/>');">이수증</button>
+												</c:when>
+												<c:when test="${list.aplctStateCd eq 20 and not(list.qestnrId10Cnt gt 0)}">
+													설문등록 후 발급
+												</c:when>
+												<c:otherwise>
+													-
+												</c:otherwise>								
+											</c:choose>												
 										</td>
 									</tr>					
 								</c:forEach>
@@ -646,5 +734,27 @@
 </div>
 </form:form>
 <!-- //cont -->
+
+<script src="http://119.193.215.98:8093/ReportingServer/html5/js/crownix-viewer.min.js"></script>
+<link rel="stylesheet" type="text/css" href="http://119.193.215.98:8093/ReportingServer/html5/css/crownix-viewer.min.css">
+<script>
+/*
+ * 오버레이 방식
+ */
+ 	function fncCmpltCrtfc(p_prcsAplctPrdOrd, p_eduAplctOrd){
+
+ 		var viewer = new m2soft.crownix.Viewer('http://119.193.215.98:8093/ReportingServer/service');
+
+		viewer.hideToolbarItem(["save"]);
+		viewer.showToolbarItem(["print_pdf"]);
+		
+		//viewer.openFile('cmplt_crtfc_20231030.mrd');
+		//viewer.openFile('cmplt_crtfc_20231030.mrd', '/rfn [cmplt_crtfc_20231030.json]');
+		//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+']');
+		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+']');
+
+ 	 	}
+</script>
+
 </body>
 </html>

src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp

@@ -206,6 +206,34 @@
 	    openPopupAndSubmitForm('popupForm', 'popupForm', 900, 1200);
 	}
 
+	//설문조사 결과
+	function fncInstrCostNewInfo(
+			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
+			) { //메뉴생성 화면 호출	
+		var form = document.popupNewForm;	
+
+		form.eduAplctOrd.value 	= id;
+		form.eduChasiOrd.value 	= chId;
+		form.siteIdCd.value 	= p_site_id_cd;
+		form.siteId.value 		= "50";
+
+		form.action.value 		= p_action;
+
+		form.qustnrTmplatId.value = p_qustnrTmplatId;
+		form.qestnrId.value = p_qestnrId;
+		form.qustnrRespondId.value = p_qustnrRespondId;
+
+		
+		form.action = "<c:url value='/kccadr/oprtn/fndthEnhanceTrn/popup/lctrEvalNewPopup.do'/>";
+	    openPopupAndSubmitForm('popupNewForm', 'popupNewForm', 900, 1200);
+	}
+		
 	/* 
 	function fnCnclPopup(eduAplctOrd, prcsAplctPrdOrd) {
 
@@ -267,6 +295,19 @@
 
 </head>
 <body>
+
+<form id="popupNewForm" name="popupNewForm" method="post">
+	<input type="hidden" name="eduAplctOrd" id="eduAplctOrd" value=""/>
+	<input type="hidden" name="eduChasiOrd" id="eduChasiOrd"/>
+	<input type="hidden" name="siteIdCd" id="siteIdCd"/>
+	<input type="hidden" name="siteId" id="siteId"/>
+	
+	<input type="hidden" name="action" id="action"/>
+	
+	<input type="hidden" name="qustnrTmplatId" id="qustnrTmplatId"/>
+	<input type="hidden" name="qestnrId" id="qestnrId"/>
+	<input type="hidden" name="qustnrRespondId" id="qustnrRespondId"/>
+</form>
 <form id="popupForm" name="popupForm" method="post">
 	<input type="hidden" name="prcsAplctPrdOrd" id="prcsAplctPrdOrd" value="<c:out value='${vEPrcsDetailVO.prcsAplctPrdOrd}' />"/>
 	<input type="hidden" name="eduAplctOrd" id="eduAplctOrd"/>
@@ -564,20 +605,60 @@
 											<button type="button" class="btn_type05" onclick="fn_statusChg('<c:out value="${list.eduAplctOrd }" />', '10')">미이수</button>
 										</td>
 										<td>
+<%-- 											<c:choose> --%>
+<%-- 												<c:when test="${list.qestRsltExists }"> --%>
+<%-- 													<button type="button" class="btn_type04" onclick="fncInstrCostInfo('${list.eduAplctOrd }', '${list.userId }');">설문결과</button> --%>
+											
+<%-- 												</c:when> --%>
+<%-- 												<c:otherwise> --%>
+<!-- 													미입력  -->
+<%-- 												</c:otherwise> --%>
+<%-- 											</c:choose>											 --%>
 							<c:choose>
-												<c:when test="${list.qestRsltExists }">
+								<c:when test="${list.aprvlCd eq 20 and list.qestRsltExists and list.aplctStateCd ne 10}">
-<%-- 													<button type="button" class="btn_type04" onclick="fncInstrCostInfo('<c:out value="${list.qestnrId }"/>');">설문결과</button> --%>
+								<!-- 설문노출대상(승인처리를 받았음(20) && 교육기간이 지났음 list.qestRsltExists=true && 미이수가 아닌것(10) ) -->
-													<button type="button" class="btn_type04" onclick="fncInstrCostInfo('${list.eduAplctOrd }', '${list.userId }');">설문결과</button>
+
+									<c:choose>
+										
+										<c:when test="${list.aplctStateCd eq 20 and list.qestnrId10Cnt gt 0}">
+										<!-- 작성된 설문이 있다 -->
+											<button type="button" class="btn_type04" data-tooltip="sub37_pop20" 
+											onclick="fncInstrCostNewInfo('${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}">
+										<!-- 작성된 설문이 없다 -->
+											등록된 설문없음						
+										</c:when>
+								
 										<c:otherwise>
-													미입력 
+											-
 										</c:otherwise>
 									</c:choose>	
+
+								</c:when>
+								<c:otherwise>
+								<!-- 설문노출대상 아님 -->
+									-
+								</c:otherwise>
+							</c:choose>
+													
+
 										</td>
 										<td>
 											<c:choose>
-												<c:when test="${list.qestRsltExists }">
+												<c:when test="${list.aplctStateCd eq 20 and list.qestnrId10Cnt gt 0}">
-													<button type="button" title="이수증" class="btn_type04" onclick="fncCmpltCrtfc('<c:out value="${info.prcsAplctPrdOrd}"/>', '<c:out value="${list.eduAplctOrd}"/>');">이수증</button>
+													<button type="button" title="이수증" class="btn_type01" onclick="fncCmpltCrtfc('<c:out value="${list.prcsOrd}"/>', '<c:out value="${list.eduAplctOrd}"/>');">이수증</button>
+												</c:when>
+												<c:when test="${list.aplctStateCd eq 20 and not(list.qestnrId10Cnt gt 0)}">
+													설문등록 후 발급
 												</c:when>
 												<c:otherwise>
 													-
@@ -673,7 +754,8 @@
 		
 		//viewer.openFile('cmplt_crtfc_20231030.mrd');
 		//viewer.openFile('cmplt_crtfc_20231030.mrd', '/rfn [cmplt_crtfc_20231030.json]');
-		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+']');
+		//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+']');
+		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+']');
 
  	 	}
 </script>

src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/popup/lctrEvalNewPopup.jsp

@@ -0,0 +1,353 @@
+<!DOCTYPE html>
+<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
+<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%
+	/**
+	 * @Class Name : instrCostPopup.jsp
+	 * @Description : 강사비용 팝업
+	 * @Modification Information
+	 * @
+	 * @  수정일      수정자          수정내용
+	 * @  -------     --------    ---------------------------
+	 * @ 2021.08.09   김봉호          최초 생성
+	 *  @author 안주영
+	 *  @since 2022.01.04
+	 *  @version 1.0
+	 *  @see
+	 *
+	 */
+%>
+<html lang="ko">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">	
+	<script type="text/javascript">
+	</script>
+	<title>강의배정팝업</title>
+	<script type="text/javaScript" language="javascript">
+		$(document).ready(function(){
+			/*
+			$.ajax({
+				type:"POST"
+				,url:"${pageContext.request.contextPath}/web/ve/aplct/fndtnEnhanceTrn/selectQustnrCommonAjax.do"
+				,data: {
+					"lctrDivCd" : "60" // 기반강화 -> 기소유예(60)도 같이써야함 
+//	 				,"eduChasiOrd" : chId
+				}
+				,dataType:'json'
+				,success:function(returnData){
+					console.log('returnData : ', returnData);
+					fn_makeQestnTbody(returnData);
+					
+					// update면 선택한 목록 가져오기
+// 					if(action == 'update'){
+						fn_selectQestnTbody();
+// 					}
+				}
+				,error:function(request , status, error){
+					alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+				}
+			});
+			*/
+		});
+		
+		
+		// 설문조사 문항 가져오기
+		function fn_makeQestnTbody(returnData){
+			
+			$('#qustnrTmplatId').val(returnData.qustnrTmplatId);
+			$('#qestnrId').val(returnData.qestnrId);
+			
+			
+			var data = returnData.Comtnqustnrqesitm; // 이 변수에 AJAX를 통해 가져온 데이터가 저장되어 있다고 가정
+
+			$('#qestmInfoSize').val(data.length);
+		    // tbody에 새로운 행들을 추가
+		    var $tbody = $("#qestnTbody");
+		    $tbody.empty(); // 기존의 tbody 내용을 비웁니다.
+
+		    $.each(data, function(index, item) {
+		        var $row = $("<tr></tr>");
+		        
+		        // hiddem값 셋팅
+		        $row.append('<input type="hidden" name="resultList[' + index + '].qestnrId" value="' + item.qestnrId + '">');
+		        $row.append('<input type="hidden" name="resultList[' + index + '].qestnrQesitmId" value="' + item.qestnrQesitmId + '">');
+		        $row.append('<input type="hidden" id="qustnrRsltId_'+index+'" name="resultList[' + index + '].qustnrRsltId" value="">');
+		        
+		        
+		    
+		        // 첫 번째 열: 설문 문항
+		        $row.append('<th scope="row" class="t_left">' + (index + 1) + ') ' + item.qestnCn + '</th>');
+
+		        // 평가 옵션 열 추가
+		        var inputTypes = ['verySatisfied', 'satisfied', 'neither', 'dissatisfied', 'veryDissatisfied'];
+		        $.each(inputTypes, function(i, type) {
+					var inputId = type + '_' + index;
+					var $cell = $('<td></td>');
+					var $label = $('<label for="' + inputId + '" class="label">' + type + '</label>');
+					var $input = $('<input type="radio" class="popupInput" id="' + inputId + '" name="resultList[' + index + '].responseRadio" value="' + type + '">');
+		            
+		            $cell.append($label).append($input);
+		            $row.append($cell);
+		        });
+		        $tbody.append($row);
+		    });
+			
+		}
+
+		function fn_selectQestnTbody(){
+
+			var data = new FormData(document.getElementById("createForm"));
+			
+			$.ajax({
+				type:"POST"
+				,url:"${pageContext.request.contextPath}/kccadr/oprtn/fndthEnhanceTrn/selectSrvyInfoAjax.do"
+				,data: data
+				,dataType:'json'
+				,async: false
+				,processData: false
+				,contentType: false
+				,cache: false
+				,success:function(returnData){
+					if(returnData.result == 'success'){
+						$('#qestnrRespondId').val(returnData.respondId);
+					    $.each(returnData.data, function(index, item) {
+					    	console.log('#'+item.verySatisfied+'_'+index);
+					    	
+					    	$('#qustnrRsltId'+'_'+index).val(item.qustnrRsltId);
+					    	
+					    	
+							if(item.verySatisfied == '1') {
+								$('#verySatisfied'+'_'+index).prop('checked', true);
+							}
+							if(item.satisfied == '1') {
+								$('#satisfied'+'_'+index).prop('checked', true);
+							}
+							if(item.neither == '1') {
+								$('#neither'+'_'+index).prop('checked', true);
+							}
+							if(item.dissatisfied == '1') {
+								$('#dissatisfied'+'_'+index).prop('checked', true);
+							}
+							if(item.veryDissatisfied == '1') {
+								$('#veryDissatisfied'+'_'+index).prop('checked', true);
+							}
+					    });
+						console.log('returnData : ', returnData);
+						
+					}else if(returnData.result == 'fail'){
+						alert(returnData.msg);
+//	 					location.href="${pageContext.request.contextPath}/web/user/login/ssoLogin.do?test=test";
+					}
+				}
+				,error:function(request , status, error){
+					alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+				}
+			});
+		}
+		
+		function fnSave(){
+			
+			if(confirm("수정 하시겠습니까?")){
+				var data = new FormData(document.getElementById("createForm"));
+				
+				$.ajax({
+					type:"POST"
+					,url:"${pageContext.request.contextPath}/kccadr/oprtn/fndthEnhanceTrn/mergeSrvyInfoAjax.do"
+					,data: data
+					,dataType:'json'
+					,async: false
+					,processData: false
+					,contentType: false
+					,cache: false
+					,success:function(returnData){
+						if(returnData.result == 'success'){
+							
+							alert("설문결과가 수정 되었습니다.");
+							location.reload();
+						}else if(returnData.result == 'fail'){
+							alert(returnData.msg);
+							location.href="${pageContext.request.contextPath}/web/user/login/ssoLogin.do?test=test";
+						}
+					}
+					,error:function(request , status, error){
+						alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+					}
+				});
+			}
+		}
+		
+		function fnDel(){
+
+			if(confirm("설문결과를 삭제 하시겠습니까?")){
+				var data = new FormData(document.getElementById("createForm"));
+				
+				$.ajax({
+					type:"POST"
+					,url:"${pageContext.request.contextPath}/kccadr/oprtn/fndthEnhanceTrn/delSrvyInfoAjax.do"
+					,data: data
+					,dataType:'json'
+					,async: false
+					,processData: false
+					,contentType: false
+					,cache: false
+					,success:function(returnData){
+						if(returnData.result == 'success'){
+							
+							alert("설문결과가 삭제 되었습니다.");
+							window.opener.location.reload();
+							fncPopClose(); 
+						}else if(returnData.result == 'fail'){
+							alert(returnData.msg);
+// 							location.href="${pageContext.request.contextPath}/web/user/login/ssoLogin.do?test=test";
+						}
+					}
+					,error:function(request , status, error){
+						alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+					}
+				});
+			}
+		}
+
+		function fncPopClose(){
+			self.close();
+		}
+	</script>
+</head>
+<body>
+
+<form:form id="createForm" name="createForm" method="post" commandName="vEInstrFeeAcmdtVO" onsubmit="return false;">
+	<input type="hidden" name="qustnrTmplatId" id="qustnrTmplatId" value="<c:out value="${vEPrcsDetailVO.qustnrTmplatId}" />">
+	<input type="hidden" name="eduAplctOrd" id="eduAplctOrd" value="<c:out value="${vEPrcsDetailVO.eduAplctOrd}" />">
+	<input type="hidden" name="respondId" id="respondId" value="<c:out value="${vEPrcsDetailVO.respondId}" />">
+	<div class="area_popup">
+		<div class="cont_popup">
+		
+			<div class="tb_tit01">
+				<p>교육 내용에 대한 전반적 만족도 평가</p>
+			</div>
+		<div class="tb_type01">
+		
+						<table>
+							<caption>평가문항, 매우만족, 만족, 보통, 불만족, 매우 불만족 입력</caption>
+							<colgroup>
+								<col style="width: auto;">
+								<col style="width: 50%;">
+							</colgroup>
+							<thead>
+								<tr>
+									<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 style="text-align:left;">
+										<label for="verySatisfied_${status1.index}" class="label">매우만족</label>
+										<input type="radio" numberOnly class="popupInput" style="width: 20px;padding:0 5px;text-align:center;" 
+										title="매우만족" id="verySatisfied_${status1.index}" name="resultList[${status1.index}].responseRadio" value="5"
+										
+											<c:if test="${QestmInfo.verySatisfied eq 1}">
+												checked
+											</c:if>
+											 
+										>
+										${QestmInfo.answer5}
+										<br/>
+									
+										<label for="satisfied_${status1.index}" class="label">만족</label>
+										<input type="radio" numberOnly class="popupInput" style="width: 20px;padding:0 5px;text-align:center;" 
+										title="만족" id="satisfied_${status1.index}" name="resultList[${status1.index}].responseRadio" value="4"
+										
+											<c:if test="${QestmInfo.satisfied eq 1}">
+												checked
+											</c:if>										
+										 
+										>
+										${QestmInfo.answer4}
+										<br/>
+									
+										<label for="neither_${status1.index}" class="label">보통</label>
+										<input type="radio" numberOnly class="popupInput" style="width: 20px;padding:0 5px;text-align:center;" 
+										title="보통" id="neither_${status1.index}" name="resultList[${status1.index}].responseRadio" value="3"
+										
+											<c:if test="${QestmInfo.neither eq 1}">
+												checked
+											</c:if>											
+										 
+										>
+										${QestmInfo.answer3}
+										<br/>
+									
+										<label for="dissatisfied_${status1.index}" class="label">불만족</label>
+										<input type="radio" numberOnly class="popupInput" style="width: 20px;padding:0 5px;text-align:center;" 
+										title="불만족" id="dissatisfied_${status1.index}" name="resultList[${status1.index}].responseRadio" value="2" 
+										
+											<c:if test="${QestmInfo.dissatisfied eq 1}">
+												checked
+											</c:if>												
+										
+										>
+										${QestmInfo.answer2}
+										<br/>
+						
+										<label for="veryDissatisfied_${status1.index}" class="label">매우불만족</label>
+										<input type="radio" numberOnly class="popupInput" style="width: 20px;padding:0 5px;text-align:center;" 
+										title="매우불만족" id="veryDissatisfied_${status1.index}" name="resultList[${status1.index}].responseRadio" value="1"
+										
+											<c:if test="${QestmInfo.veryDissatisfied eq 1}">
+												checked
+											</c:if>																					
+										 
+										>
+										${QestmInfo.answer1}
+										<br/>
+									</td>
+								</tr>
+								</c:forEach>
+							</tbody>
+						</table>		
+		
+			</div>
+			
+			
+			<div class="btn_wrap_pop btn_layout01">
+				<div class="btn_left">
+				</div>
+				<div class="btn_center">
+
+<!-- 					<button type="button" class="btn_type04" onclick="fnSave()">수정</button> -->
+<!-- 					<button type="button" class="btn_type05" onclick="fnDel()">삭제</button> -->
+					<button type="button" class="btn_type02" onclick="fncPopClose()">닫기</button>
+				</div>
+				<div class="btn_right">
+				</div>
+			</div>
+		</div>
+	</div>
+</form:form>
+
+</body>
+</html>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp

@@ -429,7 +429,7 @@ $(document).ready(function(){
 
 									<c:choose>
 										
-										<c:when test="${list.qestnrId10Cnt gt 0}">
+										<c:when test="${list.aplctStateCd eq 20 and list.qestnrId10Cnt gt 0}">
 										<!-- 작성된 설문이 있다 -->
 											<button type="button" class="btnType02" data-tooltip="sub37_pop20" 
 											onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','select'
@@ -468,10 +468,10 @@ $(document).ready(function(){
 						</td>
 						<td>
 							<c:choose>
-								<c:when test="${list.qestnrId10Cnt gt 0}">
+								<c:when test="${list.aplctStateCd eq 20 and list.qestnrId10Cnt gt 0}">
 									<button type="button" title="이수증" 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 test="${list.aplctStateCd eq 20 and not(list.qestnrId10Cnt gt 0)}">
 									설문등록 후 발급
 								</c:when>
 								<c:otherwise>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp

@@ -289,7 +289,16 @@
 						<td>
 							<c:out value="${list.eduStrtPnttm}"/>~<c:out value="${list.eduDdlnPnttm}"/>
 						</td>
-						<td><kc:code codeId="VE0003" code="${list.aprvlCd}"/></td>
+						<td>
+							<c:choose>
+								<c:when test="${not empty list.aplctStateCd }">
+									<kc:code codeId="VEA003" code="${list.aplctStateCd}"/>	
+								</c:when>
+								<c:otherwise>
+									<kc:code codeId="VE0003" code="${list.aprvlCd}"/>
+								</c:otherwise>
+							</c:choose>
+						</td>
 						<td>
 						
 						
@@ -337,7 +346,7 @@
 
 									<c:choose>
 										
-										<c:when test="${list.qestnrId10Cnt gt 0}">
+										<c:when test="${list.aplctStateCd eq 20 and list.qestnrId10Cnt gt 0}">
 										<!-- 작성된 설문이 있다 -->
 											<button type="button" class="btnType02" data-tooltip="sub37_pop20" 
 											onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','select'
@@ -385,12 +394,12 @@
 <%-- 							</c:choose> --%>
 
 							<c:choose>
-								<c:when test="${list.qestnrId10Cnt gt 0}">
+								<c:when test="${list.aplctStateCd eq 20 and 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 test="${list.aplctStateCd eq 20 and not(list.qestnrId10Cnt gt 0)}">
 									설문등록 후 발급
 								</c:when>
 								<c:otherwise>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp

@@ -206,7 +206,16 @@
 <%-- 							<c:out value="${list.eduStrtPnttm}"/>~<c:out value="${list.eduDdlnPnttm}"/> --%>
 							<c:out value="${list.eduStrtPnttm}"/>
 						</td>
-						<td><kc:code codeId="VE0003" code="${list.aprvlCd}"/></td>
+						<td>
+							<c:choose>
+								<c:when test="${not empty list.aplctStateCd }">
+									<kc:code codeId="VEA003" code="${list.aplctStateCd}"/>	
+								</c:when>
+								<c:otherwise>
+									<kc:code codeId="VE0003" code="${list.aprvlCd}"/>
+								</c:otherwise>
+							</c:choose>						
+						</td>
 						<td>
 								<!-- 신청 승인상태 20 and 현재가 교육종료보다 이후 체크 1 -->
 <%-- 							<c:choose> --%>
@@ -227,7 +236,7 @@
 
 									<c:choose>
 										
-										<c:when test="${list.qestnrId10Cnt gt 0}">
+										<c:when test="${list.aplctStateCd eq 20 and list.qestnrId10Cnt gt 0}">
 										<!-- 작성된 설문이 있다 -->
 											<button type="button" class="btnType02" data-tooltip="sub37_pop20" 
 											onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','select'

src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp

@@ -570,7 +570,7 @@ $(document).ready(function(){
 
 									<c:choose>
 										
-										<c:when test="${list.qestnrId10Cnt gt 0}">
+										<c:when test="${list.aplctStateCd eq 20 and list.qestnrId10Cnt gt 0}">
 										<!-- 작성된 설문이 있다 -->
 											<button type="button" class="btnType02" data-tooltip="sub37_pop20" 
 											onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','select'