From 3b135074b19c6c57cf9d775cc8dbb27932d11b4c Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Thu, 21 Dec 2023 16:28:06 +0900
Subject: [PATCH] =?UTF-8?q?2023-12-21=2016:27=20=EA=B0=95=EC=82=AC?=
 =?UTF-8?q?=ED=99=9C=EB=8F=99=ED=99=95=EC=9D=B8=EC=84=9C=20=EC=8B=A0?=
 =?UTF-8?q?=EC=B2=AD=EA=B4=80=EB=A6=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aplct/comweb/CrownixAjaxController.java   | 268 ++++++++++++++++--
 .../service/VEInstrDetailService.java         |   2 +
 .../instrInfo/service/VEInstrDetailVO.java    |  64 ++++-
 .../service/impl/VEInstrDetailDAO.java        |   4 +
 .../impl/VEInstrDetailServiceImpl.java        |   4 +
 .../spring/com/context-idgen.xml              |   4 +-
 .../ve/instr/VEInstrDetail_SQL_Tibero.xml     |  41 +++
 .../ve/instr/VEInstr_MIX_SQL_Tibero.xml       |   3 +
 .../instrActvtHstryMngDetail.jsp              |   9 +-
 .../tngrVisitEdu/instrActvtHstryMngDetail.jsp |   9 +-
 .../instrInfo/instrPrflDetail.jsp             |   9 +-
 .../instrInfo/instrPrflDetail.jsp             |   8 +-
 12 files changed, 376 insertions(+), 49 deletions(-)

diff --git a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java
index 236b68e0..93b02dec 100644
--- a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java
+++ b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java
@@ -582,36 +582,74 @@ public class CrownixAjaxController {
 			
 			System.out.println("----------------");
 			System.out.println(request.getParameter("p_userId"));
+			System.out.println(request.getParameter("p_instrDetailActvtHstryOrd"));
+			
 			System.out.println("----------------");
 
+			String s_user_id					=	request.getParameter("p_userId");
+			String s_instrDetailActvtHstryOrd	=	request.getParameter("p_instrDetailActvtHstryOrd");
+			
+			
 			//강사신청정보
 			VEInstrDetailVO	vEInstrDetailVO	=	new	VEInstrDetailVO();
 			vEInstrDetailVO.setInstrDiv("10");
 			vEInstrDetailVO.setUseYn("Y");
 			vEInstrDetailVO.setSbmtYn("Y");
-			vEInstrDetailVO.setUserId(request.getParameter("p_userId"));			
-			VEInstrDetailVO vEInstrDetailVODetail = vEInstrDetailService.selectDetail(vEInstrDetailVO);
+			
+			vEInstrDetailVO.setUserId(s_user_id);			
+			vEInstrDetailVO.setInstrDetailActvtHstryOrd(s_instrDetailActvtHstryOrd);
+			
+			VEInstrDetailVO vEInstrDetailVODetail = vEInstrDetailService.selectDetail4actvtHstry(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	=	this._makeInstrActivityMainReportPage(modelAndView, vEInstrDetailVODetail);
 			
-			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", "-");
+			/*
+			if ("".equals(vEInstrDetailVODetail.getDocuNmbr())
+					|| vEInstrDetailVODetail.getDocuNmbr()==null
+					) {
+				modelAndView.addObject("page_1_10", "<->");	//문서번호
+			}else {				
+				modelAndView.addObject("page_1_10", "<"+vEInstrDetailVODetail.getDocuNmbrDp()+">");	//문서번호	
+			}
 			
-			modelAndView.addObject("page_1_31", "상기 인은 우리 위원회에서 저작권 강사(청년강사)로 위촉되어 활동하였음을 확인합니다.");			
-			modelAndView.addObject("page_1_32", vEInstrDetailVODetail.getHstryPnttm());
+			
+			modelAndView.addObject("page_1_11", vEInstrDetailVODetail.getInstrNm());	//성명
+			
+			if (vEInstrDetailVODetail.getdBirth().length()==8) {
+				modelAndView.addObject("page_1_12", vEInstrDetailVODetail.getdBirth().substring(0,4)+"년 "+vEInstrDetailVODetail.getdBirth().substring(4,6)+"월 "+vEInstrDetailVODetail.getdBirth().substring(6,8)+"일");		//생년월일	
+			}else {
+				modelAndView.addObject("page_1_12", vEInstrDetailVODetail.getdBirth());		//생년월일
+			}
+			
+			modelAndView.addObject("page_1_13", vEInstrDetailVODetail.getSex());			//성별
+			modelAndView.addObject("page_1_14", vEInstrDetailVODetail.getBsnsNm());			//사업자명
+			modelAndView.addObject("page_1_15", vEInstrDetailVODetail.getBsnsNmbr());		//사업자등록번호
+			modelAndView.addObject("page_1_16", vEInstrDetailVODetail.getPhone());		//전화번호
+			modelAndView.addObject("page_1_17", vEInstrDetailVODetail.getAddr()+vEInstrDetailVODetail.getAddrDetail());	//주소
+			
+			modelAndView.addObject("page_1_21", vEInstrDetailVODetail.getPurpose());	//용도
+			
+			//발행기관 정보
+			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");					//주소
+			
+			if ("Y".equals(vEInstrDetailVODetail.getQlfctEndYn())) {
+				modelAndView.addObject("page_1_27", vEInstrDetailVODetail.getAprvlPnttm()+"~"+vEInstrDetailVODetail.getQlfctEndPnttm());	//위촉기간
+			}else {
+				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호>"
@@ -637,7 +675,11 @@ public class CrownixAjaxController {
 				,"page_1_32":"2023년 06월 29일"	
 					*/
 			
-			//강사활동리스트
+			//강사활동리스트			
+			modelAndView	=	this._makeInstrActivitySubReportPage(modelAndView, vEInstrDetailVO, s_instrDetailActvtHstryOrd);
+			
+			/*
+			vEInstrDetailVO.setInstrDetailActvtHstryOrd(request.getParameter("p_instrDetailActvtHstryOrd"));
 			List<VEInstrDetailVO> vEInstrDetailVOList = vEInstrMixService.selectPagingActivityList4Report(vEInstrDetailVO);
 	    	//복호화
 	    	vEInstrDetailVOList = egovCryptoUtil.decryptVEInstrDetailVOList(vEInstrDetailVOList);
@@ -647,12 +689,163 @@ public class CrownixAjaxController {
 	    	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()+"차시");
+	    		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);
+	    		
+	    		
+	    	}
+	    	
+	    	modelAndView.addObject("page_1_28", "총 "+vEInstrDetailVOList.size()+"회, "+i_sumChasi+"차시 [세부내용 별지 참조]");
+	    	
+	    	modelAndView.addObject("instrs", jsReqInfo);
+	    	*/
+	    	
+			return modelAndView;
+			
+		}
+		
+		/**
+		 * 성인 강사 활동내역서 출력 정보
+		 * 
+		 */
+		@RequestMapping("/ve/aplct/adultVisitEdu/eduAplct/instrActivityAjax.do")
+		public ModelAndView adultVisitEduInstrActivityAjax(
+				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(request.getParameter("p_instrDetailActvtHstryOrd"));
+			
+			System.out.println("----------------");
+
+			String s_user_id					=	request.getParameter("p_userId");
+			String s_instrDetailActvtHstryOrd	=	request.getParameter("p_instrDetailActvtHstryOrd");
+			
+			
+			//강사신청정보
+			VEInstrDetailVO	vEInstrDetailVO	=	new	VEInstrDetailVO();
+			vEInstrDetailVO.setInstrDiv("20");
+			vEInstrDetailVO.setUseYn("Y");
+			vEInstrDetailVO.setSbmtYn("Y");
+			
+			vEInstrDetailVO.setUserId(s_user_id);			
+			vEInstrDetailVO.setInstrDetailActvtHstryOrd(s_instrDetailActvtHstryOrd);
+			
+			VEInstrDetailVO vEInstrDetailVODetail = vEInstrDetailService.selectDetail4actvtHstry(vEInstrDetailVO);
+			vEInstrDetailVODetail	=	egovCryptoUtil.decryptVEInstrDetailVO(vEInstrDetailVODetail);
+			
+			
+			//문서번호
+			modelAndView	=	this._makeInstrActivityMainReportPage(modelAndView, vEInstrDetailVODetail);
+			
+			//강사활동리스트			
+			modelAndView	=	this._makeInstrActivitySubReportPage(modelAndView, vEInstrDetailVO, s_instrDetailActvtHstryOrd);
+			
+	    	
+			return modelAndView;
+			
+		}
+		
+		
+		
+		///////////////////////////////////////////////////////////////////
+		//
+		//
+		//		private function
+		//
+		//
+		
+		//리포트 메인 페이지 정보
+		private ModelAndView _makeInstrActivityMainReportPage(
+				ModelAndView	p_modelAndView
+				, VEInstrDetailVO	p_vEInstrDetailVODetail
+				) throws Exception{
+			//문서번호
+			if ("".equals(p_vEInstrDetailVODetail.getDocuNmbr())
+					|| p_vEInstrDetailVODetail.getDocuNmbr()==null
+					) {
+				p_modelAndView.addObject("page_1_10", "<->");	//문서번호
+			}else {				
+				p_modelAndView.addObject("page_1_10", "<"+p_vEInstrDetailVODetail.getDocuNmbrDp()+">");	//문서번호	
+			}
+			
+			
+			p_modelAndView.addObject("page_1_11", p_vEInstrDetailVODetail.getInstrNm());	//성명
+			
+			if (p_vEInstrDetailVODetail.getdBirth().length()==8) {
+				p_modelAndView.addObject("page_1_12", p_vEInstrDetailVODetail.getdBirth().substring(0,4)+"년 "+p_vEInstrDetailVODetail.getdBirth().substring(4,6)+"월 "+p_vEInstrDetailVODetail.getdBirth().substring(6,8)+"일");		//생년월일	
+			}else {
+				p_modelAndView.addObject("page_1_12", p_vEInstrDetailVODetail.getdBirth());		//생년월일
+			}
+			
+			p_modelAndView.addObject("page_1_13", p_vEInstrDetailVODetail.getSex());			//성별
+			p_modelAndView.addObject("page_1_14", p_vEInstrDetailVODetail.getBsnsNm());			//사업자명
+			p_modelAndView.addObject("page_1_15", p_vEInstrDetailVODetail.getBsnsNmbr());		//사업자등록번호
+			p_modelAndView.addObject("page_1_16", p_vEInstrDetailVODetail.getPhone());		//전화번호
+			p_modelAndView.addObject("page_1_17", p_vEInstrDetailVODetail.getAddr()+p_vEInstrDetailVODetail.getAddrDetail());	//주소
+			
+			p_modelAndView.addObject("page_1_21", p_vEInstrDetailVODetail.getPurpose());	//용도
+			
+			//발행기관 정보
+			p_modelAndView.addObject("page_1_22", "비영리");								//업종
+			p_modelAndView.addObject("page_1_23", "120-82-09301");						//사업자등록번호
+			p_modelAndView.addObject("page_1_24", "최병구");								//대표자
+			p_modelAndView.addObject("page_1_25", "교육체험본부(교육운영팀)");					//담당부서
+			p_modelAndView.addObject("page_1_26", "경상남도 진주시 소호로 117");					//주소
+			
+			if ("Y".equals(p_vEInstrDetailVODetail.getQlfctEndYn())) {
+				p_modelAndView.addObject("page_1_27", p_vEInstrDetailVODetail.getAprvlPnttm()+"~"+p_vEInstrDetailVODetail.getQlfctEndPnttm());	//위촉기간
+			}else {
+				p_modelAndView.addObject("page_1_27", p_vEInstrDetailVODetail.getAprvlPnttm()+"~");	//위촉기간	
+			}
+			
+			
+			//modelAndView.addObject("page_1_28", "-");										//활동내용
+			
+			p_modelAndView.addObject("page_1_31", "상기 인은 우리 위원회에서 저작권 강사(청년강사)로 위촉되어 활동하였음을 확인합니다.");	//확인멘트
+			p_modelAndView.addObject("page_1_32", p_vEInstrDetailVODetail.getHstryPnttm());						//발행일(승인일)
+			
+			
+			return p_modelAndView;
+		}
+		
+		//강사활동리스트 리포트 서브 페이지 정보
+		private ModelAndView _makeInstrActivitySubReportPage(
+				ModelAndView	p_modelAndView
+				, VEInstrDetailVO	p_vEInstrDetailVO	
+				, String p_instrDetailActvtHstryOrd
+				) throws Exception{
+			
+			p_vEInstrDetailVO.setInstrDetailActvtHstryOrd(p_instrDetailActvtHstryOrd);
+			List<VEInstrDetailVO> vEInstrDetailVOList = vEInstrMixService.selectPagingActivityList4Report(p_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());
 	    				
@@ -669,11 +862,24 @@ public class CrownixAjaxController {
 	    		
 	    	}
 	    	
-	    	modelAndView.addObject("page_1_28", "총 "+vEInstrDetailVOList.size()+"회, "+i_sumChasi+"차시 [세부내용 별지 참조]");
+	    	p_modelAndView.addObject("page_1_28", "총 "+vEInstrDetailVOList.size()+"회, "+i_sumChasi+"차시 [세부내용 별지 참조]");
 	    	
-	    	modelAndView.addObject("instrs", jsReqInfo);
+	    	if (vEInstrDetailVOList.size()==0) {
+	    		JSONObject jsDrtInfo = new JSONObject();	//전체 정보
+	    		jsDrtInfo.put("data_1", "-");				//구분
+	    		jsDrtInfo.put("data_2", "-");	//강사활동년
+	    		jsDrtInfo.put("data_3", "-");	//강사활동월
+	    		jsDrtInfo.put("data_4", "-");	//강사활동일
+	    		jsDrtInfo.put("data_5", "-");	    			//강사 활동 학교명
+	    		jsDrtInfo.put("data_6", "-");					//강사활동차시
+	    		
+	    		//i_sumChasi	=	i_sumChasi	+	Integer.parseInt(vEInstrDetailVOList.get(i).getLrnTm());
+	    				
+	    		jsReqInfo.add(jsDrtInfo);	    		
+	    	}
 	    	
-			return modelAndView;
-			
-		}		
+	    	p_modelAndView.addObject("instrs", jsReqInfo);
+	    	
+	    	return p_modelAndView;
+		}
 }
diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailService.java
index 9d57ec8a..b0bbf294 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailService.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailService.java
@@ -14,6 +14,8 @@ public interface VEInstrDetailService {
 	//R
 	VEInstrDetailVO selectDetail(VEInstrDetailVO vEInstrDetailVO) throws Exception;
 
+	VEInstrDetailVO selectDetail4actvtHstry(VEInstrDetailVO vEInstrDetailVO) throws Exception;	
+	
 	//U
 	int update(VEInstrDetailVO vEInstrDetailVO) throws Exception;
 	
diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java
index 30078a8f..fb5e72a0 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java
@@ -177,6 +177,23 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable {
 	//수료증 출력용 데이터
 	private String desc1;
 	private String desc2;
+	
+	private String desc3;
+	private String desc4;
+	
+	private String	chk;
+	
+	
+	//강사활동확인서 출력용 데이터
+	private String	instrDetailActvtHstryOrd;
+	private String	sex;
+	private String	purpose;
+	private String	bsnsNmbr;
+	private String	bsnsNm;
+	private String	docuNmbr;
+	private String	docuNmbrDp;
+	
+	
 	public String getDesc1() {
 		return desc1;
 	}
@@ -201,10 +218,7 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable {
 	public void setDesc4(String desc4) {
 		this.desc4 = desc4;
 	}
-	private String desc3;
-	private String desc4;
-	
-	private String	chk;
+
 	
 	public String getLrnTmSum() {
 		return lrnTmSum;
@@ -908,5 +922,47 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable {
 	public void setCrtfdNumber(String crtfdNumber) {
 		this.crtfdNumber = crtfdNumber;
 	}
+	public String getSex() {
+		return sex;
+	}
+	public void setSex(String sex) {
+		this.sex = sex;
+	}
+	public String getPurpose() {
+		return purpose;
+	}
+	public void setPurpose(String purpose) {
+		this.purpose = purpose;
+	}
+	public String getBsnsNmbr() {
+		return bsnsNmbr;
+	}
+	public void setBsnsNmbr(String bsnsNmbr) {
+		this.bsnsNmbr = bsnsNmbr;
+	}
+	public String getBsnsNm() {
+		return bsnsNm;
+	}
+	public void setBsnsNm(String bsnsNm) {
+		this.bsnsNm = bsnsNm;
+	}
+	public String getDocuNmbr() {
+		return docuNmbr;
+	}
+	public void setDocuNmbr(String docuNmbr) {
+		this.docuNmbr = docuNmbr;
+	}
+	public String getInstrDetailActvtHstryOrd() {
+		return instrDetailActvtHstryOrd;
+	}
+	public void setInstrDetailActvtHstryOrd(String instrDetailActvtHstryOrd) {
+		this.instrDetailActvtHstryOrd = instrDetailActvtHstryOrd;
+	}
+	public String getDocuNmbrDp() {
+		return docuNmbrDp;
+	}
+	public void setDocuNmbrDp(String docuNmbrDp) {
+		this.docuNmbrDp = docuNmbrDp;
+	}
 	
 }
diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailDAO.java
index dd24231d..971c63dd 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailDAO.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailDAO.java
@@ -34,6 +34,10 @@ public class VEInstrDetailDAO extends EgovAbstractDAO {
 		return (VEInstrDetailVO) select("VEInstrDetailDAO.selectDetail", vEInstrDetailVO);
 	}
 	
+	public VEInstrDetailVO selectDetail4actvtHstry(VEInstrDetailVO vEInstrDetailVO) throws Exception {
+		return (VEInstrDetailVO) select("VEInstrDetailDAO.selectDetail4actvtHstry", vEInstrDetailVO);
+	}	
+	
 	/**
 	 * 수정 - U
 	 * @param AdjstChangeDateVO
diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailServiceImpl.java
index d3a37e11..50fabdd4 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailServiceImpl.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailServiceImpl.java
@@ -44,6 +44,10 @@ public class VEInstrDetailServiceImpl implements VEInstrDetailService {
 		return vEInstrDetailDAO.selectDetail(vEInstrDetailVO);
 	}
 	
+	public VEInstrDetailVO selectDetail4actvtHstry(VEInstrDetailVO vEInstrDetailVO) throws Exception {
+		return vEInstrDetailDAO.selectDetail4actvtHstry(vEInstrDetailVO);
+	}
+	
 	//U
 	public int update(VEInstrDetailVO vEInstrDetailVO) throws Exception{
 		
diff --git a/src/main/resources/egovframework/spring/com/context-idgen.xml b/src/main/resources/egovframework/spring/com/context-idgen.xml
index 18cd8b88..785ebe5c 100644
--- a/src/main/resources/egovframework/spring/com/context-idgen.xml
+++ b/src/main/resources/egovframework/spring/com/context-idgen.xml
@@ -2993,8 +2993,8 @@
     </bean>
     <!-- 서류요청순번 ID Generation  Strategy Config -->
     <bean name="instrActvtHstryOrdStrategy" class="egovframework.rte.fdl.idgnr.impl.strategy.EgovIdGnrStrategyImpl"><!-- bean name 값에 strategy 값 입력 -->
-        <property name="prefix" value="instrActvtHstry_" /><!-- prefix 값 수정 -->
-        <property name="cipers" value="4" /><!-- 일련번호(순번) 전체 길이(prefix길이 미포함) -->
+        <property name="prefix" value="instrActvtHs_" /><!-- prefix 값 수정 -->
+        <property name="cipers" value="7" /><!-- 일련번호(순번) 전체 길이(prefix길이 미포함) -->
         <property name="fillChar" value="0" />
     </bean>       
     
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 5b511922..fefc9b58 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
@@ -340,6 +340,47 @@
 		   
 	</select>
 	
+	<!-- 강사 정보 R 4 강사활동확인서-->
+	<select id="VEInstrDetailDAO.selectDetail4actvtHstry" parameterClass="VEInstrDetailVO" resultClass="VEInstrDetailVO">
+	/*	강사 추가 정보	VEInstrDetailDAO.selectDetail4actvtHstry	*/
+		SELECT
+			<include refid="VEInstrDetailDAO.select_column_name"/>
+			, TO_CHAR(c.STATE_PNTTM,'YYYY')||'년'||TO_CHAR(c.STATE_PNTTM,'MM')||'월'||TO_CHAR(c.STATE_PNTTM,'DD')||'일'	
+			AS	hstryPnttm
+			, b.desc_1	AS	desc1
+			, b.desc_2	AS	desc2
+			, b.desc_3	AS	desc3
+			, b.desc_4	AS	desc4
+			
+			, c.sex
+			, c.PURPOSE
+			, c.bsns_nmbr	AS bsnsNmbr
+			, c.bsns_nm 	AS bsnsNm
+			, c.docu_nmbr	AS docuNmbr		
+			
+			, TO_CHAR(c.state_pnttm, 'YYYY') || '-' || c.docu_nmbr || '호' AS docuNmbrDp			
+				
+			
+		FROM 
+			<include refid="VEInstrDetailDAO.table_name"/> a
+			, ve_instr b
+			, ve_instr_detail_actvt_hstry c
+		WHERE
+			a.instr_div	=	#instrDiv#
+		   	AND a.user_id	= 	#userId#
+		   	<isNotEmpty property="instrDetailOrd">
+		   		AND a.instr_detail_ord	=	#instrDetailOrd#
+		   	</isNotEmpty>
+		   	<!-- 사용자 수정화면 - 가장 마지막 정보(사용Y) -->
+		   	<isNotEmpty property="useYn">
+		   		AND a.use_yn	=	#useYn#
+		   	</isNotEmpty>		   
+		   	AND a.user_id	= 	b.user_id
+		   	
+		   	AND c.INSTR_DETAIL_ACTVT_HSTRY_ORD =#instrDetailActvtHstryOrd#
+		   
+	</select>	
+	
 	<!-- 강사 정보 U -->
 	<update id="VEInstrDetailDAO.update" parameterClass="VEInstrDetailVO">
 		UPDATE
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 4a2c3198..aef6b97e 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
@@ -1070,11 +1070,14 @@
 		FROM ve_edu_chasi a
 			, ve_edu_chasi_instr_asgnm b
 			, ve_edu_aplct c
+			, ve_instr_detail_actvt_hstry d
 		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 
+			AND d.INSTR_DETAIL_ACTVT_HSTRY_ORD =#instrDetailActvtHstryOrd#
+			AND TO_CHAR(d.STATE_PNTTM,'YYYY.MM.DD') >= a.EDU_HOPE_DT 
 		ORDER BY a.edu_hope_dt
 					
 	</select>		
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrActvtHstryMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrActvtHstryMngDetail.jsp
index 1a06eadc..c25d7d0a 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrActvtHstryMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrActvtHstryMngDetail.jsp
@@ -219,7 +219,7 @@
 			<div class="btn_wrap btn_layout01">
 				<div class="btn_left">
 					<button type="button" class="btn_type08" onclick="fn_egov_downFile('<c:out value="${info.aplctAtchFileId}" />', '0')">신청서</button>
-					<button type="button" class="btn_type08" onclick="fncCmpltCrtfc(); return false;">미리보기</button>
+					<button type="button" class="btn_type08" onclick="fncCmpltCrtfc('<c:out value="${info.instrDetailActvtHstryOrd }" />'); return false;">미리보기</button>
 				</div>
 				<div class="btn_center">
 				</div>
@@ -245,7 +245,9 @@
  * 오버레이 방식
  */
  	//function fncCmpltCrtfc(p_prcsAplctPrdOrd, p_eduAplctOrd){
- 	function fncCmpltCrtfc(){
+ 	function fncCmpltCrtfc(
+ 			p_instrDetailActvtHstryOrd
+ 		 	){
 
  		var v_userId	=	$('#userId').val();
 
@@ -266,7 +268,8 @@
 		//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('instr_activity_20231108.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/tngrVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+']');
-		viewer.openFile('instr_activity_20231108.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/tngrVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+']');
+		//viewer.openFile('instr_activity_20231108.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/tngrVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+']');
+		viewer.openFile('instr_activity_20231108.mrd', '/rf [http://192.168.0.32:3080/offedu/ve/aplct/adultVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+'&p_instrDetailActvtHstryOrd='+p_instrDetailActvtHstryOrd+']');
 		
 		
 		/*
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngDetail.jsp
index 90eadc17..74daeb71 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngDetail.jsp
@@ -219,7 +219,7 @@
 			<div class="btn_wrap btn_layout01">
 				<div class="btn_left">
 					<button type="button" class="btn_type08" onclick="fn_egov_downFile('<c:out value="${info.aplctAtchFileId}" />', '0')">신청서</button>
-					<button type="button" class="btn_type08" onclick="fncCmpltCrtfc(); return false;">미리보기</button>
+					<button type="button" class="btn_type08" onclick="fncCmpltCrtfc('<c:out value="${info.instrDetailActvtHstryOrd }" />'); return false;">미리보기</button>
 				</div>
 				<div class="btn_center">
 				</div>
@@ -245,7 +245,9 @@
  * 오버레이 방식
  */
  	//function fncCmpltCrtfc(p_prcsAplctPrdOrd, p_eduAplctOrd){
- 	function fncCmpltCrtfc(){
+ 	function fncCmpltCrtfc(
+ 			p_instrDetailActvtHstryOrd
+ 		 	){
 
  		var v_userId	=	$('#userId').val();
 
@@ -266,7 +268,8 @@
 		//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('instr_activity_20231108.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/tngrVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+']');
-		viewer.openFile('instr_activity_20231108.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/tngrVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+']');
+		//viewer.openFile('instr_activity_20231108.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/tngrVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+']');
+		viewer.openFile('instr_activity_20231108.mrd', '/rf [http://192.168.0.32:3080/offedu/ve/aplct/tngrVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+'&p_instrDetailActvtHstryOrd='+p_instrDetailActvtHstryOrd+']');
 		
 		
 		/*
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrPrflDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrPrflDetail.jsp
index 54428442..48b0a02a 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrPrflDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrPrflDetail.jsp
@@ -726,7 +726,7 @@
 									</c:when>
 									<c:when test="${result.stateCd eq 30 }">
 										<button class="btnType06 btn_list"
-											onclick="fncCmpltCrtfc(); return false;">확인서</button>
+											onclick="fncCmpltCrtfc('<c:out value="${result.instrDetailActvtHstryOrd }" />'); return false;">확인서</button>
 									</c:when>
 								</c:choose>
 							</td>
@@ -961,7 +961,9 @@
  * 오버레이 방식
  */
  	//function fncCmpltCrtfc(p_prcsAplctPrdOrd, p_eduAplctOrd){
- 	function fncCmpltCrtfc(){
+ 	function fncCmpltCrtfc(
+ 			p_instrDetailActvtHstryOrd
+ 		 	){
 
  		var v_userId	=	$('#userId').val();
 
@@ -982,7 +984,8 @@
 		//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('instr_activity_20231108.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/tngrVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+']');
-		viewer.openFile('instr_activity_20231108.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/tngrVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+']');
+		//viewer.openFile('instr_activity_20231108.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/tngrVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+']');
+		viewer.openFile('instr_activity_20231108.mrd', '/rf [http://192.168.0.32:3080/offedu/ve/aplct/adultVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+'&p_instrDetailActvtHstryOrd='+p_instrDetailActvtHstryOrd+']');
 		
 		
 		/*
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp
index 0f7b8288..af56a8e9 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp
@@ -952,7 +952,7 @@
 									</c:when>
 									<c:when test="${result.stateCd eq 30 }">
 										<button class="btnType06 btn_list"
-											onclick="fncCmpltCrtfc(); return false;">확인서</button>
+											onclick="fncCmpltCrtfc('<c:out value="${result.instrDetailActvtHstryOrd }" />'); return false;">확인서</button>
 									</c:when>
 								</c:choose>
 							</td>
@@ -1191,7 +1191,9 @@
  * 오버레이 방식
  */
  	//function fncCmpltCrtfc(p_prcsAplctPrdOrd, p_eduAplctOrd){
- 	function fncCmpltCrtfc(){
+ 	function fncCmpltCrtfc(
+ 		 	p_instrDetailActvtHstryOrd
+ 		 	){
 
  		var v_userId	=	$('#userId').val();
 
@@ -1212,7 +1214,7 @@
 		//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('instr_activity_20231108.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/tngrVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+']');
-		viewer.openFile('instr_activity_20231108.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/tngrVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+']');
+		viewer.openFile('instr_activity_20231108.mrd', '/rf [http://192.168.0.32:3080/offedu/ve/aplct/tngrVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+'&p_instrDetailActvtHstryOrd='+p_instrDetailActvtHstryOrd+']');
 		
 		
 		/*