From 1b5b4dc1d5e96439138c0a7e9195da0f25e59098 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Thu, 9 Nov 2023 11:21:01 +0900
Subject: [PATCH] =?UTF-8?q?2023-11-09=2011:20=20=EC=B2=AD=EC=86=8C?=
 =?UTF-8?q?=EB=85=84=20=EA=B0=95=EC=82=AC=20=ED=99=9C=EB=8F=99=20=ED=99=95?=
 =?UTF-8?q?=EC=9D=B8=EC=84=9C=20=EC=9E=91=EC=97=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aplct/comweb/CrownixAjaxController.java   | 113 ++-
 .../asgnmInfo/web/VEAdultAsgnmController.java |   3 +-
 .../asgnmInfo/web/VEAsgnmController.java      |   2 +-
 .../instrInfo/service/VEInstrMixService.java  |   3 +
 .../instrInfo/service/impl/VEInstrMixDAO.java |   5 +
 .../service/impl/VEInstrMixServiceImpl.java   |   5 +
 .../ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml       |   6 +-
 .../ve/instr/VEInstrDetail_SQL_Tibero.xml     |   2 +
 .../ve/instr/VEInstr_MIX_SQL_Tibero.xml       |  19 +
 .../oprtn/adultVisitEdu/eduCnfrmMngList.jsp   | 181 ++++-
 .../jsp/oprtn/adultVisitEdu/instrMngList.jsp  |   2 +-
 .../jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp |  51 ++
 .../adultVisitEdu/eduAplct/eduAplctDetail.jsp |   2 +-
 .../aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp | 733 +++++++++---------
 .../asgnmInfo/instrAsgnmRqstDetail.jsp        |   2 +-
 15 files changed, 725 insertions(+), 404 deletions(-)

diff --git a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java
index 787e665b..1fe72bfd 100644
--- a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java
+++ b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java
@@ -533,9 +533,120 @@ public class CrownixAjaxController {
 	    		
 	    	}
 	    	
-	    	modelAndView.addObject("계약사항", jsReqInfo);
+	    	modelAndView.addObject("instrs", jsReqInfo);
 	    	
 			return modelAndView;
 			
 		}
+		
+
+		/**
+		 * 청소년 강사 활동내역서 출력 정보
+		 * 
+		 */
+		@RequestMapping("/ve/aplct/tngrVisitEdu/eduAplct/instrActivityAjax.do")
+		public ModelAndView instrActivityAjax(
+				ModelMap model
+				, HttpServletRequest request
+				) throws Exception {
+			
+			ModelAndView modelAndView = new ModelAndView();
+			modelAndView.setViewName("jsonView");
+			
+			System.out.println("----------------");
+			System.out.println(request.getParameter("p_userId"));
+			System.out.println("----------------");
+
+			//강사신청정보
+			VEInstrDetailVO	vEInstrDetailVO	=	new	VEInstrDetailVO();
+			vEInstrDetailVO.setInstrDiv("10");
+			vEInstrDetailVO.setUseYn("Y");
+			vEInstrDetailVO.setSbmtYn("Y");
+			vEInstrDetailVO.setUserId(request.getParameter("p_userId"));			
+			VEInstrDetailVO vEInstrDetailVODetail = vEInstrDetailService.selectDetail(vEInstrDetailVO);
+			vEInstrDetailVODetail	=	egovCryptoUtil.decryptVEInstrDetailVO(vEInstrDetailVODetail);
+			
+			modelAndView.addObject("page_1_11", vEInstrDetailVODetail.getInstrNm());
+			modelAndView.addObject("page_1_12", vEInstrDetailVODetail.getdBirth());
+			modelAndView.addObject("page_1_13", "-");
+			modelAndView.addObject("page_1_14", "-");
+			modelAndView.addObject("page_1_15", "-");
+			modelAndView.addObject("page_1_16", vEInstrDetailVODetail.getPhone());
+			modelAndView.addObject("page_1_17", vEInstrDetailVODetail.getAddr()+vEInstrDetailVODetail.getAddrDetail());
+			
+			modelAndView.addObject("page_1_21", "기관제출용");
+			modelAndView.addObject("page_1_22", "비영리");
+			modelAndView.addObject("page_1_23", "120-82-09301");
+			modelAndView.addObject("page_1_24", "최병구");
+			modelAndView.addObject("page_1_25", "교육체험본부(교육운영팀)");
+			modelAndView.addObject("page_1_26", "경상남도 진주시 소호로 117");
+			modelAndView.addObject("page_1_27", vEInstrDetailVODetail.getAprvlPnttm()+"~");
+			modelAndView.addObject("page_1_28", "-");
+			
+			modelAndView.addObject("page_1_31", "상기 인은 우리 위원회에서 저작권 강사(청년강사)로 위촉되어 활동하였음을 확인합니다.");			
+			modelAndView.addObject("page_1_32", vEInstrDetailVODetail.getHstryPnttm());
+			
+			/*
+			,"page_1_10":"<2023-31호>"
+				 
+				,"page_1_11":"전여자"	
+				,"page_1_12":"1980년 10월 23일"	
+				,"page_1_13":"여"	
+				,"page_1_14":"-"	
+				,"page_1_15":"-"	
+				,"page_1_16":"010-0000-1111"	
+				,"page_1_17":"경기도 군포시 산본천로 3, A-B-100"	
+				
+				,"page_1_21":"기관제출용"	
+				,"page_1_22":"비영리"	
+				,"page_1_23":"120-82-09301"	
+				,"page_1_24":"최병구"	
+				,"page_1_25":"교육체험본부(교육운영팀)"	
+				,"page_1_26":"경상남도 진주시 소호로 117"	
+				,"page_1_27":"2013.07.15 ~ 2023.12.31"	
+				,"page_1_28":"총 197회, 397시간 [세부내용 별지 참조]"	
+				
+				,"page_1_31":"상기 인은 우리 위원회에서 저작권 강사(청년강사)로 위촉되어 활동하였음을 확인합니다."	
+				,"page_1_32":"2023년 06월 29일"	
+					*/
+			
+			//강사활동리스트
+			List<VEInstrDetailVO> vEInstrDetailVOList = vEInstrMixService.selectPagingActivityList4Report(vEInstrDetailVO);
+	    	//복호화
+	    	vEInstrDetailVOList = egovCryptoUtil.decryptVEInstrDetailVOList(vEInstrDetailVOList);
+	    	
+	    	JSONArray jsReqInfo = new JSONArray();		//차시 정보
+	    	
+	    	int i_sumChasi	=	0;
+	    	for (int i=0;i<vEInstrDetailVOList.size();i++) {
+	    		JSONObject jsDrtInfo = new JSONObject();	//전체 정보
+	    		jsDrtInfo.put("data_1", i+1);
+	    		jsDrtInfo.put("data_2", vEInstrDetailVOList.get(i).getEduHopeDt().substring(0,4)+"년");
+	    		jsDrtInfo.put("data_3", vEInstrDetailVOList.get(i).getEduHopeDt().substring(5,7)+"월");
+	    		jsDrtInfo.put("data_4", vEInstrDetailVOList.get(i).getEduHopeDt().substring(8,10)+"일");
+	    		jsDrtInfo.put("data_5", vEInstrDetailVOList.get(i).getScholInsttNm());	    		
+	    		jsDrtInfo.put("data_6", vEInstrDetailVOList.get(i).getLrnTm()+"차시");
+	    		
+	    		i_sumChasi	=	i_sumChasi	+	Integer.parseInt(vEInstrDetailVOList.get(i).getLrnTm());
+	    				
+	    		jsReqInfo.add(jsDrtInfo);
+	    		
+	    		/*
+	    		 * 				"data_1":"4"
+				,"data_2":"2020년"
+				,"data_3":"10월"
+				,"data_4":"29일"
+				,"data_5":"대박초등학교"
+				,"data_6":"4시간"
+	    		 * */
+	    		
+	    	}
+	    	
+	    	modelAndView.addObject("page_1_28", "총 "+vEInstrDetailVOList.size()+"회, "+i_sumChasi+"차시 [세부내용 별지 참조]");
+	    	
+	    	modelAndView.addObject("instrs", jsReqInfo);
+	    	
+			return modelAndView;
+			
+		}		
 }
diff --git a/src/main/java/kcc/ve/instr/adultVisitEdu/asgnmInfo/web/VEAdultAsgnmController.java b/src/main/java/kcc/ve/instr/adultVisitEdu/asgnmInfo/web/VEAdultAsgnmController.java
index dcdd9cb1..8b2fbc28 100644
--- a/src/main/java/kcc/ve/instr/adultVisitEdu/asgnmInfo/web/VEAdultAsgnmController.java
+++ b/src/main/java/kcc/ve/instr/adultVisitEdu/asgnmInfo/web/VEAdultAsgnmController.java
@@ -287,7 +287,8 @@ public class VEAdultAsgnmController {
 			model.addAttribute("loginVO", loginVO);
 			//로그인 처리====================================  
 			
-			VEInstrAsgnmVO vEInstrAsgnmVOInfo = vEAsgnmMIXService.selectAsgnmRqstDetail(vEInstrAsgnmVO);
+			//VEInstrAsgnmVO vEInstrAsgnmVOInfo = vEAsgnmMIXService.selectAsgnmRqstDetail(vEInstrAsgnmVO);
+			VEInstrAsgnmVO vEInstrAsgnmVOInfo = vEAsgnmMIXService.selectAsgnmRqstDetail4(vEInstrAsgnmVO);
 			vEInstrAsgnmVOInfo	=	egovCryptoUtil.decryptVEInstrAsgnmVO(vEInstrAsgnmVOInfo);
 			//대상 리스트, 페이징 정보 전달
 			model.addAttribute("info", vEInstrAsgnmVOInfo);
diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java
index e2f486e0..7853382e 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java
@@ -668,7 +668,7 @@ public class VEAsgnmController {
 			}else if("40".equals(vEInstrAsgnmVO.getAsgnmAprvlCd())) { //요청 거절 시 강사배정내역 테이블에 insert. 요청 목록에서 거절한 항목 조회를 위해(VE0025)
 				vEInstrAsgnmVO.setHstryCd("10"); //거절
 				vEAsgnmMIXService.insertAsgnmHstry(vEInstrAsgnmVO);
-			}else if("60".equals(vEInstrAsgnmVO.getAsgnmAprvlCd())) { //요청 거절 시 강사배정내역 테이블에 insert. 요청 목록에서 거절한 항목 조회를 위해(VE0025)
+			}else if("60".equals(vEInstrAsgnmVO.getAsgnmAprvlCd())) { //변경 요청 거절 시 강사배정내역 테이블에 insert. 요청 목록에서 거절한 항목 조회를 위해(VE0025)
 				vEInstrAsgnmVO.setHstryCd("40"); //변경요청
 				vEAsgnmMIXService.insertAsgnmHstry(vEInstrAsgnmVO);
 			}
diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrMixService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrMixService.java
index b6329d15..52a065dc 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrMixService.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrMixService.java
@@ -44,6 +44,9 @@ public interface VEInstrMixService {
 	//L page (강사디테일 믹스)
 	List<VEInstrDetailVO> selectPagingDetailList4Asgnm(VEInstrDetailVO vEInstrDetailVO) throws Exception;
 
+	//L page (강사활동리스트)
+	List<VEInstrDetailVO> selectPagingActivityList4Report(VEInstrDetailVO vEInstrDetailVO) throws Exception;
+	
 	//L (특정강사배정용리스트)
 	List<VEInstrDetailVO> selectDetailList(VEInstrDetailVO vEInstrDetailVO) throws Exception;
 	
diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixDAO.java
index 2d11a908..0347667e 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixDAO.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixDAO.java
@@ -95,6 +95,11 @@ public class VEInstrMixDAO extends EgovAbstractDAO {
 		return tlist;
 	}
 	
+	public List<VEInstrDetailVO> selectPagingActivityList4Report(VEInstrDetailVO vEInstrDetailVO) throws Exception {
+		List<VEInstrDetailVO> tlist = (List<VEInstrDetailVO>) list("VEInstrMixDAO.selectPagingActivityList4Report", vEInstrDetailVO);
+		return tlist;
+	}
+	
 	public List<VEInstrDetailVO> selectDetailList(VEInstrDetailVO vEInstrDetailVO) throws Exception {
 		List<VEInstrDetailVO> tlist = (List<VEInstrDetailVO>) list("VEInstrMixDAO.selectDetailList", vEInstrDetailVO);
 		return tlist;
diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixServiceImpl.java
index 9c1b2cd0..c2098558 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixServiceImpl.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixServiceImpl.java
@@ -76,6 +76,11 @@ public class VEInstrMixServiceImpl implements VEInstrMixService {
 	public List<VEInstrDetailVO> selectPagingDetailList4Asgnm(VEInstrDetailVO vEInstrDetailVO) throws Exception{
 		return vEInstrMixDAO.selectPagingDetailList4Asgnm(vEInstrDetailVO);
 	}
+
+	//paging List
+	public List<VEInstrDetailVO> selectPagingActivityList4Report(VEInstrDetailVO vEInstrDetailVO) throws Exception{
+		return vEInstrMixDAO.selectPagingActivityList4Report(vEInstrDetailVO);
+	}	
 	
 	//List
 	public List<VEInstrDetailVO> selectDetailList(VEInstrDetailVO vEInstrDetailVO) throws Exception{
diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml
index 4a387e2e..a9de88b8 100644
--- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml
@@ -1047,7 +1047,7 @@
 	
 	<!-- 배정내역 테이블 등록 -->
 	<insert id="VEAsgnmMIXDAO.insertAsgnmHstry" parameterClass="VEInstrAsgnmVO">
-				
+				/*	VEAsgnmMIXDAO.insertAsgnmHstry	*/
 		INSERT INTO ve_edu_chasi_instr_asgnm_hstry(
 			edu_aplct_ord,
 			edu_chasi_ord,
@@ -1058,9 +1058,7 @@
        		#eduChasiOrd#,
 			#userId#,
 			#hstryCd#
-		)
-		ON DUPLICATE KEY UPDATE 
-			hstry_cd=#hstryCd# 
+		) 
 	</insert>	
 	
 	<!-- 배정내역 테이블 삭제 -->
diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml
index c4090802..43caff98 100644
--- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml
@@ -317,6 +317,8 @@
 	/*	강사 추가 정보	VEInstrDetailDAO.selectDetail	*/
 		SELECT
 			<include refid="VEInstrDetailDAO.select_column_name"/>
+			, TO_CHAR(SYSDATE,'YYYY')||'년'||TO_CHAR(SYSDATE,'MM')||'월'||TO_CHAR(SYSDATE,'DD')||'일'	
+			AS	hstryPnttm
 		FROM 
 			<include refid="VEInstrDetailDAO.table_name"/> a
 		WHERE
diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml
index 5942793a..6f44efab 100644
--- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml
@@ -1041,6 +1041,25 @@
 					
 	</select>		
 	
+	<!-- 강사 디테일 정보 L page -->
+	<select id="VEInstrMixDAO.selectPagingActivityList4Report" parameterClass="VEInstrDetailVO" resultClass="VEInstrDetailVO">
+		/*	VEInstrMixDAO.selectPagingActivityList4Report	*/
+		SELECT 
+			a.edu_hope_dt		AS	eduHopeDt
+			, c.SCHOL_INSTT_NM 	AS	scholInsttNm		
+			, a.CHASI 			AS	lrnTm
+		FROM ve_edu_chasi a
+			, ve_edu_chasi_instr_asgnm b
+			, ve_edu_aplct c
+		WHERE a.EDU_APLCT_ORD =b.EDU_APLCT_ORD 
+			AND a.EDU_CHASI_ORD =b.EDU_CHASI_ORD 
+			AND b.USER_ID =#userId#
+			AND b.ASGNM_APRVL_CD ='30'
+			AND a.EDU_APLCT_ORD =c.EDU_APLCT_ORD 
+		ORDER BY a.edu_hope_dt
+					
+	</select>		
+	
 	<!-- 특정 강사 배정용 리스트 L -->
 	<select id="VEInstrMixDAO.selectDetailList" parameterClass="VEInstrDetailVO" resultClass="VEInstrDetailVO">
 		/*	VEInstrMixDAO.selectDetailList	*/
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp
index 70a277a0..89529cee 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp
@@ -302,31 +302,75 @@
 				alert("선택된 대상이 없습니다.");
 				return ;
 			}
-			
-			$.ajax({
-				type:"POST",
-				url:"${pageContext.request.contextPath}/web/ve/comm/instrMassAsgnmDeleteAjax.do",
-				data: {
-					"eduAplctOrd" : varEduAplctOrd ,
-					//"instrDiv" : "10" ,
-					
-				},
-				dataType:'json',
-				success:function(returnData){
-					if(returnData.result=="success"){
-						alert("상태가 변경 되었습니다.");
-						fncGoList();
-					}else{
-						alert("강사 자동 배정 중에 오류가 발생 되었습니다.");
-						fncGoList();
+
+			if(confirm("강사배정삭제을 진행하시겠습니까?")){
+				$.ajax({
+					type:"POST",
+					url:"${pageContext.request.contextPath}/web/ve/comm/instrMassAsgnmDeleteAjax.do",
+					data: {
+						"eduAplctOrd" : varEduAplctOrd ,
+						//"instrDiv" : "10" ,
+						
+					},
+					dataType:'json',
+					success:function(returnData){
+						if(returnData.result=="success"){
+							alert("상태가 변경 되었습니다.");
+							fncGoList();
+						}else{
+							alert("강사 자동 배정 중에 오류가 발생 되었습니다.");
+							fncGoList();
+						}
+					},
+					error:function(request , status, error){
+						alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
 					}
-				},
-				error:function(request , status, error){
-					alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
-				}
-			});		
+				});	
+			}
+	
 		}	
-		
+
+		function fncInstrMassAsgnm30(){
+			var varEduAplctOrd = '';
+
+			$('input:checkbox[name="chk"]:checked').each(function() {
+				varEduAplctOrd = varEduAplctOrd + $(this).val() + "__";
+				
+			});
+			
+			if (varEduAplctOrd==''){
+				alert("선택된 대상이 없습니다.");
+				return ;
+			}
+
+			if(confirm("강사교육확정을 진행하시겠습니까?")){
+				$.ajax({
+					type:"POST",
+					url:"${pageContext.request.contextPath}/web/ve/comm/instrMassAsgnm30Ajax.do",
+					data: {
+						"eduAplctOrd" : varEduAplctOrd ,
+						"asgnmAprvlCd" : "30" ,						
+						//"instrDiv" : "10" ,
+						
+					},
+					dataType:'json',
+					success:function(returnData){
+						if(returnData.result=="success"){
+							alert("상태가 변경 되었습니다.");
+							fncGoList();
+						}else{
+							alert("강사 자동 배정 중에 오류가 발생 되었습니다.");
+							fncGoList();
+						}
+					},
+					error:function(request , status, error){
+						alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+					}
+				});	
+			}
+	
+		}	
+				
 		// 엑셀다운로드
 		function excelDownLoad() {
 			var listForm = document.listForm ;
@@ -350,7 +394,80 @@
 				}
 			});
 		}		
-		
+
+		// 배정 상태 변경
+		function fncModifyStat(flag) {
+			var chkLen = $(listForm).find("input[name=chk]:checked").length;
+			var chkStatCd = "";
+			var msg = "";
+			var actionUrl = "";
+
+			if(chkLen == 0){
+				alert("선택된 항목이 없습니다.");
+				return;
+			}
+
+			//강의수락요청
+			if(flag == 'new') {
+				chkStatCd = "10";
+				msg = "강의 수락 요청";
+				actionUrl = "${pageContext.request.contextPath}/kccadr/oprtn/tngrVisitEdu/instrAsgnmCnfrmAjax.do";
+				
+				
+				var deadlineDt = $("#deadlineDt").val();
+				if(deadlineDt == ""){
+					alert("마감일자를 선택해 주세요.");
+					return;
+				}
+				var date1 = new Date();
+				var date2 = new Date(deadlineDt);
+				
+				if(date1 > date2){
+					alert("마감일자는 금일일자보다 커야합니다.");
+					return;
+				}
+			}
+			 //추가강의요청
+			if(flag == 'add') {
+				chkStatCd = "40";
+				msg = "추가 강의 요청";
+				actionUrl = "${pageContext.request.contextPath}/kccadr/oprtn/tngrVisitEdu/lctrAddAjax.do";
+			}
+
+			var fnExit = false;
+
+			$('input:checkbox[name="chk"]:checked').each(function() {
+				if($(this).attr("class") != chkStatCd) {
+					alert("선택한 목록 중 " + msg + "이 불가능한 건이 있습니다.");
+					fnExit = true;
+				}
+			});
+			//체크한 리스트 중 해당 상태에 실행 불가능한 건이 있는지 체크 후, 존재 시 함수 종료
+			if(fnExit) return false;
+						
+			var data1 = new FormData(document.getElementById("listForm"));
+			if(confirm(msg+"을 진행하시겠습니까?")){
+				$.ajax({
+					type:"POST",
+					url:actionUrl,
+					data: data1,
+					dataType:'json',
+					async: false,
+					processData: false,
+					contentType: false,
+					cache: false,
+					success:function(returnData){
+						if(returnData.result == 'success'){
+							alert("저장 되었습니다.");
+							location.reload();
+						}
+					},
+					error:function(request , status, error){
+						alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+					}
+				});
+			}
+		}		
 	</script>
 	<title>신청관리</title>
 </head>
@@ -570,15 +687,25 @@
 				<!-- //list -->
 				
 				<div class="btn_wrap btn_layout01">
-					<div class="btn_left">
+					<div class="btn_left">						
 						<button type="button" class="btn_type06" onclick="excelDownLoad();">엑셀다운로드</button>
+						<button type="button" class="btn_type06" onclick="fncInstrMassAsgnm30(); return false;">강사교육확정</button>
 					</div>
 					<div class="btn_center">
 						<!-- <button type="button" class="btn_type06" onclick="fncModifyStat('add'); return false;">추가강의요청</button> -->
+						<button type="button" class="btn_type06" onclick="fncInstrMassAsgnmDelete(); return false;">강사배정삭제</button>						
 					</div>
 					<div class="btn_right">
 						<!-- <button type="button" class="btn_type06" onclick="fncModifyStat('new'); return false;">강의수락요청</button> -->
-						<button type="button" class="btn_type06" onclick="fncSndSms(); return false;">교육확정알림</button>
+<!-- 						<button type="button" class="btn_type06" onclick="fncSndSms(); return false;">교육확정알림</button> -->
+						
+						<button class="btn_type08" disabled>마감일자지정</button>
+						<div class="calendar_wrap">
+							<input type="text" class="calendar" title="시작일 선택" id="deadlineDt" name="deadlineDt" value="">
+						</div>
+						
+						<button type="button" class="btn_type06" onclick="fncModifyStat('new'); return false;">강의수락요청</button>						
+						
 					</div>
 				</div>	
 					
@@ -596,7 +723,7 @@
 						
 					</div>
 					<div class="btn_right">						
-						<button type="button" class="btn_type06" onclick="fncInstrMassAsgnmDelete(); return false;">강사배정삭제</button>
+						
 					</div>
 				</div>					
 			</div>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp
index 27e50422..d1f57b27 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp
@@ -344,8 +344,8 @@
 		//viewer.openFile('adult_instr_20231102.mrd', '/rfn [adult_instr_20231102.json]');
 		//viewer.openFile('adult_instr_20231102.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetailAjax.do?p_instrId='+('#p_instrId').val()+']');
 		//viewer.openFile('adult_instrs_20231107.mrd', '/rf [http://192.168.0.59:3080/offedu/ve/aplct/adultVisitEdu/eduAplct/instrDetailListAjax.do?p_searchQlfctEndYn="'+v_searchQlfctEndYn+'"&p_searcDivCd="'+v_searcDivCd+'"&p_searchKeyword="'+v_searchKeyword+'"]');
-		//viewer.openFile('adult_instrs_20231107.mrd', '/rf [http://192.168.0.59:3080/offedu/ve/aplct/adultVisitEdu/eduAplct/instrDetailListAjax.do?p_searchQlfctEndYn='+v_searchQlfctEndYn+'&p_searcDivCd='+v_searcDivCd+'&p_searchKeyword='+v_searchKeyword+']');
 		viewer.openFile('adult_instrs_20231107.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/adultVisitEdu/eduAplct/instrDetailListAjax.do?p_searchQlfctEndYn='+v_searchQlfctEndYn+'&p_searcDivCd='+v_searcDivCd+'&p_searchKeyword='+v_searchKeyword+']');
+		//viewer.openFile('adult_instrs_20231107.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/adultVisitEdu/eduAplct/instrDetailListAjax.do?p_searchQlfctEndYn='+v_searchQlfctEndYn+'&p_searcDivCd='+v_searcDivCd+'&p_searchKeyword='+v_searchKeyword+']');
 
 		//System.out.println(request.getParameter("searchQlfctEndYn"));
 		//System.out.println(request.getParameter("searcDivCd"));
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp
index b875d4a5..fa154786 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp
@@ -961,6 +961,10 @@
 				</div>
 				<div class="btn_right">
 					<button type="button" class="btn_type04" onclick="fnInstrHstryInsert(); return false;">이력 등록</button>
+					
+					<button type="button" class="btn_type04" onclick="fncCmpltCrtfc(); return false;">강사위촉및 활동 확인서출력</button>
+					
+					
 				</div>
 			</div>				
 			
@@ -977,5 +981,52 @@
 	
 </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){
+ 	function fncCmpltCrtfc(){
+
+ 		var v_userId	=	$('#userId').val();
+
+ 		//alert('/rf [http://192.168.0.59:3080/offedu/ve/aplct/adultVisitEdu/eduAplct/instrDetailListAjax.do?p_searchQlfctEndYn="'+v_searchQlfctEndYn+'"&p_searcDivCd="'+v_searcDivCd+'"&p_searchKeyword="'+v_searchKeyword+'"]');
+ 		
+ 		
+ 		var viewer = new m2soft.crownix.Viewer('http://119.193.215.98:8093/ReportingServer/service');
+		//viewer.openFile('cmplt_crtfc_20231030.mrd', '/rfn [jsonsample_red_2.json]');
+		//viewer.openFile('cmplt_crtfc_20231030.mrd','/rexport [5]');
+		//viewer.openFile('sample.mrd','/rfn [sample.txt]');
+		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('sample.mrd');p_prcsAplctPrdOrd, p_eduAplctOrd
+		//viewer.openFile('adult_instr_20231102.mrd', '/rfn [adult_instr_20231102.json]');
+		//viewer.openFile('adult_instr_20231102.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetailAjax.do?p_instrId='+('#p_instrId').val()+']');
+		//viewer.openFile('adult_instrs_20231107.mrd', '/rf [http://192.168.0.59:3080/offedu/ve/aplct/adultVisitEdu/eduAplct/instrDetailListAjax.do?p_searchQlfctEndYn="'+v_searchQlfctEndYn+'"&p_searcDivCd="'+v_searcDivCd+'"&p_searchKeyword="'+v_searchKeyword+'"]');
+		//viewer.openFile('adult_instrs_20231107.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/adultVisitEdu/eduAplct/instrDetailListAjax.do?p_searchQlfctEndYn='+v_searchQlfctEndYn+'&p_searcDivCd='+v_searcDivCd+'&p_searchKeyword='+v_searchKeyword+']');
+		//viewer.openFile('adult_instrs_20231107.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/adultVisitEdu/eduAplct/instrDetailListAjax.do?p_searchQlfctEndYn='+v_searchQlfctEndYn+'&p_searcDivCd='+v_searcDivCd+'&p_searchKeyword='+v_searchKeyword+']');
+		viewer.openFile('instr_activity_20231108.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/tngrVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+']');
+		
+		
+		/*
+		var viewer = new m2soft.crownix.Viewer('http://192.168.0.176:8093/ReportingServer/service',
+		'crownix-viewer');
+viewer.openFile('cmplt_crtfc_20231030.mrd');
+*/
+ 	 	}
+	 	/*
+	window.onload = function(){	
+		var viewer = new m2soft.crownix.Viewer('http://192.168.0.176:8093/ReportingServer/service');
+		viewer.openFile('json_subject.mrd', '/rfn [jsonsample_red_2.json]');
+	};	 
+	*/
+</script>
+
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp
index 91bf146f..227a59f6 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp
@@ -734,7 +734,7 @@
 		//viewer.openFile('sample.mrd');p_prcsAplctPrdOrd, p_eduAplctOrd
 		//viewer.openFile('adult_instr_20231102.mrd', '/rfn [adult_instr_20231102.json]');
 		//viewer.openFile('adult_instr_20231102.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetailAjax.do?p_instrId='+('#p_instrId').val()+']');
-		viewer.openFile('adult_instr_20231102.mrd', '/rf [http://192.168.0.59:3080/offedu/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetailAjax.do?p_instrId='+v_userId+']');
+		viewer.openFile('adult_instr_20231102.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetailAjax.do?p_instrId='+v_userId+']');
 		
 
 		
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 6fa51cef..69cbd156 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
@@ -1,368 +1,367 @@
-<%@ 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="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
-<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %>
-<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
-<un:useConstants var="VeConstants" className="kcc.ve.cmm.VeConstants" />
-<title>교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템</title>
-<meta http-equiv="content-type" content="text/html; charset=utf-8">
-<script type="text/javaScript" language="javascript">
-
-
-
-$(document).ready(function(){
-	
-});
-
-	function fncEduReg(prcsAplctPrdOrd){
-		var regForm = document.regForm;
-		regForm.prcsAplctPrdOrd.value = prcsAplctPrdOrd;
-		
-		var data = new FormData(document.getElementById("regForm"));
-		if(confirm("신청하시겠습니까?")){
-			var url = "${pageContext.request.contextPath}/web/ve/aplct/fndtnEnhanceTrn/eduRegAjax.do";
-			console.log(data);
-			$.ajax({
-				type:"POST",
-				url: url,
-				data: data,
-				dataType:'json',
-				async: false,
-				processData: false,
-				contentType: false,
-				cache: false,
-				success:function(returnData){
-						if(returnData.result == "success"){
-						alert("저장되었습니다.");
-						fncGoList();
-					}
-				},
-				error:function(request , status, error){
-					alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
-				}
-			});
-		}
-	}
-	
-	function linkPage(pageNo){
-		var listForm = document.listForm ;
-		listForm.pageIndex.value = pageNo ;
-		listForm.action = "<c:url value='/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.do'/>";
-		listForm.submit();
-	}
-
-
-	function goEduAplctList(prcsAplctPrdOrd){
-		var goEduAplctListForm = document.goEduAplctListForm ;
-		goEduAplctListForm.action = "<c:url value='/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.do'/>";
-		goEduAplctListForm.submit();
-	}
-	
-
-	function fncGoList(){
-		linkPage(1);
-	}
-
-	function fncReset(thisObj){
-		var targetObj = $(thisObj).closest('.list_top').find('select,input');
-		$.each(targetObj, function(){
-			$(this).val('');
-		});
-	}
-	
-
-	function fncGoDetail(prcsAplctPrdOrd){
-		var viewForm = document.viewForm ;
-		viewForm.prcsAplctPrdOrd.value = prcsAplctPrdOrd ;
-		viewForm.action = "<c:url value='/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.do'/>";
-		viewForm.submit();
-	}
-	
-	
-</script>
-
-<!-- content -->
-<div class="cont_wrap" id="sub">
-
-	<form name="regForm" id="regForm">
-		<input type="hidden" name="prcsAplctPrdOrd">
-	</form>
-	<form name="viewForm" id="viewForm">
-		<input type="hidden" name="prcsAplctPrdOrd">
-	</form>
-	<form name="goEduAplctListForm" id="goEduAplctListForm">
-	</form>
-
-	<form:form id="listForm" name="listForm" commandName="vEPrcsDetailVO">
-		<input type="hidden" name="pageIndex" value="<c:out value='${vEPrcsDetailVO.pageIndex}' default='1' />"/>
-		<input type="hidden" name="searchSortCnd" value="<c:out value="${vEPrcsDetailVO.searchSortCnd}" />" />
-		<input type="hidden" name="searchSortOrd" value="<c:out value="${vEPrcsDetailVO.searchSortOrd}" />" />
-
-		<input type="hidden" name="eduAplctOrd" id="eduAplctOrd" value="" />
-		<div class="cont_tit">
-			<h2>신청목록</h2>
-			<div class="sns_go">
-				<button type="button" title="새창열림"><img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/content/facebook_icon.png" alt="페이스북 바로가기"></button>
-				<button type="button" title="새창열림"><img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/content/twitter_icon.png" alt="트위터 바로가기"></button>
-			</div>
-		</div>
-		<div class="list_top">
-			<div class="list_top_left">
-				<label for="searchStatus" class="label">신청상태 선택</label>
-				<select class="selType1" id="searchStatus" name="searchStatus">
-					<option ${vEPrcsDetailVO.searchStatus eq '' ? 'selected' : ''}  value="">전체</option>
-					<option ${vEPrcsDetailVO.searchStatus eq VeConstants.STATUS_CD_SBMT ? 'selected' : ''} value="${VeConstants.STATUS_CD_SBMT}">교육신청</option>
-					<option ${vEPrcsDetailVO.searchStatus eq VeConstants.STATUS_CD_EDT_REQ ? 'selected' : ''} value="${VeConstants.STATUS_CD_EDT_REQ}">수정요청</option>
-					<option ${vEPrcsDetailVO.searchStatus eq VeConstants.STATUS_CD_EDT_CMPT ? 'selected' : ''} value="${VeConstants.STATUS_CD_EDT_CMPT}">수정완료</option>
-					<option ${vEPrcsDetailVO.searchStatus eq VeConstants.STATUS_CD_CAN ? 'selected' : ''} value="${VeConstants.STATUS_CD_CAN}">교육취소</option>
-					<option ${vEPrcsDetailVO.searchStatus eq VeConstants.STATUS_CD_EDU_SELCT ? 'selected' : ''} value="${VeConstants.STATUS_CD_EDU_SELCT}">교육확정</option>
-				</select>
-			</div>
-			<div class="btn_wrap">
-				<div class="calendar_wrap">
-					<%-- <input type="text" class="calendar" id="searchStartDt" name="searchStartDt" title="시작일 선택" value="${vEPrcsDetailVO.searchStartDt}"> --%>
-					<duet-date-picker identifier="date" name="searchStartDt" class="startDate" value="${vEPrcsDetailVO.searchStartDt}"></duet-date-picker>
-				</div>
-				~
-				<div class="calendar_wrap">
-					<%-- <input type="text" class="calendar" id="searchEndDt" name="searchEndDt" title="종료일 선택" value="${vEPrcsDetailVO.searchEndDt}"> --%>
-					<duet-date-picker identifier="date" name="searchEndDt" class="endDate" value="${vEPrcsDetailVO.searchEndDt}"></duet-date-picker>
-				</div>
-				<script src="${pageContext.request.contextPath}/visitEdu/usr/publish/script/duetdatepicker.js"></script>
-				<button type="button" class="btnType01" onclick="fncGoList();">검색</button>
-				<button type="button" class="btnType02" onclick="fncReset(this);">초기화</button>
-			</div>
-		</div>
-
-		
-		<!-- list -->
-		<div class="tb_list01">
-			<table>
-				<caption>교육 목록표</caption>
-				<colgroup>
-					<col style="width:35%;">
-					<col style="width:;">
-					<col style="width:13%;">
-					<col style="width:13%;">
-					<col style="width:13%;">
-				</colgroup>
-				<thead>
-					<tr>
-						<th>교육과정</th>
-						<th>교육일자</th>
-						<th>신청결과</th>
-						<th>설문조사</th>
-						<th>이수증</th>
-					</tr>
-				</thead>
-				<tbody>
-				<c:forEach var="list" items="${list}" varStatus="status">
-					<tr>
-						<td onclick="fncGoDetail('<c:out value="${list.prcsAplctPrdOrd}"/>');" style="cursor:pointer;">									
-							<c:out value="${list.prcsNm}"/>(<c:out value="${list.prcsAplctPrdOrd}"/>)
-						</td>
-						<td>
-<%-- 							<c:out value="${list.eduStrtPnttm}"/>~<c:out value="${list.eduDdlnPnttm}"/> --%>
-							<c:out value="${list.eduStrtPnttm}"/>
-						</td>
-						<td>
-						<!--  
-							10	요청
-							120	선정완료
-							140	선정취소
-							20	승인
-							230	대기
-							30	반려
-							40	취소
-							60	교육확정
-							70	수정요청
-							80	수정완료
-							90	교육미확정
-						-->
-							<kc:code codeId="VE0003" code="${list.aprvlCd}"/>
-							<c:if test="${list.aprvlCd eq 10 
-											or list.aprvlCd eq 120 
-											or list.aprvlCd eq 20
-											or list.aprvlCd eq 230  
-							}">
-							<button type="button" title="신청취소" class="btnType02" data-tooltip="sub01_pop01">취소</button>
-							</c:if>
-						</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>
-						</td>
-						<td>
-							<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}">
-									교육완료
-								</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> -->
-					</tr>
-				</c:forEach>
-				<c:if test="${empty list}">
-					<tr><td colspan="5"><spring:message code="common.nodata.msg" /></td></tr>
-				</c:if>
-				</tbody>
-			</table>
-		</div>
-		
-		<div class="btn_wrap btn_layout01">
-			<div class="btn_left">
-			</div>
-			<div class="btn_center">
-			</div>
-			<div class="btn_right">
-				<button type="button" class="btnType01" onclick="location.href='<c:url value="/web/ve/aplct/sspnIdtmt/eduAplctList.do" />'">강의목록</button>
-			</div>
-		</div>
-
-		<!-- page -->
-		<div class="page">
-			<ui:pagination paginationInfo = "${paginationInfo}"  type="image" jsFunction="linkPage" />
-		</div>
-	</form:form>
-</div>
-
-<!-- 교육신청 취소 -->
-<div class="tooltip-wrap">
-	<div class="popup_wrap popType01" tabindex="0"
-		data-tooltip-con="sub01_pop01" data-focus="sub01_pop01"
-		data-focus-prev="sub01_pop01_close">
-		<div class="popup_tit">
-			<p>교육신청 취소</p>
-			<button class="btn_popup_close tooltip-close"
-				data-focus="sub01_pop01_close" title="팝업 닫기">
-				<i></i>
-			</button>
-		</div>
-		<div class="popup_cont">
-			<div class="cont_body">
-				<div class="pop_tb_type01">
-					<table>
-						<colgroup>
-							<col style="width: 22%;">
-							<col style="">
-						</colgroup>
-						<tr>
-							<th>첨부파일</th>
-							<td>
-								<div class="btn_wrap">
-									<button type="button" class="btnType01 right">파일찾기</button>
-								</div>
-								<div class="file_wrap">
-									<table>
-										<colgroup>
-											<col style="width: auto;">
-											<col style="width: 15%;">
-											<col style="width: 15%;">
-										</colgroup>
-										<thead>
-											<th>파일 명</th>
-											<th>종류</th>
-											<th>크기</th>
-										</thead>
-										<tbody class="tb_file_before">
-											<tr>
-												<td colspan="3">
-													<p>
-														첨부하실 파일을 <span>마우스끌어서</span> 넣어주세요.
-													</p>
-												</td>
-											</tr>
-										</tbody>
-									</table>
-								</div>
-							</td>
-						</tr>
-						<tr>
-							<th>취소사유</th>
-							<td><textarea></textarea></td>
-						</tr>
-					</table>
-
-				</div>
-				<div class="pop_btn_wrap btn_layout01">
-					<div class="btn_left"></div>
-					<div class="btn_center">
-						<button type="button" class="btnType05">제출</button>
-						<button type="button" class="btnType02 tooltip-close"
-							data-focus="imsi-close" data-focus-next="imsi">취소</button>
-					</div>
-					<div class="btn_right"></div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-<!--// 교육신청 취소 -->
-
-<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.openFile('cmplt_crtfc_20231030.mrd', '/rfn [jsonsample_red_2.json]');
-		//viewer.openFile('cmplt_crtfc_20231030.mrd','/rexport [5]');
-		//viewer.openFile('sample.mrd','/rfn [sample.txt]');
-		//viewer.hideToolbarItem(["save"]);
-		//viewer.openFile('sample.mrd');
-		viewer.hideToolbarItem([ "save" ]);
-		//viewer.showToolbarItem(["print"]);
-		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/sspnIdtmt/sspnIdtmtEduAplctCmpltCrtfcAjax.do?prcsAplctPrdOrd='
-								+ p_prcsAplctPrdOrd
-								+ '&eduAplctOrd='
-								+ p_eduAplctOrd + ']');
-
-		/*
-
-		var viewer = new m2soft.crownix.Viewer('http://192.168.0.176:8093/ReportingServer/service',
-		'crownix-viewer');
-		viewer.openFile('cmplt_crtfc_20231030.mrd');
-		 */
-
-	}
-	/*
-	window.onload = function(){	
-	var viewer = new m2soft.crownix.Viewer('http://192.168.0.176:8093/ReportingServer/service');
-	viewer.openFile('json_subject.mrd', '/rfn [jsonsample_red_2.json]');
-	};	 
-	 */
+<%@ 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="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %>
+<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+<un:useConstants var="VeConstants" className="kcc.ve.cmm.VeConstants" />
+<title>교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템</title>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<script type="text/javaScript" language="javascript">
+
+
+
+$(document).ready(function(){
+	
+});
+
+	function fncEduReg(prcsAplctPrdOrd){
+		var regForm = document.regForm;
+		regForm.prcsAplctPrdOrd.value = prcsAplctPrdOrd;
+		
+		var data = new FormData(document.getElementById("regForm"));
+		if(confirm("신청하시겠습니까?")){
+			var url = "${pageContext.request.contextPath}/web/ve/aplct/fndtnEnhanceTrn/eduRegAjax.do";
+			console.log(data);
+			$.ajax({
+				type:"POST",
+				url: url,
+				data: data,
+				dataType:'json',
+				async: false,
+				processData: false,
+				contentType: false,
+				cache: false,
+				success:function(returnData){
+						if(returnData.result == "success"){
+						alert("저장되었습니다.");
+						fncGoList();
+					}
+				},
+				error:function(request , status, error){
+					alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+				}
+			});
+		}
+	}
+	
+	function linkPage(pageNo){
+		var listForm = document.listForm ;
+		listForm.pageIndex.value = pageNo ;
+		listForm.action = "<c:url value='/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.do'/>";
+		listForm.submit();
+	}
+
+
+	function goEduAplctList(prcsAplctPrdOrd){
+		var goEduAplctListForm = document.goEduAplctListForm ;
+		goEduAplctListForm.action = "<c:url value='/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.do'/>";
+		goEduAplctListForm.submit();
+	}
+	
+
+	function fncGoList(){
+		linkPage(1);
+	}
+
+	function fncReset(thisObj){
+		var targetObj = $(thisObj).closest('.list_top').find('select,input');
+		$.each(targetObj, function(){
+			$(this).val('');
+		});
+	}
+	
+
+	function fncGoDetail(prcsAplctPrdOrd){
+		var viewForm = document.viewForm ;
+		viewForm.prcsAplctPrdOrd.value = prcsAplctPrdOrd ;
+		viewForm.action = "<c:url value='/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.do'/>";
+		viewForm.submit();
+	}
+	
+	
+</script>
+
+<!-- content -->
+<div class="cont_wrap" id="sub">
+
+	<form name="regForm" id="regForm">
+		<input type="hidden" name="prcsAplctPrdOrd">
+	</form>
+	<form name="viewForm" id="viewForm">
+		<input type="hidden" name="prcsAplctPrdOrd">
+	</form>
+	<form name="goEduAplctListForm" id="goEduAplctListForm">
+	</form>
+
+	<form:form id="listForm" name="listForm" commandName="vEPrcsDetailVO">
+		<input type="hidden" name="pageIndex" value="<c:out value='${vEPrcsDetailVO.pageIndex}' default='1' />"/>
+		<input type="hidden" name="searchSortCnd" value="<c:out value="${vEPrcsDetailVO.searchSortCnd}" />" />
+		<input type="hidden" name="searchSortOrd" value="<c:out value="${vEPrcsDetailVO.searchSortOrd}" />" />
+
+		<input type="hidden" name="eduAplctOrd" id="eduAplctOrd" value="" />
+		<div class="cont_tit">
+			<h2>신청목록</h2>
+			<div class="sns_go">
+				<button type="button" title="새창열림"><img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/content/facebook_icon.png" alt="페이스북 바로가기"></button>
+				<button type="button" title="새창열림"><img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/content/twitter_icon.png" alt="트위터 바로가기"></button>
+			</div>
+		</div>
+		<div class="list_top">
+			<div class="list_top_left">
+				<label for="searchStatus" class="label">신청상태 선택</label>
+				<select class="selType1" id="searchStatus" name="searchStatus">
+					<option ${vEPrcsDetailVO.searchStatus eq '' ? 'selected' : ''}  value="">전체</option>
+					<option ${vEPrcsDetailVO.searchStatus eq VeConstants.STATUS_CD_SBMT ? 'selected' : ''} value="${VeConstants.STATUS_CD_SBMT}">교육신청</option>
+					<option ${vEPrcsDetailVO.searchStatus eq VeConstants.STATUS_CD_EDT_REQ ? 'selected' : ''} value="${VeConstants.STATUS_CD_EDT_REQ}">수정요청</option>
+					<option ${vEPrcsDetailVO.searchStatus eq VeConstants.STATUS_CD_EDT_CMPT ? 'selected' : ''} value="${VeConstants.STATUS_CD_EDT_CMPT}">수정완료</option>
+					<option ${vEPrcsDetailVO.searchStatus eq VeConstants.STATUS_CD_CAN ? 'selected' : ''} value="${VeConstants.STATUS_CD_CAN}">교육취소</option>
+					<option ${vEPrcsDetailVO.searchStatus eq VeConstants.STATUS_CD_EDU_SELCT ? 'selected' : ''} value="${VeConstants.STATUS_CD_EDU_SELCT}">교육확정</option>
+				</select>
+			</div>
+			<div class="btn_wrap">
+				<div class="calendar_wrap">
+					<%-- <input type="text" class="calendar" id="searchStartDt" name="searchStartDt" title="시작일 선택" value="${vEPrcsDetailVO.searchStartDt}"> --%>
+					<duet-date-picker identifier="date" name="searchStartDt" class="startDate" value="${vEPrcsDetailVO.searchStartDt}"></duet-date-picker>
+				</div>
+				~
+				<div class="calendar_wrap">
+					<%-- <input type="text" class="calendar" id="searchEndDt" name="searchEndDt" title="종료일 선택" value="${vEPrcsDetailVO.searchEndDt}"> --%>
+					<duet-date-picker identifier="date" name="searchEndDt" class="endDate" value="${vEPrcsDetailVO.searchEndDt}"></duet-date-picker>
+				</div>
+				<script src="${pageContext.request.contextPath}/visitEdu/usr/publish/script/duetdatepicker.js"></script>
+				<button type="button" class="btnType01" onclick="fncGoList();">검색</button>
+				<button type="button" class="btnType02" onclick="fncReset(this);">초기화</button>
+			</div>
+		</div>
+
+		
+		<!-- list -->
+		<div class="tb_list01">
+			<table>
+				<caption>교육 목록표</caption>
+				<colgroup>
+					<col style="width:35%;">
+					<col style="width:;">
+					<col style="width:13%;">
+					<col style="width:13%;">
+					<col style="width:13%;">
+				</colgroup>
+				<thead>
+					<tr>
+						<th>교육과정</th>
+						<th>교육일자</th>
+						<th>신청결과</th>
+						<th>설문조사</th>
+						<th>이수증</th>
+					</tr>
+				</thead>
+				<tbody>
+				<c:forEach var="list" items="${list}" varStatus="status">
+					<tr>
+						<td onclick="fncGoDetail('<c:out value="${list.prcsAplctPrdOrd}"/>');" style="cursor:pointer;">									
+							<c:out value="${list.prcsNm}"/>(<c:out value="${list.prcsAplctPrdOrd}"/>)
+						</td>
+						<td>
+<%-- 							<c:out value="${list.eduStrtPnttm}"/>~<c:out value="${list.eduDdlnPnttm}"/> --%>
+							<c:out value="${list.eduStrtPnttm}"/>
+						</td>
+						<td>
+						<!--  
+							10	요청
+							120	선정완료
+							140	선정취소
+							20	승인
+							230	대기
+							30	반려
+							40	취소
+							60	교육확정
+							70	수정요청
+							80	수정완료
+							90	교육미확정
+						-->
+							<kc:code codeId="VE0003" code="${list.aprvlCd}"/>
+							<c:if test="${list.aprvlCd eq 10 
+											or list.aprvlCd eq 120 
+											or list.aprvlCd eq 20
+											or list.aprvlCd eq 230  
+							}">
+							<button type="button" title="신청취소" class="btnType02" data-tooltip="sub01_pop01">취소</button>
+							</c:if>
+						</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>
+						</td>
+						<td>
+							<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}">
+									교육완료
+								</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> -->
+					</tr>
+				</c:forEach>
+				<c:if test="${empty list}">
+					<tr><td colspan="5"><spring:message code="common.nodata.msg" /></td></tr>
+				</c:if>
+				</tbody>
+			</table>
+		</div>
+		
+		<div class="btn_wrap btn_layout01">
+			<div class="btn_left">
+			</div>
+			<div class="btn_center">
+			</div>
+			<div class="btn_right">
+				<button type="button" class="btnType01" onclick="location.href='<c:url value="/web/ve/aplct/sspnIdtmt/eduAplctList.do" />'">강의목록</button>
+			</div>
+		</div>
+
+		<!-- page -->
+		<div class="page">
+			<ui:pagination paginationInfo = "${paginationInfo}"  type="image" jsFunction="linkPage" />
+		</div>
+	</form:form>
+</div>
+
+<!-- 교육신청 취소 -->
+<div class="tooltip-wrap">
+	<div class="popup_wrap popType01" tabindex="0"
+		data-tooltip-con="sub01_pop01" data-focus="sub01_pop01"
+		data-focus-prev="sub01_pop01_close">
+		<div class="popup_tit">
+			<p>교육신청 취소</p>
+			<button class="btn_popup_close tooltip-close"
+				data-focus="sub01_pop01_close" title="팝업 닫기">
+				<i></i>
+			</button>
+		</div>
+		<div class="popup_cont">
+			<div class="cont_body">
+				<div class="pop_tb_type01">
+					<table>
+						<colgroup>
+							<col style="width: 22%;">
+							<col style="">
+						</colgroup>
+						<tr>
+							<th>첨부파일</th>
+							<td>
+								<div class="btn_wrap">
+									<button type="button" class="btnType01 right">파일찾기</button>
+								</div>
+								<div class="file_wrap">
+									<table>
+										<colgroup>
+											<col style="width: auto;">
+											<col style="width: 15%;">
+											<col style="width: 15%;">
+										</colgroup>
+										<thead>
+											<th>파일 명</th>
+											<th>종류</th>
+											<th>크기</th>
+										</thead>
+										<tbody class="tb_file_before">
+											<tr>
+												<td colspan="3">
+													<p>
+														첨부하실 파일을 <span>마우스끌어서</span> 넣어주세요.
+													</p>
+												</td>
+											</tr>
+										</tbody>
+									</table>
+								</div>
+							</td>
+						</tr>
+						<tr>
+							<th>취소사유</th>
+							<td><textarea></textarea></td>
+						</tr>
+					</table>
+
+				</div>
+				<div class="pop_btn_wrap btn_layout01">
+					<div class="btn_left"></div>
+					<div class="btn_center">
+						<button type="button" class="btnType05">제출</button>
+						<button type="button" class="btnType02 tooltip-close"
+							data-focus="imsi-close" data-focus-next="imsi">취소</button>
+					</div>
+					<div class="btn_right"></div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+<!--// 교육신청 취소 -->
+
+<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.openFile('cmplt_crtfc_20231030.mrd', '/rfn [jsonsample_red_2.json]');
+		//viewer.openFile('cmplt_crtfc_20231030.mrd','/rexport [5]');
+		//viewer.openFile('sample.mrd','/rfn [sample.txt]');
+		//viewer.hideToolbarItem(["save"]);
+		//viewer.openFile('sample.mrd');
+		viewer.hideToolbarItem([ "save" ]);
+		//viewer.showToolbarItem(["print"]);
+		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/sspnIdtmt/sspnIdtmtEduAplctCmpltCrtfcAjax.do?prcsAplctPrdOrd='
+								+ p_prcsAplctPrdOrd
+								+ '&eduAplctOrd='
+								+ p_eduAplctOrd + ']');
+
+		/*
+
+		var viewer = new m2soft.crownix.Viewer('http://192.168.0.176:8093/ReportingServer/service',
+		'crownix-viewer');
+		viewer.openFile('cmplt_crtfc_20231030.mrd');
+		 */
+
+	}
+	/*
+	window.onload = function(){	
+	var viewer = new m2soft.crownix.Viewer('http://192.168.0.176:8093/ReportingServer/service');
+	viewer.openFile('json_subject.mrd', '/rfn [jsonsample_red_2.json]');
+	};	 
+	 */
 </script>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp
index 20d7455f..ab5b1085 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp
@@ -274,7 +274,7 @@
               <div class="btn_wrap btn_layout01">
                   <div class="btn_left">
                   </div>
-                  <div class="btn_center">
+                  <div class="btn_center">                  
                   	<c:if test="${info.asgnmAprvlCd eq '20' }"> <!-- 배정 테이블 수락요청 상태 -->
                       <button type="button" class="btnType04 m_btn_block" onclick="fncSave('30'); return false;">요청수락</button>
                     </c:if>