From 97b55b905ffb46c279aaa537bc0fabe2910d72ed Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Mon, 11 Mar 2024 17:50:12 +0900
Subject: [PATCH] =?UTF-8?q?2024-03-11=2017:50=20=EC=B2=AD=EC=86=8C?=
 =?UTF-8?q?=EB=85=84=20=EA=B0=95=EC=82=AC=ED=99=9C=EB=8F=99=ED=99=95?=
 =?UTF-8?q?=EC=9D=B8=EC=84=9C=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   |  14 +-
 .../instrInfo/service/VEInstrDetailVO.java    |  44 ++++
 .../instrInfo/service/VEInstrMixService.java  |  14 ++
 .../instrInfo/service/impl/VEInstrMixDAO.java |  18 ++
 .../service/impl/VEInstrMixServiceImpl.java   |  19 ++
 .../web/OprtnInstrTngrPrflContoller.java      | 167 ++++++++++++-
 .../ve/instr/VEInstr_MIX_SQL_Tibero.xml       |  71 +++++-
 .../tngrVisitEdu/instrActvtHstryMngDetail.jsp |   4 +-
 .../tngrVisitEdu/instrAplctActvtExcel.jsp     | 220 ++++++++++--------
 .../instrInfo/instrPrflDetail.jsp             |   3 +-
 10 files changed, 465 insertions(+), 109 deletions(-)

diff --git a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java
index dac78dd1..33aa3c3e 100644
--- a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java
+++ b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java
@@ -1124,7 +1124,7 @@ public class CrownixAjaxController {
 				) throws Exception{
 			
 			p_vEInstrDetailVO.setInstrDetailActvtHstryOrd(p_instrDetailActvtHstryOrd);
-			List<VEInstrDetailVO> vEInstrDetailVOList = vEInstrMixService.selectPagingActivityList4Report(p_vEInstrDetailVO);
+			List<VEInstrDetailVO> vEInstrDetailVOList = vEInstrMixService.selectPagingActivityList4Report20240311(p_vEInstrDetailVO);
 			
 	    	//복호화
 	    	vEInstrDetailVOList = egovCryptoUtil.decryptVEInstrDetailVOList(vEInstrDetailVOList);
@@ -1135,13 +1135,13 @@ public class CrownixAjaxController {
 	    	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_2", vEInstrDetailVOList.get(i).getYr()+"년");	//강사활동년
+	    		jsDrtInfo.put("data_3", vEInstrDetailVOList.get(i).getMnt()+"월");	//강사활동월
+	    		jsDrtInfo.put("data_4", vEInstrDetailVOList.get(i).getDe()+"일");	//강사활동일
+	    		jsDrtInfo.put("data_5", vEInstrDetailVOList.get(i).getCn());	    			//강사 활동 학교명
+	    		jsDrtInfo.put("data_6", vEInstrDetailVOList.get(i).getLrn()+"차시");					//강사활동차시
 	    		
-	    		i_sumChasi	=	i_sumChasi	+	Integer.parseInt(vEInstrDetailVOList.get(i).getLrnTm());
+	    		i_sumChasi	=	i_sumChasi	+	Integer.parseInt(vEInstrDetailVOList.get(i).getLrn());
 	    				
 	    		jsReqInfo.add(jsDrtInfo);
 	    		
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 23646430..617ae859 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
@@ -215,6 +215,14 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable {
 	private String cnt;				//통계 데이터 숫자
 	private String codeNm;			//통계 데이터 코드명
 	
+	private String dataOrd;	//이력입력순번
+	
+	private String yr;		//년	
+	private String mnt;		//월
+	private String de;		//일
+	private String cn;		//내용
+	private String lrn;		//차시
+	
 	public String getDesc1() {
 		return desc1;
 	}
@@ -1081,5 +1089,41 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable {
 	public void setCodeNm(String codeNm) {
 		this.codeNm = codeNm;
 	}
+	public String getYr() {
+		return yr;
+	}
+	public void setYr(String yr) {
+		this.yr = yr;
+	}
+	public String getMnt() {
+		return mnt;
+	}
+	public void setMnt(String mnt) {
+		this.mnt = mnt;
+	}
+	public String getDe() {
+		return de;
+	}
+	public void setDe(String de) {
+		this.de = de;
+	}
+	public String getCn() {
+		return cn;
+	}
+	public void setCn(String cn) {
+		this.cn = cn;
+	}
+	public String getDataOrd() {
+		return dataOrd;
+	}
+	public void setDataOrd(String dataOrd) {
+		this.dataOrd = dataOrd;
+	}
+	public String getLrn() {
+		return lrn;
+	}
+	public void setLrn(String lrn) {
+		this.lrn = lrn;
+	}
 	
 }
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 3f71fbde..7c3b9c71 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
@@ -46,6 +46,9 @@ public interface VEInstrMixService {
 
 	//L page (강사활동리스트)
 	List<VEInstrDetailVO> selectPagingActivityList4Report(VEInstrDetailVO vEInstrDetailVO) throws Exception;
+
+	//L page (강사활동리스트) - new 신규 테이블 사용
+	List<VEInstrDetailVO> selectPagingActivityList4Report20240311(VEInstrDetailVO vEInstrDetailVO) throws Exception;
 	
 	//L (특정강사배정용리스트)
 	List<VEInstrDetailVO> selectDetailList(VEInstrDetailVO vEInstrDetailVO) throws Exception;
@@ -104,6 +107,17 @@ public interface VEInstrMixService {
 	//강사 인증 이메일 생성 처리
 	int insertInstrEmailCrtfd(VEInstrDetailVO vEInstrDetailVO) throws Exception;
 	
+	
+	//강사 활동확인서 내용 저장하기
+	int insertInstrDetailActvtHstryData(VEInstrDetailVO vEInstrDetailVO) throws Exception;
+
+	//강사 활동확인서 내용 삭제하기
+	int deleteInstrDetailActvtHstryData(VEInstrDetailVO vEInstrDetailVO) throws Exception;
+	
+	//L (특정강사배정용리스트)
+	List<VEInstrDetailVO> selectDetailActvtHstryList(VEInstrDetailVO vEInstrDetailVO) throws Exception;
+	
+	
 	VEInstrDetailVO selectInstrEmailCrtfdNumber(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 de96f651..259abea6 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
@@ -100,6 +100,11 @@ public class VEInstrMixDAO extends EgovAbstractDAO {
 		return tlist;
 	}
 	
+	public List<VEInstrDetailVO> selectPagingActivityList4Report20240311(VEInstrDetailVO vEInstrDetailVO) throws Exception {
+		List<VEInstrDetailVO> tlist = (List<VEInstrDetailVO>) list("VEInstrMixDAO.selectPagingActivityList4Report20240311", vEInstrDetailVO);
+		return tlist;
+	}	
+	
 	public List<VEInstrDetailVO> selectDetailList(VEInstrDetailVO vEInstrDetailVO) throws Exception {
 		List<VEInstrDetailVO> tlist = (List<VEInstrDetailVO>) list("VEInstrMixDAO.selectDetailList", vEInstrDetailVO);
 		return tlist;
@@ -225,6 +230,19 @@ public class VEInstrMixDAO extends EgovAbstractDAO {
 		return update("VEInstrMixDAO.insertInstrEmailCrtfd", vEInstrDetailVO);
 	}
 	
+	public int insertInstrDetailActvtHstryData(VEInstrDetailVO vEInstrDetailVO) throws Exception {
+		return update("VEInstrMixDAO.insertInstrDetailActvtHstryData", vEInstrDetailVO);
+	}	
+	
+	public int deleteInstrDetailActvtHstryData(VEInstrDetailVO vEInstrDetailVO) throws Exception {
+		return update("VEInstrMixDAO.deleteInstrDetailActvtHstryData", vEInstrDetailVO);
+	}	
+	
+	public List<VEInstrDetailVO> selectDetailActvtHstryList(VEInstrDetailVO vEInstrDetailVO) throws Exception {
+		List<VEInstrDetailVO> tlist = (List<VEInstrDetailVO>) list("VEInstrMixDAO.selectDetailActvtHstryList", vEInstrDetailVO);
+		return tlist;
+	}	
+	
 	public VEInstrDetailVO selectInstrEmailCrtfdNumber(VEInstrDetailVO vEInstrDetailVO) throws Exception {
 		return (VEInstrDetailVO) select("VEInstrMixDAO.selectInstrEmailCrtfdNumber", vEInstrDetailVO);
 	}
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 b27f42c8..a2c6ed25 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
@@ -81,6 +81,11 @@ public class VEInstrMixServiceImpl implements VEInstrMixService {
 	public List<VEInstrDetailVO> selectPagingActivityList4Report(VEInstrDetailVO vEInstrDetailVO) throws Exception{
 		return vEInstrMixDAO.selectPagingActivityList4Report(vEInstrDetailVO);
 	}	
+
+	//paging List
+	public List<VEInstrDetailVO> selectPagingActivityList4Report20240311(VEInstrDetailVO vEInstrDetailVO) throws Exception{
+		return vEInstrMixDAO.selectPagingActivityList4Report20240311(vEInstrDetailVO);
+	}	
 	
 	//List
 	public List<VEInstrDetailVO> selectDetailList(VEInstrDetailVO vEInstrDetailVO) throws Exception{
@@ -174,6 +179,20 @@ public class VEInstrMixServiceImpl implements VEInstrMixService {
 		return  vEInstrMixDAO.insertInstrEmailCrtfd(vEInstrDetailVO);
 	}
 	
+	public int insertInstrDetailActvtHstryData(VEInstrDetailVO vEInstrDetailVO) throws Exception{
+		
+		return  vEInstrMixDAO.insertInstrDetailActvtHstryData(vEInstrDetailVO);
+	}
+
+	public int deleteInstrDetailActvtHstryData(VEInstrDetailVO vEInstrDetailVO) throws Exception{
+		
+		return  vEInstrMixDAO.deleteInstrDetailActvtHstryData(vEInstrDetailVO);
+	}
+
+	public List<VEInstrDetailVO> selectDetailActvtHstryList(VEInstrDetailVO vEInstrDetailVO) throws Exception{
+		return vEInstrMixDAO.selectDetailActvtHstryList(vEInstrDetailVO);
+	}	
+	
 	public VEInstrDetailVO selectInstrEmailCrtfdNumber(VEInstrDetailVO vEInstrDetailVO) throws Exception {
 		return vEInstrMixDAO.selectInstrEmailCrtfdNumber(vEInstrDetailVO);
 	}
diff --git a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java
index bf7e4671..9bc61078 100644
--- a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java
+++ b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java
@@ -210,7 +210,7 @@ public class OprtnInstrTngrPrflContoller {
 
 		//학교 정보
 		@Resource(name="scholInfoService")
-		private ScholInfoService scholInfoService;		
+		private ScholInfoService scholInfoService;	
 		
 		// 교육패널티
 		@Resource(name = "vEEduPnltyService")
@@ -236,6 +236,10 @@ public class OprtnInstrTngrPrflContoller {
 		@Resource(name = "iTNotiUtil")
 		private ITNotiUtil	iTNotiUtil;
 		
+	    //서류요청 순번
+	    @Resource(name="instrActvtHstryOrdGnrService")
+	    private EgovIdGnrService instrActvtHstryOrdGnrService;
+	    
 		/**
 		 * 1.강사등록신청 목록 조회 - 
 		 */
@@ -1025,6 +1029,10 @@ public class OprtnInstrTngrPrflContoller {
 			
 			//로그인 처리====================================  
 			
+			List<VEInstrDetailVO> vEInstrDetailVOList = vEInstrMixService.selectDetailActvtHstryList(vEInstrDetailVO);
+			model.addAttribute("vEInstrDetailVOList", vEInstrDetailVOList);
+			
+			
 			return "/oprtn/tngrVisitEdu/instrAplctActvtExcel";
 		}
 		
@@ -1427,6 +1435,163 @@ public class OprtnInstrTngrPrflContoller {
 			return modelAndView;
 		}
 		
+		/**
+		 * 강사활동확인서 EXCEL 등록한다.
+		 *
+		 * @param boardVO
+		 * @param board
+		 * @param model
+		 * @return
+		 * @throws Exception
+		 */
+		@RequestMapping(value= 
+			{		
+					"/ve/oprtn/instr/tngrVisitEdu/instrInfo/instrAplctActvtExcelAjax.do"
+					}
+		)
+		public ModelAndView instrAplctActvtExcelAjax(
+				HttpServletRequest request
+				, @ModelAttribute("vEInstrDetailVO") VEInstrDetailVO	vEInstrDetailVO
+				//, @ModelAttribute("insertAgency") VacsVactVO vacsVactVO
+				, final MultipartHttpServletRequest multiRequest
+				, @ModelAttribute("board") Board board
+				//, ModelMap model
+				, ModelAndView modelAndView
+				, RedirectAttributes redirectAttributes			 
+				) throws Exception {
+
+			//json 알림
+			modelAndView.setViewName("jsonView");
+					
+			
+	    	//사용자 로그인 여부 체크 for json
+			//로그인 정보 가져오기
+	        LoginVO loginVO = checkLoginUtil.getAuthLoginVO();				//권한에 따른 로그인 정보 가져오기
+	    	//String isLogin = checkLoginUtil.isLoginCheck4JsonAction(modelAndView);    	
+	    	//if ("N".equals(isLogin)) return modelAndView;	
+	    					    	
+			
+			//필요 쿼리 생성 및 처리	-	계좌번호만 작성된 파일 처리
+			String s_split	=	"\t";
+			int i_data_column_size	=	25;
+			int i_data_start_row	=	0;
+			
+	    	
+			//1.파일 정상 처리 여부와 첨부 파일 정보
+			String atchFileId = "";	//size and ea		
+	
+			
+			//2.파일 읽기
+			//text 파일 읽어서 list에 넣기
+			List<String> sb = new ArrayList<>();
+					
+			try{
+				//1.파일 정상 처리 여부와 첨부 파일 정보
+				atchFileId = this.readFile(multiRequest, modelAndView, "xls|xlsx|xlsm", 10, 1);	//size and ea		
+				
+				if ("ERROR".equals(atchFileId)) return modelAndView;
+						
+				
+				//2.파일 읽기
+				//text 파일 읽어서 list에 넣기
+				//List<String> sb = new ArrayList<>();		
+				sb = checkFileUtil.extractFromTxtFile(multiRequest, sb);
+								
+				if (sb.size()==0) {
+					//text 파일읽기가 안된경우 excel 읽기를 실행
+					sb = checkFileUtil.extractFromExcelFile(multiRequest, sb, 0, i_data_column_size, i_data_start_row);
+
+				}				
+			}catch(Exception ex) {
+				ex.printStackTrace();
+			}
+			
+
+			//3.쿼리 만들기
+			//String s_in_query	=	"'0'";
+			//String s_select_query	=	"SELECT '0' acct_no";
+			
+			try {
+				String[] s_stndrd_tmp	=	sb.get(0).split(s_split);
+				
+				//3.데이터 저장하기
+				for (int i=1;i<sb.size();i++) {
+					String[] s_tmp	=	sb.get(i).split(s_split);			
+					
+					
+					if (s_tmp.length>=s_stndrd_tmp.length && !"".equals(s_tmp[2])) {
+						//학교 등록 처리
+						//동일한 정보가 있는지 확인
+						//stndrd_schol_cd 없으면 
+						//신규 저장
+						//있으면 update
+						try {
+							
+							vEInstrDetailVO.setYr(s_tmp[0]);						
+							vEInstrDetailVO.setMnt(s_tmp[1]);
+							vEInstrDetailVO.setDe(s_tmp[2]);
+							vEInstrDetailVO.setCn(s_tmp[3]);
+							vEInstrDetailVO.setLrn(s_tmp[4]);
+							
+							vEInstrDetailVO.setDataOrd(instrActvtHstryOrdGnrService.getNextStringId());
+							
+							vEInstrMixService.insertInstrDetailActvtHstryData(vEInstrDetailVO);							
+						}catch(Exception ex) {
+							ex.printStackTrace();
+						}
+												
+					}
+				}
+				
+				modelAndView.addObject("result", "success");	
+			}catch(Exception ex) {
+				ex.printStackTrace();
+			}
+			
+			
+			return modelAndView;
+		}
+		
+		/**
+		 * 청소년대상 강사 활동확인서 삭제Ajax - 
+		 */
+		@RequestMapping("/ve/oprtn/instr/tngrVisitEdu/instrInfo/deleteAplctActvtAjax.do")	
+		public ModelAndView deleteAplctActvtAjax( 
+				@ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO
+				, final MultipartHttpServletRequest multiRequest
+				, ModelMap model
+				, RedirectAttributes redirectAttributes
+				, HttpSession session
+				, HttpServletRequest request
+				) throws Exception {
+		
+			ModelAndView modelAndView = new ModelAndView();
+			modelAndView.setViewName("jsonView");	  
+			//로그인 처리====================================
+			//로그인 정보 가져오기
+	        LoginVO loginVO = checkLoginUtil.getAuthLoginVO();				//권한에 따른 로그인 정보 가져오기
+	        
+	        System.out.println("vEInstrDetailVO.toString()");
+	        System.out.println(vEInstrDetailVO.toString());
+	        
+	        for(String dataOrd : vEInstrDetailVO.getUserIdList()) {
+
+				//결과보고서 제출 알림
+				try {				
+					
+					vEInstrDetailVO.setDataOrd(dataOrd);
+					int i	=	vEInstrMixService.deleteInstrDetailActvtHstryData(vEInstrDetailVO);
+					
+				}catch(Exception ex) {
+					ex.printStackTrace();
+				}				
+	        	
+	        }
+
+	        modelAndView.addObject("result", "success");
+			
+			return modelAndView;
+		}
 		
 		/**
 		 * 2. 강사등록신청 상세 조회 
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 b8cf85e1..ba62e364 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
@@ -1335,7 +1335,23 @@
 		ORDER BY a.edu_hope_dt
 					
 	</select>		
-	
+
+	<!-- 강사 디테일 정보 L page -->
+	<select id="VEInstrMixDAO.selectPagingActivityList4Report20240311" parameterClass="VEInstrDetailVO" resultClass="VEInstrDetailVO">
+		/*	VEInstrMixDAO.selectPagingActivityList4Report20240311	*/
+		SELECT data_ord AS dataOrd
+			, yr
+			, mnt
+			, de
+			, cn
+			, lrn
+		FROM ve_instr_detail_actvt_hstry_data
+		WHERE instr_detail_actvt_hstry_ord=#instrDetailActvtHstryOrd#
+			AND user_id=#userId#
+		ORDER BY data_ord ASC				
+					
+	</select>	
+		
 	<!-- 특정 강사 배정용 리스트 L -->
 	<select id="VEInstrMixDAO.selectDetailList" parameterClass="VEInstrDetailVO" resultClass="VEInstrDetailVO">
 		/*	VEInstrMixDAO.selectDetailList	*/
@@ -3743,6 +3759,7 @@
 		DELETE FROM VEA_INSTR_EMAIL_CRTFD
 			WHERE user_id = #userId#
 	</delete>
+	
 	<insert id="VEInstrMixDAO.insertInstrEmailCrtfd" parameterClass="VEInstrDetailVO">
 	/*	VEInstrMixDAO.insertInstrEmailCrtfd	*/
 		INSERT INTO VEA_INSTR_EMAIL_CRTFD
@@ -3761,6 +3778,58 @@
 			
 	</insert>
 	
+	<insert id="VEInstrMixDAO.insertInstrDetailActvtHstryData" parameterClass="VEInstrDetailVO">
+	/*	VEInstrMixDAO.insertInstrDetailActvtHstryData	*/
+		INSERT INTO VE_INSTR_DETAIL_ACTVT_HSTRY_DATA
+			(
+				instr_detail_actvt_hstry_ord,
+				user_id,
+				data_ord,
+				yr,
+				mnt,
+				de,
+				cn,
+				lrn,
+				frst_regist_pnttm,
+				frst_register_id								
+			)
+			VALUES(
+				#instrDetailActvtHstryOrd#,
+				#userId#,
+				#dataOrd#,
+				#yr#,
+				#mnt#,
+				#de#,
+				#cn#,
+				#lrn#,
+				sysdate,
+				#frstRegisterId#
+			)
+			
+	</insert>
+	
+	<delete id="VEInstrMixDAO.deleteInstrDetailActvtHstryData" parameterClass="VEInstrDetailVO">
+	/*	VEInstrMixDAO.deleteInstrDetailActvtHstryData	*/
+		DELETE FROM VE_INSTR_DETAIL_ACTVT_HSTRY_DATA
+			WHERE data_ord = #dataOrd#
+	</delete>	
+		
+	<!-- 교육실정통계 기반강화연수-->
+	<select id="VEInstrMixDAO.selectDetailActvtHstryList" parameterClass="VEInstrDetailVO" resultClass="VEInstrDetailVO">
+			/*	VEInstrMixDAO.selectDetailActvtHstryList	*/
+						   	
+		SELECT data_ord AS dataOrd
+			, yr
+			, mnt
+			, de
+			, cn
+			, lrn
+		FROM ve_instr_detail_actvt_hstry_data
+		WHERE instr_detail_actvt_hstry_ord=#instrDetailActvtHstryOrd#
+			AND user_id=#userId#
+		ORDER BY data_ord asc			   	
+	</select>	
+			
 	<select id="VEInstrMixDAO.selectInstrEmailCrtfdNumber" parameterClass="VEInstrDetailVO" resultClass="VEInstrDetailVO">
 		/*	VEInstrMixDAO.selectInstrEmailCrtfdNumber	*/
 		SELECT
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 879c2101..c8604238 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngDetail.jsp
@@ -86,9 +86,7 @@
 		window.open("<c:url value='/cmm/fms/FileDown.do?atchFileId="+atchFileId+"&fileSn="+fileSn+"'/>");
 	}
 
-	function fncGoScholExcel(){
-		alert("작업중입니다.");
-		return;
+	function fncGoScholExcel(){		
 		var detailForm = document.detailForm ;
 		detailForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/instrInfo/instrAplctActvtExcel.do'/>";
 		detailForm.submit();
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctActvtExcel.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctActvtExcel.jsp
index 5408a487..7681bee3 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctActvtExcel.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctActvtExcel.jsp
@@ -61,6 +61,10 @@ $( document ).ready(function(){
 
 });
 
+	function chkAll(thisObj){
+		$("input[name=chk]").prop("checked" , $(thisObj).is(":checked"));
+	}
+
 	//생년월일, 위촉년도 뿌려주기
 	function getYears(getYear){
 		
@@ -81,81 +85,32 @@ $( document ).ready(function(){
 		}
 	}
 
-    function fncSave(){
-    	//핸드폰번호 하이푼 추가
-		 var phoneAll = document.getElementById("phone1").value + "-"+ document.getElementById("phone2").value + "-"+ document.getElementById("phone3").value; 
-    	//핸드폰번호 하이푼 추가 X
-// 		 var phoneAll = document.getElementById("phone1").value + document.getElementById("phone2").value + document.getElementById("phone3").value;
-    	 $("#phone").val(phoneAll)
-		//이메일 합치기
-		var emailAll = document.getElementById("email1").value + "@"+ document.getElementById("email2").value ;
-    	 $("#email").val(emailAll)
- 		//생년월일합치기, 8자리 맞추기
-     	var dBirth1 = $("#dBirth1 option:selected").val()
-     	var dBirth2 = $("#dBirth2 option:selected").val()
-     	var dBirth3 = $("#dBirth3 option:selected").val()
-     	if(dBirth2.length == 1){
-     		dBirth2 = "0"+dBirth2;
-     	}
-     	if(dBirth3.length == 1){
-     		dBirth3 = "0"+dBirth3;
-     	}
- 		var dBirthAll = dBirth1 + dBirth2 + dBirth3
- 		$("#dBirth").val(dBirthAll)		
-		/* var dBirthAll = document.getElementById("dBirth1").value + document.getElementById("dBirth2").value + document.getElementById("dBirth3").value
-		$("#dBirth").val(dBirthAll) */
-    	/*
-    	<!-- for validator #3 -->
-    	*/
-    	if (!validateVEInstrDetailVO(document.createForm)) return;
-    	/*
-    	<!-- for validator #3 -->
-    	*/
-    	
-    	/* value에 기본적으로 - 또는 @ 들어가서 필수 값 체크 따로 */
-     	if($("#phone1").val() == '' || $("#phone2").val() == '' || $("#phone3").val() == ''){
-    		alert("연락처는 필수입니다.");
-    		return false;
-    	}
-     	if($("#email1").val() == '' || $("#email2").val() == ''){
-    		alert("이메일은 필수입니다.");
-    		return false;
-    	}
-     	
-     	/* 청소년 강사와 다른 성인 강사 항목. 공통 validator에 없음 */
-    	if($("#finalSchol").val() == ''){
-    		alert("최종학교는 필수입니다.");
-    		return false;
-    	}
-    	
-    	if($("#mjr").val() == ''){
-    		alert("전공는 필수입니다.");
-    		return false;
-    	}
-    	
-    	/* var ment = "";
-    	if(type == 'I'){
-    		$("#sbmtYn").val("N");
-    		ment = "저장";
-    	}
-    	//등록요청
-    	if(type == 'S'){
-    		$("#sbmtYn").val("N");
-    		$("#aprvlCd").val("10");
-    		ment = "등록 요청";
-    	} */
-    	
-//         $("#mode").val(type);
-        var data = new FormData(document.getElementById("createForm"));
-        _fileForm2.forEach(function(obj, idx) {
-            if (obj) data.append("file"+idx, obj.fileObj);
-        });
+    function fncDel(){
 
-        if(confirm("강사정보를 등록 하시겠습니까?")){
+        var selectedDataOrd = [];
+        
+        // "chk" 이름을 가진 체크박스가 체크된 항목들을 순회
+        $("input[name='chk']:checked").each(function() {
+            var dataOrdValue = $(this).data('dataord');            
+            selectedDataOrd.push(dataOrdValue);
+        });
+        
+        console.log('selectedDataOrd : ', selectedDataOrd);
+        // 선택된 항목이 없으면 경고 메시지를 표시하고 함수를 종료
+        if (selectedDataOrd.length === 0) {
+            alert("선택된 항목이 없습니다. 선택 후 다시 시도하세요.");
+            return false;
+        }
+
+        $("#userIdList").val(selectedDataOrd);
+
+        var data = new FormData(document.delForm);
+
+        if(confirm("해당데이터를 삭제 하시겠습니까?")){
                 $.ajax({
                     type: "POST",
-                    enctype: 'multipart/form-data',
-                    url: "${pageContext.request.contextPath}/ve/oprtn/instr/tngrVisitEdu/instrInfo/instrAplctRegAjax.do",
+                    //enctype: 'multipart/form-data',
+                    url: "${pageContext.request.contextPath}/ve/oprtn/instr/tngrVisitEdu/instrInfo/deleteAplctActvtAjax.do",
                     data: data,
                     dataType:'json',
                     async: false,
@@ -164,13 +119,13 @@ $( document ).ready(function(){
                     cache: false,
                     success: function (returnData, status) {
                         if(status == 'success'){
-                            alert("등록 되었습니다.");
-                            fncGoList(); //현재 메인화면 이동
+                            alert("삭제 되었습니다.");
+                            location.reload();
                         } else if(status== 'fail'){
-                            alert("등록에 실패하였습니다.");
+                            alert("삭제에 실패하였습니다.");
                         }
                     },
-                    error: function (e) { alert("등록에 실패하였습니다."); console.log("ERROR : ", e); }
+                    error: function (e) { alert("삭제에 실패하였습니다."); console.log("ERROR : ", e); }
                 });
         }
     }
@@ -182,7 +137,7 @@ $( document ).ready(function(){
 	
 	function fncGoList(){
 		var createForm = document.createForm;
-		createForm.action = "<c:url value='/kccadr/oprtn/tngrVisitEdu/scholMngList.do'/>";
+		createForm.action = "<c:url value='/kccadr/oprtn/tngrVisitEdu/instrActvtHstryMngDetail.do'/>";
 		createForm.submit();
 	}
 
@@ -293,7 +248,7 @@ $( document ).ready(function(){
 		
 		var url = "";
 		//url = "/uss/ion/payva/insertVirtualAccountAjax.do";		
-		url = "${pageContext.request.contextPath}/ve/oprtn/instr/tngrVisitEdu/instrInfo/instrAplctScholExcelAjax.do";
+		url = "${pageContext.request.contextPath}/ve/oprtn/instr/tngrVisitEdu/instrInfo/instrAplctActvtExcelAjax.do";
 		
 		
 		$.ajax({
@@ -313,9 +268,10 @@ $( document ).ready(function(){
 				if(status == 'success'){ // status 확인 필요한가. 석세스 안뜨면 에러 가지 않나
 					if("success"==returnData.result){
 						alert("저장 되었습니다.");
+						location.reload();
 						//$("#addrAgencyVO")[0].reset();					
 						//listLoad();
-						location.href="${pageContext.request.contextPath}/kccadr/oprtn/tngrVisitEdu/scholMngList.do";
+						//location.href="${pageContext.request.contextPath}/kccadr/oprtn/tngrVisitEdu/scholMngList.do";
 
 					}else{
 						alert(returnData.message);
@@ -348,22 +304,14 @@ $( document ).ready(function(){
 	<input type="hidden" name="instrDetailOrd" id="instrDetailOrd" value="<c:out value='${info.instrDetailOrd}'/>"/> <!-- 강사구분 -->`
 	<input type="hidden" name="aprvlCd" id="aprvlCd" value=""/> <!-- 승인코드 -->	
 </form> --%>
-
+<form:form id="delForm" name="delForm" commandName="vEInstrDetailVO"  method="post" >
+	<input type="hidden" name="userIdList" id="userIdList" value=""/>	<!-- 이력순번 -->
+</form:form>
+	
 <form:form id="createForm" name="createForm" commandName="vEInstrDetailVO"  method="post" >
-	<input type="hidden" name="pageIndex" value="<c:out value='${vEInstrDetailVO.pageIndex}'/>"/>
-	<input type="hidden" name="searchStartDt" value="<c:out value="${vEInstrDetailVO.searchStartDt}" />" />
-	<input type="hidden" name="searchEndDt" value="<c:out value="${vEInstrDetailVO.searchEndDt}" />" />
-	<input type="hidden" name="searchKeyword" value="<c:out value="${vEInstrDetailVO.searchKeyword}" />" />
-	<input type="hidden" name="userId" id="userId" value="<c:out value='${info.userId}'/>"/>	<!-- 사용자 아이디 -->
-	<input type="hidden" name="instrDiv" id="instrDiv" value="<c:out value='${info.instrDiv}'/>"/> <!-- 강사구분 -->
-	<input type="hidden" name="instrDetailOrd" id="instrDetailOrd" value="<c:out value='${info.instrDetailOrd}'/>"/> <!-- 강사구분 -->
-	<input type="hidden" name="aprvlCd" id="aprvlCd" value=""/> <!-- 승인코드 -->
-	<input type="hidden" name="aprvlCn" id="aprvlCn" value="<c:out value='${info.instrDiv}'/>"/> <!-- 승인내용(반려사유) -->
-	<input type="hidden" name="rqstType" id="rqstType" value=""/> <!-- 요청유형 -->
-	<input type="hidden" name="phone" id="phone" value=""/> <!-- 연락처 -->
-	<input type="hidden" name="email" id="email" value=""/> <!-- 이메일 -->
-	<input type="hidden" name="dBirth" id="dBirth" value=""/> <!-- 생년월일 -->
-	<input type="hidden" name="formId" id="formId" value=""/> 
+	<input type="hidden" name="instrDetailActvtHstryOrd" id="instrDetailActvtHstryOrd" value="<c:out value='${vEInstrDetailVO.instrDetailActvtHstryOrd}'/>"/>	<!-- 이력순번 -->
+	<input type="hidden" name="userId" id="userId" value="<c:out value='${vEInstrDetailVO.userId}'/>"/>	<!-- 사용자 아이디 -->
+	 
 <!-- cont -->
 <div class="cont_wrap">
 	<div class="box">
@@ -408,7 +356,7 @@ $( document ).ready(function(){
 		                                        <button type="button" class="btn_type06"
 		                                        onclick="document.all.file.click(); return false;"
 		                                        >파일첨부</button>
-		                                        <span class="req_text1">※ 컴퓨터 파일(엑셀)만 등록 가능합니다.<a href="https://www.edu-copyright.or.kr/offedu/cmm/fms/FileDown.do?atchFileId=FILE_000000000001231&fileSn=0" target="_blank">샘플 다운로드</a></span>
+		                                        <span class="req_text1">※ 컴퓨터 파일(엑셀)만 등록 가능합니다.<a href="https://www.edu-copyright.or.kr/offedu/cmm/fms/FileDown.do?atchFileId=FILE_000000000003608&fileSn=0" target="_blank">샘플 다운로드</a></span>
 		                                        <!-- <span class="reqTxt6">※ 컴퓨터 파일(엑셀)만 등록 가능합니다.<a href="https://www.copyright.or.kr/offedu/cmm/fms/FileDown.do?atchFileId=FILE_000000000018209&fileSn=0" target="_blank">sample</a></span> -->
 		                                    </td>	
 						</tr>						
@@ -424,10 +372,90 @@ $( document ).ready(function(){
 				</div>
 				<div class="btn_right">
 					<button type="button" class="btn_type02" onclick="fn_insert(); return false;">등록</button>
-					<button type="button" class="btn_type03" onclick="fncCancle(); return false;">취소</button>
+					<button type="button" class="btn_type03" onclick="fncGoList(); return false;">취소</button>
 				</div>
 			</div>
 
+			<div class="btn_wrap btn_layout01">
+				<div class="btn_left">
+				</div>
+				<div class="btn_center">
+				</div>
+				<div class="btn_right">
+				</div>
+			</div>
+				<!-- list -->
+				<div class="tb_type01">
+					<table>
+						<colgroup>
+							<col style="width: 100px;">
+							<col style="width: 150px;">
+							<col style="width: 120px;">
+							<col style="width: 120px;">							
+							<col style="width: auto;">
+							<col style="width: 150px;">
+							
+<%-- 							<col style="width: 10%;"> --%>
+<%-- 							<col style="width: 10%;"> --%>
+<%-- 							<col style="width: 15%;"> --%>
+						</colgroup>
+						<thead>
+							<tr>
+								<th><input type="checkbox" name="checkAll" id="checkAll" onclick="chkAll(this);" /><label for="checkAll"></label>번호</th>
+								<th>년</th>
+								<th>월</th>
+								<th>일</th>
+								<th>내용</th>
+								<th>차시</th>
+							</tr>
+						</thead>
+						<tbody>
+						<c:forEach var="list" items="${vEInstrDetailVOList}" varStatus="status">
+							<tr>
+								<td>
+									<input name="chk"									 
+									data-dataord="${list.dataOrd}" title="Check" type="checkbox"/>									
+									<c:out value="${status.count }"/>																	
+									
+								</td>
+								<td>									
+									<c:out value="${list.yr }" />
+								</td>
+								<td>									
+									<c:out value="${list.mnt }" />
+								</td>
+								<td>									
+									<c:out value="${list.de }" />
+								</td>
+								<td>									
+									<c:out value="${list.cn }" />
+								</td>
+								<td>									
+									<c:out value="${list.lrn }" />
+								</td>
+							</tr>
+							<!--
+							 onclick="fn_goDetail('${list.instrDetailActvtHstryOrd}')" style="cursor:pointer;" 
+							 -->
+						</c:forEach>
+						<c:if test="${empty vEInstrDetailVOList}">
+							<tr><td colspan="6"><spring:message code="common.nodata.msg" /></td></tr>
+						</c:if>
+						</tbody>
+					</table>
+				</div>
+				<!-- //list -->
+
+			<div class="btn_wrap btn_layout01">
+				<div class="btn_left">
+				</div>
+				<div class="btn_center">
+				</div>
+				<div class="btn_right">
+					<button type="button" class="btn_type02" onclick="fncDel(); return false;">삭제</button>
+				</div>
+			</div>
+			
 		</div>
 	</div>
 </div>
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 a33e75d1..a3881372 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
@@ -1230,7 +1230,8 @@
 	 		var viewer = new m2soft.crownix.Viewer('http://119.193.215.98:8093/ReportingServer/service');
 			viewer.hideToolbarItem(["save"]);
 			viewer.showToolbarItem(["print_pdf"]);
-			viewer.openFile('instr_activity_20231108.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/tngrVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+'&p_instrDetailActvtHstryOrd='+p_instrDetailActvtHstryOrd+']');
+			//viewer.openFile('instr_activity_20231108.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/tngrVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+'&p_instrDetailActvtHstryOrd='+p_instrDetailActvtHstryOrd+']');
+			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+']');
 		}
  	 	}
 </script>