2023-11-03 11:40 크로닉스 리포트 정보 추가

src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java

@@ -0,0 +1,362 @@
+package kcc.ve.aplct.comweb;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+import kcc.let.utl.fcc.service.EgovCryptoUtil;
+import kcc.ve.adv.tngr.stngInfo.service.VEACmpltCrtfcMixService;
+import kcc.ve.adv.tngr.stngInfo.service.VEACmpltCrtfcVO;
+import kcc.ve.aplct.fndtnEnhanceTrn.service.FndtnEnhanceTrnService;
+import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailService;
+import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO;
+import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO;
+
+/**
+ * 
+ * report 용 json 데이터 생성용 ajax controller 클래스를 정의한다.
+ * @author 조용준
+ * @since 2021.12.16
+ * @version 1.0
+ * @see
+ *
+ * <pre>
+ * << 개정이력(Modification Information) >>
+ *
+ *   수정일      수정자           수정내용
+ *  -------    --------    ---------------------------
+ *   2021.12.16  조용준          최초 생성
+ *
+ * </pre>
+ */
+
+@Controller
+//@RequestMapping("/web/ve/aplct/fndtnEnhanceTrn")
+public class CrownixAjaxController {
+	
+	private static final Logger LOGGER = LoggerFactory.getLogger(CrownixAjaxController.class);
+	
+	//암복호화 유틸
+	@Resource(name = "egovCryptoUtil")
+	EgovCryptoUtil egovCryptoUtil;
+
+	/*
+    //파일 체크 util
+	@Resource(name = "checkFileUtil")
+	private CheckFileUtil checkFileUtil;
+	
+	//로그인 체크 util
+	@Resource(name = "checkLoginUtil")
+	private CheckLoginUtil checkLoginUtil;
+	
+	//파일정보의 관리
+	@Resource(name = "EgovFileMngService")
+	private EgovFileMngService fileService;
+	
+	
+	//과정 관리
+	@Resource(name = "vEPrcsService")
+	private VEPrcsService vEPrcsService;
+
+	//온라인콘텐츠과정 관리
+	@Resource(name = "vEPrcsOnlnCntntService")
+	private VEPrcsOnlnCntntService vEPrcsOnlnCntntService;
+
+	//교육신청
+	@Resource(name = "vEEduAplctService")
+	private VEEduAplctService vEEduAplctService;
+	
+	//차시
+	@Resource(name = "vEEduChasiService")
+	private VEEduChasiService vVEEduChasiService;
+	
+	//교육과정신청
+	@Resource(name = "vEEduMIXService")
+	private VEEduMIXService vEEduMIXService;
+
+	//교육과정신청
+	@Resource(name = "vEPrcsMIXService")
+	private VEPrcsMIXService vEPrcsMIXService;
+	
+
+	//과정차시  관리
+	@Resource(name = "vEPrcsAplctPrdService")
+	private VEPrcsAplctPrdService vEPrcsAplctPrdService;
+	
+	
+	
+	//교육과정순번
+	@Resource(name="prcsGnrService")
+	private EgovIdGnrService prcsGnrService;
+	
+	//과정온라인콘텐츠순번
+	@Resource(name="prcsOnlnGnrService")
+	private EgovIdGnrService prcsOnlnGnrService;
+	
+	//교육신청순번
+	@Resource(name="eduAplctGnrService")
+	private EgovIdGnrService eduAplctGnrService;
+
+	//교육차시순번
+	@Resource(name="eduChasiGnrService")
+	private EgovIdGnrService eduChasiGnrService;
+	
+	//교육신청온라인
+	@Resource(name = "vEEduAplctOnlnService")
+	private VEEduAplctOnlnService vEEduAplctOnlnService;
+
+	@Resource(name = "eduAplctAdultService")
+	private EduAplctAdultService eduAplctAdultService;
+	
+	//코드
+	@Resource(name="cmmUseDAO")
+	private CmmUseDAO cmmUseDAO;
+	*/
+	
+
+	//온라인콘텐츠과정 관리
+	@Resource(name = "vEInstrDetailService")
+	private VEInstrDetailService vEInstrDetailService;
+	
+	//온라인콘텐츠과정 관리
+	@Resource(name = "fndtnEnhanceTrnService")
+	private FndtnEnhanceTrnService fndtnEnhanceTrnService;
+
+	//강의설정 관리(MIX)
+	@Resource(name = "vEACmpltCrtfcMixService")
+	private VEACmpltCrtfcMixService vEACmpltCrtfcMixService;
+	
+
+		/**
+		 * 교육 list select
+		 * viewer.openFile('cmplt_crtfc_20231030.mrd'
+		 * , '/rf [http://192.168.0.59:3080/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do
+		 * ?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']');
+		 */
+		@RequestMapping("/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do")
+		public ModelAndView fndtnEduAplctCmpltCrtfcAjax(
+				@ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO
+				, ModelMap model
+				, HttpServletRequest request
+				) throws Exception {
+			
+			ModelAndView modelAndView = new ModelAndView();
+			modelAndView.setViewName("jsonView");
+			
+			System.out.println("----------------");
+			System.out.println(request.getParameter("prcsAplctPrdOrd"));
+			System.out.println(request.getParameter("eduAplctOrd"));
+			System.out.println("----------------");
+			
+			VEACmpltCrtfcVO	vEACmpltCrtfcVO	=	new VEACmpltCrtfcVO();
+			vEACmpltCrtfcVO.setPrcsAplctPrdOrd(request.getParameter("prcsAplctPrdOrd"));
+			vEACmpltCrtfcVO.setEduAplctOrd(request.getParameter("eduAplctOrd"));
+			
+			vEACmpltCrtfcVO	=	vEACmpltCrtfcMixService.selectDetail_CC_1(vEACmpltCrtfcVO);
+			
+			vEACmpltCrtfcVO.setMberNm(egovCryptoUtil.decrypt(vEACmpltCrtfcVO.getMberNm()));
+			
+			/*
+	    	modelAndView.addObject("data_t", "교육연수이수증X");
+			
+			modelAndView.addObject("data_1", "허은성");
+			modelAndView.addObject("data_2", "허은성");
+			modelAndView.addObject("data_3", "1986-08-02");
+			modelAndView.addObject("data_4", "직무연수");
+			modelAndView.addObject("data_5", "선율과 함꼐하는 저작권 여행");
+			modelAndView.addObject("data_6", "총15시간(1학점)");
+			modelAndView.addObject("data_7", "2023년5월15일~2023년05월26일");
+			
+			modelAndView.addObject("data_d", "2023년05월28일");
+			*/			
+			
+			modelAndView.addObject("data_t", "교육연수이수증");
+			
+			modelAndView.addObject("data_1", vEACmpltCrtfcVO.getEduCmpltCrtfcNmbr());
+			modelAndView.addObject("data_2", vEACmpltCrtfcVO.getMberNm());
+			modelAndView.addObject("data_3", vEACmpltCrtfcVO.getBirthDay());
+			modelAndView.addObject("data_4", vEACmpltCrtfcVO.getPrcsDiv());
+			modelAndView.addObject("data_5", vEACmpltCrtfcVO.getPrcsNm());
+			modelAndView.addObject("data_6", vEACmpltCrtfcVO.getMberNm());
+			modelAndView.addObject("data_7", vEACmpltCrtfcVO.getEduStrtPnttm()+"~"+vEACmpltCrtfcVO.getEduDdlnPnttm());
+			
+			String s_rd	=	vEACmpltCrtfcVO.getRd();
+			s_rd	=	s_rd.substring(0,4)+"년"+s_rd.substring(4,6)+"년"+s_rd.substring(6,8);
+			System.out.println(s_rd);
+			System.out.println(s_rd);
+			
+			modelAndView.addObject("data_d", s_rd);
+			
+			return modelAndView;
+			
+		}		
+		
+
+		/**
+		 * 기소유예 이수증
+		 * viewer.openFile('cmplt_crtfc_20231030.mrd'
+		 * , '/rf [http://192.168.0.59:3080/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do
+		 * ?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']');
+		 */
+		@RequestMapping("/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctCmpltCrtfcAjax.do")
+		public ModelAndView sspnIdtmtEduAplctCmpltCrtfcAjax(
+				@ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO
+				, ModelMap model
+				, HttpServletRequest request
+				) throws Exception {
+			
+			ModelAndView modelAndView = new ModelAndView();
+			modelAndView.setViewName("jsonView");
+			
+			System.out.println("----------------");
+			System.out.println(request.getParameter("prcsAplctPrdOrd"));
+			System.out.println(request.getParameter("eduAplctOrd"));
+			System.out.println("----------------");
+			
+			VEACmpltCrtfcVO	vEACmpltCrtfcVO	=	new VEACmpltCrtfcVO();
+			vEACmpltCrtfcVO.setPrcsAplctPrdOrd(request.getParameter("prcsAplctPrdOrd"));
+			vEACmpltCrtfcVO.setEduAplctOrd(request.getParameter("eduAplctOrd"));
+			
+			vEACmpltCrtfcVO	=	vEACmpltCrtfcMixService.selectDetail_CC_1(vEACmpltCrtfcVO);
+			
+			vEACmpltCrtfcVO.setMberNm(egovCryptoUtil.decrypt(vEACmpltCrtfcVO.getMberNm()));
+			
+			/*
+	    	modelAndView.addObject("data_t", "교육연수이수증X");
+			
+			modelAndView.addObject("data_1", "허은성");
+			modelAndView.addObject("data_2", "허은성");
+			modelAndView.addObject("data_3", "1986-08-02");
+			modelAndView.addObject("data_4", "직무연수");
+			modelAndView.addObject("data_5", "선율과 함꼐하는 저작권 여행");
+			modelAndView.addObject("data_6", "총15시간(1학점)");
+			modelAndView.addObject("data_7", "2023년5월15일~2023년05월26일");
+			
+			modelAndView.addObject("data_d", "2023년05월28일");
+			*/			
+			
+			modelAndView.addObject("data_t", "기소유예이수증");
+			
+			modelAndView.addObject("data_1", vEACmpltCrtfcVO.getEduCmpltCrtfcNmbr());
+			modelAndView.addObject("data_2", vEACmpltCrtfcVO.getMberNm());
+			modelAndView.addObject("data_3", vEACmpltCrtfcVO.getBirthDay());
+			modelAndView.addObject("data_4", vEACmpltCrtfcVO.getPrcsDiv());
+			modelAndView.addObject("data_5", vEACmpltCrtfcVO.getPrcsNm());
+			modelAndView.addObject("data_6", vEACmpltCrtfcVO.getMberNm());
+			modelAndView.addObject("data_7", vEACmpltCrtfcVO.getEduStrtPnttm()+"~"+vEACmpltCrtfcVO.getEduDdlnPnttm());
+			
+			String s_rd	=	vEACmpltCrtfcVO.getRd();
+			s_rd	=	s_rd.substring(0,4)+"년"+s_rd.substring(4,6)+"년"+s_rd.substring(6,8);
+			System.out.println(s_rd);
+			System.out.println(s_rd);
+			
+			modelAndView.addObject("data_d", s_rd);
+			
+			return modelAndView;
+			
+		}	
+
+		/**
+		 * 성인강사 출력 정보
+		 * 
+		 */
+		@RequestMapping("/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetailAjax.do")
+		public ModelAndView eduAplctDetailAjax(
+				ModelMap model
+				, HttpServletRequest request
+				) throws Exception {
+			
+			ModelAndView modelAndView = new ModelAndView();
+			modelAndView.setViewName("jsonView");
+			
+			System.out.println("----------------");
+			System.out.println(request.getParameter("p_instrId"));
+			System.out.println(request.getParameter("p_instrId"));
+			System.out.println("----------------");
+			/*
+			VEACmpltCrtfcVO	vEACmpltCrtfcVO	=	new VEACmpltCrtfcVO();
+			vEACmpltCrtfcVO.setPrcsAplctPrdOrd(request.getParameter("prcsAplctPrdOrd"));
+			vEACmpltCrtfcVO.setEduAplctOrd(request.getParameter("eduAplctOrd"));
+			
+			vEACmpltCrtfcVO	=	vEACmpltCrtfcMixService.selectDetail_CC_1(vEACmpltCrtfcVO);
+			
+			vEACmpltCrtfcVO.setMberNm(egovCryptoUtil.decrypt(vEACmpltCrtfcVO.getMberNm()));
+			*/
+			
+			
+	    	modelAndView.addObject("data_t", "강사정보");
+			
+			modelAndView.addObject("data_1", "성인강사2");
+			modelAndView.addObject("data_2", "010-9341-4986");
+			modelAndView.addObject("data_3", "rosehips@naver.com");
+			modelAndView.addObject("data_4", "13473 경기 성남시 분당구 경부고속도로 409삼평동");
+			modelAndView.addObject("data_5", "광주광역시(동구 계림동)");
+			modelAndView.addObject("data_6", "20110812");
+			modelAndView.addObject("data_7", "전문분야");
+			
+			//modelAndView.addObject("path", "http://119.193.215.98:9989/offedu/visitEdu/usr/publish/images/common/ci.png");
+			modelAndView.addObject("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId=FILE_000000000000463");
+			
+			
+			modelAndView.addObject("data_d", "2023년05월28일");
+						
+			//////////////////////////////////////////////성인 강사 정보
+			String s_user_id	=	request.getParameter("p_instrId");
+			VEInstrDetailVO	vEInstrDetailVO	=	new	VEInstrDetailVO();
+			
+	        vEInstrDetailVO.setUserId(s_user_id);
+	        vEInstrDetailVO.setInstrDiv("20");
+	        vEInstrDetailVO.setUseYn("Y");
+	        VEInstrDetailVO info = vEInstrDetailService.selectDetail(vEInstrDetailVO);
+	        
+	        // 강사 정보 select
+	        info	=	egovCryptoUtil.decryptVEInstrDetailVO(info);
+	        
+			
+	    	modelAndView.addObject("data_t", "강사정보");
+			
+			modelAndView.addObject("data_1", info.getInstrNm());
+			modelAndView.addObject("data_2", info.getPhone());
+			modelAndView.addObject("data_3", info.getEmail());
+			modelAndView.addObject("data_4", info.getAddr());
+			modelAndView.addObject("data_5", info.getRsdne());
+			modelAndView.addObject("data_6", info.getdBirth());
+			modelAndView.addObject("data_7", info.getPrfsnFld());
+			
+			//modelAndView.addObject("path", "http://119.193.215.98:9989/offedu/visitEdu/usr/publish/images/common/ci.png");
+			//modelAndView.addObject("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId=FILE_000000000000463");
+			modelAndView.addObject("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+info.getPhtAtchFileId());			
+			
+			
+			modelAndView.addObject("data_d", "2023년05월28일");	        
+	        
+			/*
+			modelAndView.addObject("data_t", "기소유예이수증");
+			
+			modelAndView.addObject("data_1", vEACmpltCrtfcVO.getEduCmpltCrtfcNmbr());
+			modelAndView.addObject("data_2", vEACmpltCrtfcVO.getMberNm());
+			modelAndView.addObject("data_3", vEACmpltCrtfcVO.getBirthDay());
+			modelAndView.addObject("data_4", vEACmpltCrtfcVO.getPrcsDiv());
+			modelAndView.addObject("data_5", vEACmpltCrtfcVO.getPrcsNm());
+			modelAndView.addObject("data_6", vEACmpltCrtfcVO.getMberNm());
+			modelAndView.addObject("data_7", vEACmpltCrtfcVO.getEduStrtPnttm()+"~"+vEACmpltCrtfcVO.getEduDdlnPnttm());
+			
+			String s_rd	=	vEACmpltCrtfcVO.getRd();
+			s_rd	=	s_rd.substring(0,4)+"년"+s_rd.substring(4,6)+"년"+s_rd.substring(6,8);
+			System.out.println(s_rd);
+			System.out.println(s_rd);
+			
+			modelAndView.addObject("data_d", s_rd);
+			*/
+			
+			return modelAndView;
+			
+		}	
+}

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

@@ -28,7 +28,6 @@ import kcc.com.utl.user.service.CheckLoginUtil;
 import kcc.let.uat.uia.service.SsoLoginVO;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
 import kcc.ve.adv.tngr.stngInfo.service.VEACmpltCrtfcMixService;
-import kcc.ve.adv.tngr.stngInfo.service.VEACmpltCrtfcVO;
 import kcc.ve.aplct.adultVisitEdu.eduAplct.service.EduAplctAdultService;
 import kcc.ve.aplct.fndtnEnhanceTrn.service.FndtnEnhanceTrnService;
 import kcc.ve.cmm.VeConstants;
@@ -515,135 +514,6 @@ public class FndtnEnhanceTrnController {
 			
 		}	
 		
-		/**
-		 * 교육 list select
-		 * viewer.openFile('cmplt_crtfc_20231030.mrd'
-		 * , '/rf [http://192.168.0.59:3080/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do
-		 * ?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']');
-		 */
-		@RequestMapping("/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do")
-		public ModelAndView fndtnEduAplctCmpltCrtfcAjax(
-				@ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO
-				, ModelMap model
-				, HttpServletRequest request
-				) throws Exception {
-			
-			ModelAndView modelAndView = new ModelAndView();
-			modelAndView.setViewName("jsonView");
-			
-			System.out.println("----------------");
-			System.out.println(request.getParameter("prcsAplctPrdOrd"));
-			System.out.println(request.getParameter("eduAplctOrd"));
-			System.out.println("----------------");
-			
-			VEACmpltCrtfcVO	vEACmpltCrtfcVO	=	new VEACmpltCrtfcVO();
-			vEACmpltCrtfcVO.setPrcsAplctPrdOrd(request.getParameter("prcsAplctPrdOrd"));
-			vEACmpltCrtfcVO.setEduAplctOrd(request.getParameter("eduAplctOrd"));
-			
-			vEACmpltCrtfcVO	=	vEACmpltCrtfcMixService.selectDetail_CC_1(vEACmpltCrtfcVO);
-			
-			vEACmpltCrtfcVO.setMberNm(egovCryptoUtil.decrypt(vEACmpltCrtfcVO.getMberNm()));
-			
-			/*
-	    	modelAndView.addObject("data_t", "교육연수이수증X");
-			
-			modelAndView.addObject("data_1", "허은성");
-			modelAndView.addObject("data_2", "허은성");
-			modelAndView.addObject("data_3", "1986-08-02");
-			modelAndView.addObject("data_4", "직무연수");
-			modelAndView.addObject("data_5", "선율과 함꼐하는 저작권 여행");
-			modelAndView.addObject("data_6", "총15시간(1학점)");
-			modelAndView.addObject("data_7", "2023년5월15일~2023년05월26일");
-			
-			modelAndView.addObject("data_d", "2023년05월28일");
-			*/			
-			
-			modelAndView.addObject("data_t", "교육연수이수증");
-			
-			modelAndView.addObject("data_1", vEACmpltCrtfcVO.getEduCmpltCrtfcNmbr());
-			modelAndView.addObject("data_2", vEACmpltCrtfcVO.getMberNm());
-			modelAndView.addObject("data_3", vEACmpltCrtfcVO.getBirthDay());
-			modelAndView.addObject("data_4", vEACmpltCrtfcVO.getPrcsDiv());
-			modelAndView.addObject("data_5", vEACmpltCrtfcVO.getPrcsNm());
-			modelAndView.addObject("data_6", vEACmpltCrtfcVO.getMberNm());
-			modelAndView.addObject("data_7", vEACmpltCrtfcVO.getEduStrtPnttm()+"~"+vEACmpltCrtfcVO.getEduDdlnPnttm());
-			
-			String s_rd	=	vEACmpltCrtfcVO.getRd();
-			s_rd	=	s_rd.substring(0,4)+"년"+s_rd.substring(4,6)+"년"+s_rd.substring(6,8);
-			System.out.println(s_rd);
-			System.out.println(s_rd);
-			
-			modelAndView.addObject("data_d", s_rd);
-			
-			return modelAndView;
-			
-		}			
-	
-		
-		/**
-		 * 기소유예 이수증
-		 * viewer.openFile('cmplt_crtfc_20231030.mrd'
-		 * , '/rf [http://192.168.0.59:3080/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do
-		 * ?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']');
-		 */
-		@RequestMapping("/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctCmpltCrtfcAjax.do")
-		public ModelAndView sspnIdtmtEduAplctCmpltCrtfcAjax(
-				@ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO
-				, ModelMap model
-				, HttpServletRequest request
-				) throws Exception {
-			
-			ModelAndView modelAndView = new ModelAndView();
-			modelAndView.setViewName("jsonView");
-			
-			System.out.println("----------------");
-			System.out.println(request.getParameter("prcsAplctPrdOrd"));
-			System.out.println(request.getParameter("eduAplctOrd"));
-			System.out.println("----------------");
-			
-			VEACmpltCrtfcVO	vEACmpltCrtfcVO	=	new VEACmpltCrtfcVO();
-			vEACmpltCrtfcVO.setPrcsAplctPrdOrd(request.getParameter("prcsAplctPrdOrd"));
-			vEACmpltCrtfcVO.setEduAplctOrd(request.getParameter("eduAplctOrd"));
-			
-			vEACmpltCrtfcVO	=	vEACmpltCrtfcMixService.selectDetail_CC_1(vEACmpltCrtfcVO);
-			
-			vEACmpltCrtfcVO.setMberNm(egovCryptoUtil.decrypt(vEACmpltCrtfcVO.getMberNm()));
-			
-			/*
-	    	modelAndView.addObject("data_t", "교육연수이수증X");
-			
-			modelAndView.addObject("data_1", "허은성");
-			modelAndView.addObject("data_2", "허은성");
-			modelAndView.addObject("data_3", "1986-08-02");
-			modelAndView.addObject("data_4", "직무연수");
-			modelAndView.addObject("data_5", "선율과 함꼐하는 저작권 여행");
-			modelAndView.addObject("data_6", "총15시간(1학점)");
-			modelAndView.addObject("data_7", "2023년5월15일~2023년05월26일");
-			
-			modelAndView.addObject("data_d", "2023년05월28일");
-			*/			
-			
-			modelAndView.addObject("data_t", "기소유예이수증");
-			
-			modelAndView.addObject("data_1", vEACmpltCrtfcVO.getEduCmpltCrtfcNmbr());
-			modelAndView.addObject("data_2", vEACmpltCrtfcVO.getMberNm());
-			modelAndView.addObject("data_3", vEACmpltCrtfcVO.getBirthDay());
-			modelAndView.addObject("data_4", vEACmpltCrtfcVO.getPrcsDiv());
-			modelAndView.addObject("data_5", vEACmpltCrtfcVO.getPrcsNm());
-			modelAndView.addObject("data_6", vEACmpltCrtfcVO.getMberNm());
-			modelAndView.addObject("data_7", vEACmpltCrtfcVO.getEduStrtPnttm()+"~"+vEACmpltCrtfcVO.getEduDdlnPnttm());
-			
-			String s_rd	=	vEACmpltCrtfcVO.getRd();
-			s_rd	=	s_rd.substring(0,4)+"년"+s_rd.substring(4,6)+"년"+s_rd.substring(6,8);
-			System.out.println(s_rd);
-			System.out.println(s_rd);
-			
-			modelAndView.addObject("data_d", s_rd);
-			
-			return modelAndView;
-			
-		}	
-		
 		/**
 		 * 교육소개 임시페이지
 		 */

src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java

@@ -29,6 +29,8 @@ import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService;
 import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrAsgnmVO;
 import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrFeeAcmdtVO;
 import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrFeeService;
+import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiVO;
+import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService;
 import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailService;
 import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO;
 import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO;
@@ -80,6 +82,10 @@ public class VEAsgnmController {
 		@Resource(name="vEAsgnmNotiService")
 		private VEAsgnmNotiService vEAsgnmNotiService;
 	
+		//교육과정신청
+		@Resource(name = "vEEduMIXService")
+		private VEEduMIXService vEEduMIXService;
+		
 		//청소년강사 강의 요청 목록
 		@RequestMapping("/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.do")
 		public String instrAsgnmRqstList(
@@ -555,6 +561,19 @@ public class VEAsgnmController {
 				
 				System.out.println("+++++++++++++++++++++++++++1111111++++99999++");
 				
+				
+				//동반강사 리스트
+				VEEduChasiVO	vEEduChasiVO	=	new	VEEduChasiVO();
+				vEEduChasiVO.setEduAplctOrd(vEInstrAsgnmVO.getEduAplctOrd());
+				vEEduChasiVO.setEduChasiOrd(vEInstrAsgnmVO.getEduChasiOrd());
+				List<VEEduChasiVO> vEEduChasiCompanionVOList = vEEduMIXService.selectChasiCompanionList(vEEduChasiVO);
+				
+				vEEduChasiCompanionVOList	=	egovCryptoUtil.decryptVEEduChasiVOList(vEEduChasiCompanionVOList);
+				
+				model.addAttribute("vEEduChasiCompanionVOList", vEEduChasiCompanionVOList);
+				
+				
+				
 			}catch(Exception ex) {
 				ex.printStackTrace();
 			}

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

@@ -35,6 +35,9 @@ public interface VEEduMIXService {
 
 	List<VEEduChasiVO> selectChasiList(VEEduChasiVO vEEduChasiVO) throws Exception;
 	
+	//차시별 동반강사 리스트
+	List<VEEduChasiVO> selectChasiCompanionList(VEEduChasiVO vEEduChasiVO) throws Exception;	
+	
 	List<VEEduChasiVO> selectAdultChasiList(VEEduChasiVO vEEduChasiVO) throws Exception;
 	
 	VEEduChasiVO selectChasiInfo(VEEduChasiVO vEEduChasiVO) throws Exception;

src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java

@@ -93,6 +93,13 @@ public class VEEduMIXDAO extends EgovAbstractDAO {
 		return tlist;
 	}
 
+	//차시별 동반강사 리스트
+	public List<VEEduChasiVO> selectChasiCompanionList(VEEduChasiVO vEEduChasiVO) throws Exception {
+		@SuppressWarnings("unchecked")
+		List<VEEduChasiVO> tlist = (List<VEEduChasiVO>) list("VEEduMIXDAO.selectChasiCompanionList", vEEduChasiVO);
+		return tlist;
+	}
+	
 	public List<VEEduChasiVO> selectAdultChasiList(VEEduChasiVO vEEduChasiVO) throws Exception {
 		@SuppressWarnings("unchecked")
 		List<VEEduChasiVO> tlist = (List<VEEduChasiVO>) list("VEEduMIXDAO.selectAdultChasiList", vEEduChasiVO);

src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java

@@ -80,6 +80,11 @@ public class VEEduMIXServiceImpl implements VEEduMIXService {
 		return vEEduMIXDAO.selectChasiList(vEEduChasiVO);
 	}
 
+	@Override
+	public List<VEEduChasiVO> selectChasiCompanionList(VEEduChasiVO vEEduChasiVO) throws Exception {
+		return vEEduMIXDAO.selectChasiCompanionList(vEEduChasiVO);
+	}	
+	
 	@Override
 	public List<VEEduChasiVO> selectAdultChasiList(VEEduChasiVO vEEduChasiVO) throws Exception {
 		return vEEduMIXDAO.selectAdultChasiList(vEEduChasiVO);

src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java

@@ -162,6 +162,8 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable {
 	
 	private String sigMemo; // 특이사항 메모
 	
+	private String hopeEduFld; // 희망교육분야
+	
 	private String day5cnt;
 	private String day4cnt;
 	private String day3cnt;
@@ -853,5 +855,11 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable {
 	public void setDay0cnt(String day0cnt) {
 		this.day0cnt = day0cnt;
 	}
+	public String getHopeEduFld() {
+		return hopeEduFld;
+	}
+	public void setHopeEduFld(String hopeEduFld) {
+		this.hopeEduFld = hopeEduFld;
+	}
 	
 }

src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/web/InstrPrflController.java

@@ -739,7 +739,7 @@ public class InstrPrflController {
         
         //현재 요청중인 내역 조회 - 요청 중 항목이 있으면 수정 요청 버튼 막기
         vEInstrDetailVO.setFirstIndex(0);
-        vEInstrDetailVO.setSelectPagingListQuery("AND	a.aprvl_cd = '10'");
+        vEInstrDetailVO.setSelectPagingListQuery("	AND	a.aprvl_cd = '10'	AND	NVL(a.use_yn,'N') = 'N'	");
         List<VEInstrDetailVO> vEInstrMdfyRqstList = vEInstrDetailService.selectPagingList(vEInstrDetailVO);	        
         
         model.addAttribute("vEInstrMdfyRqstList", vEInstrMdfyRqstList);

src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java

@@ -1543,10 +1543,20 @@ public class OprtnInstrAdultPrflContoller {
 	        
 	        //요청 내용의 상세만 조회
 	        vEInstrDetailVO.setAprvlCd("10");
+	        vEInstrDetailVO.setSelectPagingListQuery("	AND NVL(a.use_yn,'N')='N'	AND	a.sbmt_yn='Y' ");
 	        VEInstrDetailVO vEInstrDetailVODetail = vEInstrMixService.selectMdfyRqstDetail(vEInstrDetailVO);
 	        vEInstrDetailVODetail	=	egovCryptoUtil.decryptVEInstrDetailVO(vEInstrDetailVODetail);
 			model.addAttribute("info", vEInstrDetailVODetail);
 
+			
+	        //현재 사용 내용의 상세만 조회
+	        vEInstrDetailVO.setAprvlCd(null);
+	        vEInstrDetailVO.setInstrMdfyOrd(null);
+	        vEInstrDetailVO.setSelectPagingListQuery("	AND NVL(a.use_yn,'N')='Y'	AND	a.sbmt_yn='Y' ");
+	        VEInstrDetailVO vEInstrDetailVODetail_ori = vEInstrMixService.selectMdfyRqstDetail(vEInstrDetailVO);
+	        vEInstrDetailVODetail_ori	=	egovCryptoUtil.decryptVEInstrDetailVO(vEInstrDetailVODetail_ori);
+			model.addAttribute("info_ori", vEInstrDetailVODetail_ori);
+			
 			/*if(StringUtils.isNotBlank(vEInstrDetailVODetail.getPhtAtchFileId())){
 				FileVO fileVO = new FileVO();
 				fileVO.setAtchFileId(vEInstrDetailVODetail.getPhtAtchFileId());

src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java

@@ -2214,10 +2214,21 @@ public class OprtnInstrTngrPrflContoller {
 	        
 	        //요청 내용의 상세만 조회
 	        vEInstrDetailVO.setAprvlCd("10");
+	        vEInstrDetailVO.setSelectPagingListQuery("	AND NVL(a.use_yn,'N')='N'	AND	a.sbmt_yn='Y' ");
 	        VEInstrDetailVO vEInstrDetailVODetail = vEInstrMixService.selectMdfyRqstDetail(vEInstrDetailVO);
 	        vEInstrDetailVODetail	=	egovCryptoUtil.decryptVEInstrDetailVO(vEInstrDetailVODetail);
 			model.addAttribute("info", vEInstrDetailVODetail);
 
+			
+	        //현재 사용 내용의 상세만 조회
+	        vEInstrDetailVO.setAprvlCd(null);
+	        vEInstrDetailVO.setInstrMdfyOrd(null);
+	        vEInstrDetailVO.setSelectPagingListQuery("	AND NVL(a.use_yn,'N')='Y'	AND	a.sbmt_yn='Y' ");
+	        VEInstrDetailVO vEInstrDetailVODetail_ori = vEInstrMixService.selectMdfyRqstDetail(vEInstrDetailVO);
+	        vEInstrDetailVODetail_ori	=	egovCryptoUtil.decryptVEInstrDetailVO(vEInstrDetailVODetail_ori);
+			model.addAttribute("info_ori", vEInstrDetailVODetail_ori);
+			
+			
 			/*if(StringUtils.isNotBlank(vEInstrDetailVODetail.getPhtAtchFileId())){
 				FileVO fileVO = new FileVO();
 				fileVO.setAtchFileId(vEInstrDetailVODetail.getPhtAtchFileId());

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

@@ -3410,6 +3410,50 @@
 		</isNotEqual>
 	</select>
 	
+	<!-- 청소년 차시별 동반강사 리스트 page -->
+	<select id="VEEduMIXDAO.selectChasiCompanionList" parameterClass="VEEduChasiVO" resultClass="VEEduChasiVO">
+        /*	VEEduMIXDAO.selectChasiCompanionList	*/
+		SELECT 
+			aa0.edu_hope_dt			AS	eduHopeDt
+			, bb0.schol_instt_nm	AS	scholInsttNm
+			, aa0.strt_tm			AS	strtTm
+			, aa0.end_tm			AS	endTm
+			, aa0.lrn_tm			AS	lrnTm
+			, aa0.trgt				AS	trgt
+			, bb0.edu_place			AS	eduPlace
+			, ee0.instr_nm			AS	instrNm
+			
+		FROM 
+			(	
+				SELECT b0.stndrd_schol_cd, a0.EDU_HOPE_DT 
+				FROM ve_edu_chasi a0
+					, ve_edu_aplct b0
+				WHERE 1=1
+				              AND	a0.edu_aplct_ord = #eduAplctOrd#
+				              AND	a0.edu_chasi_ord = #eduChasiOrd#
+				              AND	a0.EDU_APLCT_ORD =b0.EDU_APLCT_ORD 		
+			)cc0
+			, ve_edu_chasi aa0
+			, ve_edu_aplct bb0
+			, ve_edu_chasi_instr_asgnm dd0
+			, ve_instr_detail ee0
+		
+		WHERE 1=1
+		              AND aa0.EDU_APLCT_ORD =bb0.EDU_APLCT_ORD  
+		              AND cc0.stndrd_schol_cd=bb0.stndrd_schol_cd
+		              AND cc0.edu_hope_dt=aa0.edu_hope_dt
+		              
+		              AND aa0.EDU_APLCT_ORD =dd0.EDU_APLCT_ORD
+		              AND aa0.EDU_chasi_ORD =dd0.EDU_chasi_ORD
+		              
+		              AND dd0.asgnm_aprvl_cd='30'
+		              
+		              AND ee0.user_id=dd0.user_id
+		              AND ee0.sbmt_yn='Y'
+		              AND ee0.use_yn='Y'
+		ORDER BY strt_tm asc   
+	</select>	
+	
 	<!-- 차시별 강사배치 리스트 page -->
 	<select id="VEEduMIXDAO.selectAdultChasiList" parameterClass="VEEduChasiVO" resultClass="VEEduChasiVO">
 	/*	VEEduMIXDAO.selectAdultChasiList	*/

src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml

@@ -54,7 +54,9 @@
        		appt_dt,
        		hchk_dt,
        		rmrks,
-       		memo
+       		memo,
+       		sig_memo,
+       		hope_edu_fld
        	
 	</sql>
 	
@@ -131,7 +133,8 @@
        		a.hchk_dt			AS hchkDt,
        		a.rmrks				AS rmrks,
        		a.memo				AS memo,
-       		a.sig_memo			AS sigMemo
+       		a.sig_memo			AS sigMemo,
+       		a.hope_edu_fld		AS hopeEduFld
        		    	   	
 	</sql>
 	

src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml

@@ -1058,6 +1058,11 @@
 		   	<isNotEmpty property="instrMdfyOrd">
 		   		AND a.instr_detail_ord	=	#instrMdfyOrd#
 		   	</isNotEmpty>
+		   	
+			<isNotEmpty property="selectPagingListQuery">
+				$selectPagingListQuery$
+			</isNotEmpty>		   	
+		   	
 		LIMIT 1
 	</select>	
 	

src/main/webapp/WEB-INF/decorators.xml

@@ -44,6 +44,7 @@
 		<pattern>*/oprtn/cmm/rejectPopup.jsp</pattern>					<!-- 반려 팝업 -->
 		<pattern>*/oprtn/comm/popup/**</pattern>					<!-- 반려 팝업 -->
 		<pattern>*/ve/oprtn/instr/adultVisitEdu/popup/instrRsdnePopup.do</pattern>		<!-- 거주지 선택 팝업 -->
+		<pattern>*/ve/oprtn/instr/adultVisitEdu/instrInfo/instrMdfyRqstPopup.do</pattern>		<!-- 성인강사변경승인팝업 -->		
 	</decorator>
 	
 	<!-- 찾교 추가 관리자 -->

src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp

@@ -159,7 +159,7 @@ function getYears(getYear){
 	//수정요청 팝업
 	function fncRqstPopup() {
 		var pop = document.detailForm;
-		commonPopWindowopenForm("${pageContext.request.contextPath}/ve/oprtn/instr/adultVisitEdu/instrInfo/instrMdfyRqstPopup.do", "900", "700", "instrMdfyRqstPopup", $('#detailForm'));
+		commonPopWindowopenForm("${pageContext.request.contextPath}/ve/oprtn/instr/adultVisitEdu/instrInfo/instrMdfyRqstPopup.do", "1300", "700", "instrMdfyRqstPopup", $('#detailForm'));
 	}
 	
 	//강의설정 승인팝업

src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp

@@ -73,7 +73,7 @@
 			popupForm.userId.value = userId
 			popupForm.instrDiv.value = instrDiv
 			popupForm.action = "<c:url value='/ve/oprtn/instr/adultVisitEdu/instrInfo/instrMdfyRqstPopup.do'/>";
-			window.open("#", "_instrMdfyRqstPopup", "scrollbars = no, top=100px, left=100px, height=750px, width=950px");    
+			window.open("#", "_instrMdfyRqstPopup", "scrollbars = no, top=100px, left=100px, height=750px, width=1300px");    
 			popupForm.target = "_instrMdfyRqstPopup";
 			popupForm.submit();
 			
@@ -228,7 +228,7 @@
 									<c:out value="${list.instrNm}"/>
 								</td>
 								<td>
-									<ve:code codeId="VE0018" code="${list.divCd}"/>
+									<ve:code codeId="VE0018" code="${list.apptDiv}"/>
 									
 								</td>
 								<td>

src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrMdfyRqstPopup.jsp

@@ -117,6 +117,132 @@
 	<input type="hidden" name="rqstType" id="rqstType" value=""/> <!-- 요청유형 -->
 <!-- cont -->
 	<div class="area_popup">
+
+		<div class="cont_popup">
+			<table class="pop_tb_type02">
+				<colgroup>
+					<col style="width: 46%;">
+					<col style="width: 50px;">
+					<col style="width: 46%;">
+				</colgroup>
+				<tbody>
+					<tr>
+						<td>
+		<div class="cont_popup">
+			<table class="pop_tb_type02">
+				<colgroup>
+					<col style="width: 140px;">
+					<col style="width: auto;">
+					<col style="width: 140px;">
+					<col style="width: auto;">
+				</colgroup>
+				<tbody>
+					<tr>
+						<th scope="row">
+							<p>강사명</p>
+						</th>
+						<td colspan="3" style="position: relative;">
+							<c:out value='${info_ori.instrNm}' />
+							<div class="put_photo">
+								<div class="put_photo_in">
+									<div class="put_photo_box">
+										<c:if test="${empty info_ori.phtAtchFileId}">
+											<img src="/visitEdu/usr/publish/images/content/img_add.png" alt="이미지를 넣어주세요">
+										</c:if>
+										<c:if test="${not empty info_ori.phtAtchFileId}">
+											<img id="instrPhoto" alt="${info_ori.instrNm} 사진" src='<c:url value='/uss/ion/pwm/getImage.do'/>?atchFileId=<c:out value="${info.phtAtchFileId}"/>' />
+										</c:if>
+									</div>
+								</div>
+							</div>
+						</td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<p>연락처(핸드폰)</p>
+						</th>
+						<td class="input_phone" colspan="3"><c:out value='${info_ori.phone}' /></td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<p>e-mail</p>
+						</th>
+						<td colspan="3"><c:out value='${info_ori.email}' /></td>
+					</tr>
+					<tr class="input_adress">
+						<th scope="row">
+							<p>주소</p>
+						</th>
+						<td colspan="3">
+							우)<c:out value='${info_ori.post}' />&nbsp;<c:out value='${info_ori.addr}' />&nbsp;<c:out value='${info_ori.addrDetail}' />
+						</td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<p>거주지</p>
+						</th>
+						<td colspan="3"><c:out value='${info_ori.rsdne}' /></td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<p>생년월일</p>
+						</th>
+						<td colspan="3"><c:out value='${info_ori.dBirth}' /></td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<p>소속</p>
+						</th>
+						<td><c:out value='${info_ori.blng}' /></td>
+						<th scope="row">
+							<p>직위</p>
+						</th>
+						<td><c:out value='${info_ori.pstn}' /></td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<p>위촉년도</p>
+						</th>
+						<td><c:out value='${info_ori.apptYr}' /></td>
+						<th scope="row">
+							<p>구분</p>
+						</th>
+						<td><ve:code codeId="VE0018" code="${info_ori.apptDiv}"/></td>
+					</tr>
+					<%-- <tr>
+						<th scope="row">
+							<p>위촉구분</p>
+						</th>
+						<td colspan="3"><ve:code codeId="VE0002" code="${info.apptDiv}"/></td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<p>활동경력</p>
+						</th>
+						<td colspan="3"><c:out value='${info.actvtCarer}' /></td>
+					</tr> --%>
+					<tr>
+						<th scope="row">
+							<p>전문분야</p>
+						</th>
+						<td colspan="3"><c:out value='${info_ori.prfsnFld}' /></td>
+					</tr>
+					<%-- <tr>
+						<th scope="row">
+							<p>주요강의내용</p>
+						</th>
+						<td colspan="3"><c:out value='${info.mnLctrCn}' /></td>
+					</tr> --%>
+				</tbody>
+			</table>
+		</div>						
+						</td>
+						<td>
+						
+						기존>>>변경
+						
+						</td>
+						<td>
 		<div class="cont_popup">
 			<table class="pop_tb_type02">
 				<colgroup>
@@ -224,6 +350,10 @@
 					</tr> --%>
 				</tbody>
 			</table>
+		</div>						
+						</td>
+				</tbody>
+			</table>
 			<div class="btn_wrap_pop btn_layout01">
 				<div class="btn_left">
 				</div>
@@ -237,6 +367,7 @@
 				</div>
 			</div>
 		</div>
+	
 	</div>
 </form:form>
 <!-- //cont -->

src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp

@@ -179,7 +179,7 @@
 	//수정요청 팝업
 	function fncRqstPopup() {
 		var pop = document.detailForm;
-		commonPopWindowopenForm("${pageContext.request.contextPath}/ve/oprtn/instr/tngrVisitEdu/popup/instrInfo/instrMdfyRqstPopup.do", "900", "700", "instrMdfyRqstPopup", $('#detailForm'));
+		commonPopWindowopenForm("${pageContext.request.contextPath}/ve/oprtn/instr/tngrVisitEdu/popup/instrInfo/instrMdfyRqstPopup.do", "1300", "700", "instrMdfyRqstPopup", $('#detailForm'));
 	}
 	
 	function fncUpdate(){

src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngList.jsp

@@ -72,7 +72,7 @@
 			popupForm.instrDiv.value = instrDiv
 			popupForm.instrMdfyOrd.value = instrMdfyOrd ;
 			popupForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/popup/instrInfo/instrMdfyRqstPopup.do'/>";
-			window.open("#", "_instrMdfyRqstPopup", "scrollbars = no, top=100px, left=100px, height=750px, width=950px");    
+			window.open("#", "_instrMdfyRqstPopup", "scrollbars = no, top=100px, left=100px, height=750px, width=1300px");    
 			popupForm.target = "_instrMdfyRqstPopup";
 			popupForm.submit();
 			

src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrMdfyRqstPopup.jsp

@@ -107,6 +107,133 @@
 	<input type="hidden" name="rqstType" id="rqstType" value=""/> <!-- 요청유형 -->
 <!-- cont -->
 	<div class="area_popup">
+		
+		<div class="cont_popup">
+			<table class="pop_tb_type02">
+				<colgroup>
+					<col style="width: 46%;">
+					<col style="width: 50px;">
+					<col style="width: 46%;">					
+				</colgroup>
+				<tbody>
+					<tr>
+						<td>	
+						
+		<div class="cont_popup">
+			<table class="pop_tb_type02">
+				<colgroup>
+					<col style="width: 140px;">
+					<col style="width: auto;">
+					<col style="width: 140px;">
+					<col style="width: auto;">
+				</colgroup>
+				<tbody>
+					<tr>
+						<th scope="row">
+							<p>강사명</p>
+						</th>
+						<td colspan="3" style="position: relative;">
+							<c:out value='${info_ori.instrNm}' />
+							<div class="put_photo">
+								<div class="put_photo_in">
+									<div class="put_photo_box">
+										<c:if test="${empty info_ori.phtAtchFileId}">
+											<img src="/visitEdu/usr/publish/images/content/img_add.png" alt="이미지를 넣어주세요">
+										</c:if>
+										<c:if test="${not empty info_ori.phtAtchFileId}">
+											<img id="instrPhoto" alt="${info_ori.instrNm} 사진" src='<c:url value='/uss/ion/pwm/getImage.do'/>?atchFileId=<c:out value="${info_ori.phtAtchFileId}"/>' />
+										</c:if>
+									</div>
+								</div>
+							</div>
+						</td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<p>연락처(핸드폰)</p>
+						</th>
+						<td class="input_phone" colspan="3"><c:out value='${info_ori.phone}' /></td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<p>e-mail</p>
+						</th>
+						<td colspan="3"><c:out value='${info_ori.email}' /></td>
+					</tr>
+					<tr class="input_adress">
+						<th scope="row">
+							<p>주소</p>
+						</th>
+						<td colspan="3">
+							우)<c:out value='${info_ori.post}' />&nbsp;<c:out value='${info_ori.addr}' />&nbsp;<c:out value='${info_ori.addrDetail}' />
+						</td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<p>거주지</p>
+						</th>
+						<td colspan="3"><c:out value='${info_ori.rsdne}' /></td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<p>생년월일</p>
+						</th>
+						<td colspan="3"><c:out value='${info_ori.dBirth}' /></td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<p>최종학교</p>
+						</th>
+						<td><c:out value='${info_ori.finalSchol}' /></td>
+						<th scope="row">
+							<p>전공</p>
+						</th>
+						<td><c:out value='${info_ori.mjr}' /></td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<p>위촉년도</p>
+						</th>
+						<td><c:out value='${info_ori.apptYr}' /></td>
+						<th scope="row">
+							<p>구분</p>
+						</th>
+						<td><ve:code codeId="VE0018" code="${info_ori.divCd}"/></td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<p>위촉구분</p>
+						</th>
+						<td colspan="3"><ve:code codeId="VE0002" code="${info_ori.apptDiv}"/></td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<p>활동경력</p>
+						</th>
+						<td colspan="3">
+							<textarea name="actvtCarer" id="actvtCarer" readonly><c:out value='${info_ori.actvtCarer}'/></textarea>
+						</td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<p>주요강의내용</p>
+						</th>
+						<td colspan="3">
+							<textarea name="mnLctrCn" id="mnLctrCn" readonly><c:out value='${info_ori.mnLctrCn}'/></textarea>
+						</td>
+					</tr>
+				</tbody>
+			</table>
+		</div>						
+												
+						</td>
+						<td>
+						
+						기존>>>변경
+						
+						</td>
+						<td>	
+						
 		<div class="cont_popup">
 			<table class="pop_tb_type02">
 				<colgroup>
@@ -212,6 +339,12 @@
 					</tr>
 				</tbody>
 			</table>
+		</div>						
+												
+						</td>
+					</tr>					
+				</tbody>
+			</table>
 			<div class="btn_wrap_pop btn_layout01">
 				<div class="btn_left">
 				</div>
@@ -224,6 +357,8 @@
 				</div>
 			</div>
 		</div>		
+		
+		
 	</div>
 </form:form>
 <!-- //cont -->

src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp

@@ -102,6 +102,9 @@
 	}
 
 	function selectInstrInfo(instrId){
+
+		$('#p_instrId').val(instrId);		
+		
 		$.ajax({
 			type:"POST"
 			,url:"${pageContext.request.contextPath}/web/ve/aplct/adultVisitEdu/eduEnd/selectInstrInfo.do"
@@ -167,6 +170,7 @@
 		                        <th scope="row">
 		                            <p>강사명</p>
 		                        </th>
+		                        <input type="hidden" name="p_instrId" id="p_instrId" value=""/><!-- 강사ID -->
 		                        <td colspan="3" style="position: relative;">
 		                            <!-- <label for="instrNm" class="label">강사명</label> -->
 			                            <p id="info_instrNm">원영현</p>
@@ -327,6 +331,7 @@
 					<div class="btn_left">
 					</div>
 					<div class="btn_center">
+						<button type="button" class="btnType04" onclick="fncCmpltCrtfc();">출력</button>
 						<button type="button" class="btnType02 tooltip-close" data-focus="instrInfo_pop01_close" data-focus-next="instrInfo_pop01">닫기</button>
 					</div>
 					<div class="btn_right">
@@ -706,3 +711,44 @@
 		</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){
+ 	function fncCmpltCrtfc(){
+
+ 		var v_userId	=	$('#p_instrId').val();
+ 		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_instr_20231102.mrd', '/rf [http://192.168.0.59:3080/offedu/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetailAjax.do?p_instrId='+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>

src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp

@@ -710,6 +710,70 @@
 			</table>
 		</div>
 		</c:if>
+		
+		
+		<div class="tb_tit01">
+			<div class="tb_tit01_left">
+				<p>동반강사리스트</p>
+			</div>
+		</div>		
+				<div class="tb_list01">
+					<table>
+						<colgroup>
+							<col style="width: 10%;">
+							<col style="width: 18%;">
+							<col style="width: auto;">
+							<col style="width: 15%">
+							<col style="width: 15%;">
+							<col style="width: 15%;">
+							<col style="width: 15%;">
+						</colgroup>
+						<thead>
+							<tr>
+								<th scope="col">번호</th>
+								<th scope="col">교육일자</th>
+								<th scope="col">강사명</th>
+								<th scope="col">차시</th>
+								<th scope="col">학교(기관)명</th>
+								<th scope="col">교육장소</th>
+								<th scope="col">교육대상</th>
+							</tr>
+						</thead>
+						<tbody>
+						<c:forEach var="list" items="${vEEduChasiCompanionVOList}" varStatus="status">
+							<tr>
+								<td>
+									<c:out value='${status.count}'/>	
+								</td>
+								<td>
+										${list.eduHopeDt}
+								</td>
+								<td>
+										${list.instrNm}
+								</td>
+								<td>
+										<fmt:parseDate value="${list.strtTm}" var="strtTm" pattern="kkmm"/><fmt:formatDate value="${strtTm}" pattern="kk:mm"/>
+										~<fmt:parseDate value="${list.endTm}" var="endTm" pattern="kkmm"/><fmt:formatDate value="${endTm}" pattern="kk:mm"/>
+										(<c:out value='${list.lrnTm}'/>분)
+								</td>
+								<td>
+									<c:out value='${list.scholInsttNm}'/>
+								</td>
+								<td>
+									<c:out value='${list.eduPlace}'/>									
+								</td>
+								<td>
+									<c:out value='${list.trgt}'/>
+								</td>
+							</tr>					
+						</c:forEach>
+						<c:if test="${empty vEEduChasiCompanionVOList}">
+							<tr><td colspan="7"><spring:message code="common.nodata.msg" /></td></tr>
+						</c:if>
+						</tbody>
+					</table>
+				</div>		
+		
 		<div class="btn_wrap btn_layout01">
 			<div class="btn_left">
 			</div>