2023-11-08 11:57 성인 강사리스트 일괄 출력

2023-11-08 11:57:36 +09:00 · 2023-11-08 11:57:36 +09:00 · 5fa5d07322
commit 5fa5d07322
parent e25085b005
9 changed files with 448 additions and 10 deletions
--- a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java
+++ b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java
@ -1,8 +1,12 @@
 package kcc.ve.aplct.comweb;

+import java.util.List;
+
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;

+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
@ -11,12 +15,15 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;

+import kcc.com.cmm.ComDefaultVO;
+import kcc.com.cmm.util.StringUtil;
 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.instrInfo.service.VEInstrMixService;
 import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO;

 /**
@ -133,6 +140,9 @@ public class CrownixAjaxController {
 	@Resource(name = "vEACmpltCrtfcMixService")
 	private VEACmpltCrtfcMixService vEACmpltCrtfcMixService;
 	
+	//강사MIX 정보
+	@Resource(name="vEInstrMixService")
+	private VEInstrMixService vEInstrMixService;

 		/**
 		 * 교육 list select
@ -358,5 +368,174 @@ public class CrownixAjaxController {
 			
 			return modelAndView;
 			
-		}	
+		}
+		
+		/**
+		 * 성인강사들 출력 정보
+		 * 
+		 */
+		@RequestMapping("/ve/aplct/adultVisitEdu/eduAplct/instrDetailListAjax.do")
+		public ModelAndView instrDetailListAjax(
+				ModelMap model
+				, HttpServletRequest request
+				) throws Exception {
+			
+			ModelAndView modelAndView = new ModelAndView();
+			modelAndView.setViewName("jsonView");
+			
+			System.out.println("----------------");
+			System.out.println(request.getParameter("p_searchQlfctEndYn"));
+			System.out.println(request.getParameter("p_searcDivCd"));
+			System.out.println(request.getParameter("p_searchKeyword"));
+			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);
+			*/
+			
+			VEInstrDetailVO	vEInstrDetailVO	=	new	VEInstrDetailVO();
+			
+	    	//3. SelectPagingListQuery set 할 조건 설정
+	    	String selectCondition = new String();
+	    	//3.1 제출 완료 후 사용중인 데이터 조회
+	    	//selectCondition += "AND	a.sbmt_yn='Y' AND a.use_yn = 'Y'";
+	    	selectCondition += "AND	a0.sbmt_yn='Y' AND a0.use_yn = 'Y'";
+	    	//3.2 강사 테이블 성인강사여부 Y인것만 조회
+	    	//selectCondition += "AND	(b.adult_instr_yn ='Y' OR a.qlfct_end_yn = 'Y') ";
+	    	selectCondition += "AND	(b0.adult_instr_yn ='Y' OR a0.qlfct_end_yn = 'Y') ";
+	    	//3.3 이름 검색 시
+	    	if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchKeyword())){
+	    		//selectCondition += "AND	a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.getSearchKeyword() + "', '%')";
+	    		//이름 암호화 - comDefaultVO 검색단어 공통 암호화
+	    		ComDefaultVO comDefaultVO = new ComDefaultVO();
+	    		comDefaultVO.setSearchKeyword(vEInstrDetailVO.getSearchKeyword());
+	    		comDefaultVO = egovCryptoUtil.encryptComDefaultVO(comDefaultVO);
+	    		vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword());
+	    		//selectCondition += "AND	a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.getSearchKeyword() + "', '%')";
+	    		selectCondition += "AND	a0.instr_nm LIKE '%'||'" +vEInstrDetailVO.getSearchKeyword() + "'||'%'";
+	    		comDefaultVO = egovCryptoUtil.decryptComDefaultVO(comDefaultVO);
+	    		vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword());
+	    	}
+	    	vEInstrDetailVO.setInstrDiv("20");
+	    	vEInstrDetailVO.setSelectPagingListQuery(selectCondition);
+	    	
+	    	//대상 강사 리스트
+	    	List<VEInstrDetailVO> vEInstrDetailVOList = vEInstrMixService.selectPagingDetailList4Report(vEInstrDetailVO);
+	    	//복호화
+	    	vEInstrDetailVOList = egovCryptoUtil.decryptVEInstrDetailVOList(vEInstrDetailVOList);
+	    	
+	    	
+	    	JSONArray jsReqInfo = new JSONArray();		//신청인 정보
+	    	
+	    	for (int i=0;i<vEInstrDetailVOList.size();i++) {
+	    		JSONObject jsDrtInfo = new JSONObject();	//전체 정보
+	    		jsDrtInfo.put("data_1", vEInstrDetailVOList.get(i).getInstrNm());
+	    		jsDrtInfo.put("data_2", vEInstrDetailVOList.get(i).getPhone());
+	    		jsDrtInfo.put("data_3", vEInstrDetailVOList.get(i).getEmail());
+	    		jsDrtInfo.put("data_4", vEInstrDetailVOList.get(i).getAddr());
+	    		jsDrtInfo.put("data_5", vEInstrDetailVOList.get(i).getRsdne());
+	    		jsDrtInfo.put("data_6", vEInstrDetailVOList.get(i).getdBirth());
+	    		jsDrtInfo.put("data_7", vEInstrDetailVOList.get(i).getPrfsnFld());
+	    		//jsDrtInfo.put("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEInstrDetailVOList.get(i).getPhtAtchFileId());
+	    		jsDrtInfo.put("image", "http://192.168.0.59:3080/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEInstrDetailVOList.get(i).getPhtAtchFileId());
+	    		
+	    		
+	    		
+	    		/*
+				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());
+				*/		
+	    		
+	    		jsReqInfo.add(jsDrtInfo);
+	    		
+	    	}
+	    	
+	    	modelAndView.addObject("계약사항", jsReqInfo);
+	    	
+			return modelAndView;
+			
+		}
 }
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrMixService.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrMixService.java
@ -38,6 +38,9 @@ public interface VEInstrMixService {
 	//L page (강사디테일 믹스)
 	List<VEInstrDetailVO> selectPagingDetailList(VEInstrDetailVO vEInstrDetailVO) throws Exception;	

+	//L page (강사디테일 믹스)
+	List<VEInstrDetailVO> selectPagingDetailList4Report(VEInstrDetailVO vEInstrDetailVO) throws Exception;
+	
 	//L page (강사디테일 믹스)
 	List<VEInstrDetailVO> selectPagingDetailList4Asgnm(VEInstrDetailVO vEInstrDetailVO) throws Exception;

--- 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
@ -85,6 +85,11 @@ public class VEInstrMixDAO extends EgovAbstractDAO {
 		return tlist;
 	}
 	
+	public List<VEInstrDetailVO> selectPagingDetailList4Report(VEInstrDetailVO vEInstrDetailVO) throws Exception {
+		List<VEInstrDetailVO> tlist = (List<VEInstrDetailVO>) list("VEInstrMixDAO.selectPagingDetailList4Report", vEInstrDetailVO);
+		return tlist;
+	}
+	
 	public List<VEInstrDetailVO> selectPagingDetailList4Asgnm(VEInstrDetailVO vEInstrDetailVO) throws Exception {
 		List<VEInstrDetailVO> tlist = (List<VEInstrDetailVO>) list("VEInstrMixDAO.selectPagingDetailList4Asgnm", vEInstrDetailVO);
 		return tlist;
--- 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
@ -67,6 +67,11 @@ public class VEInstrMixServiceImpl implements VEInstrMixService {
 		return vEInstrMixDAO.selectPagingDetailList(vEInstrDetailVO);
 	}	

+	//paging List
+	public List<VEInstrDetailVO> selectPagingDetailList4Report(VEInstrDetailVO vEInstrDetailVO) throws Exception{
+		return vEInstrMixDAO.selectPagingDetailList4Report(vEInstrDetailVO);
+	}	
+	
 	//paging List
 	public List<VEInstrDetailVO> selectPagingDetailList4Asgnm(VEInstrDetailVO vEInstrDetailVO) throws Exception{
 		return vEInstrMixDAO.selectPagingDetailList4Asgnm(vEInstrDetailVO);
--- a/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java
+++ b/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java
@ -1033,7 +1033,8 @@ public class OprtnInstrAdultPrflContoller {
 	    		comDefaultVO.setSearchKeyword(vEInstrDetailVO.getSearchKeyword());
 	    		comDefaultVO = egovCryptoUtil.encryptComDefaultVO(comDefaultVO);
 	    		vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword());
-	    		selectCondition += "AND	a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.getSearchKeyword() + "', '%')";
+	    		//selectCondition += "AND	a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.getSearchKeyword() + "', '%')";
+	    		selectCondition += "AND	a0.instr_nm LIKE '%'||'" +vEInstrDetailVO.getSearchKeyword() + "'||'%'";
 	    		comDefaultVO = egovCryptoUtil.decryptComDefaultVO(comDefaultVO);
 	    		vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword());
 	    	}
--- 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
@ -733,7 +733,7 @@
 			AND a.div_cd = #searcDivCd#
 		</isNotEmpty>		
 		<isNotEmpty property="searchEduSlctAreaCd">
-			AND a.rsdne LIKE CONCAT('%',#rsdne#,'%')
+			AND a.rsdne LIKE '%'||#rsdne#||'%'
 		</isNotEmpty>		
 		<isNotEmpty property="instrDiv">
 			AND a.instr_div=#instrDiv#
@ -763,6 +763,167 @@
 					
 	</select>	
 	
+	<!-- 강사 디테일 정보 L page -->
+	<select id="VEInstrMixDAO.selectPagingDetailList4Report" parameterClass="VEInstrDetailVO" resultClass="VEInstrDetailVO">
+		/*	VEInstrMixDAO.selectPagingDetailList4Report	*/
+		SELECT
+			COUNT(1) OVER() AS totCnt ,
+			<include refid="VEInstrMixDAO.select_detail_column_name"/>,
+			<!-- useYN이 N인 수정요청 조회-->
+			(SELECT COUNT(1)
+	         FROM    ve_lctr_stng vls
+	         WHERE   a.instr_div  = vls.instr_div
+	         AND     a.user_id    = vls.user_id
+	         AND     vls.aprvl_cd = '10'
+	         AND     vls.use_yn   = 'N'
+	         ) AS stngCnt,
+			(SELECT	COUNT(1)			
+				FROM    <include refid="VEInstrMixDAO.detail_table_name"/> cc
+				WHERE   a.instr_div  = cc.instr_div
+				AND     a.user_id    = cc.user_id
+				AND     cc.aprvl_cd = '10'
+				AND		cc.use_yn = 'N'
+				AND		cc.instr_detail_ord > a.instr_detail_ord
+			) AS rqstCnt
+
+			, (SELECT
+					MAX(cc.instr_detail_ord) 
+
+				FROM    <include refid="VEInstrMixDAO.detail_table_name"/> cc
+				WHERE   a.instr_div  = cc.instr_div
+				AND     a.user_id    = cc.user_id
+				AND     cc.aprvl_cd = '10'
+				AND		cc.use_yn = 'N'
+				AND		cc.instr_detail_ord >a.instr_detail_ord
+			) AS instrMdfyOrd
+			
+			/*
+			, (SELECT f.one_depth_nm
+				FROM    ve_rsdnc f
+				WHERE   f.post_id = MAX(e.area_cd)
+				GROUP BY f.one_depth_nm
+			) AS lctrAreaNm
+			
+			, COUNT(e.area_cd)  AS lctrAreaCnt
+			*/
+			
+            , (	SELECT  f.one_depth_nm
+               	FROM     ve_rsdnc f
+               	WHERE    f.post_id = (
+							           SELECT MAX(ee.area_cd)
+							           FROM ve_lctr_area ee
+							           WHERE ee.instr_div    = d.instr_div
+							                    AND      ee.user_id      = d.user_id
+							                    AND      ee.lctr_stng_ord=d.lctr_stng_ord
+            						)
+            	GROUP BY f.one_depth_nm
+            )	AS lctrAreaNm
+            
+            , (
+            	SELECT count(1)
+            	FROM ve_lctr_area ee
+            	WHERE ee.instr_div    = d.instr_div
+                	AND      ee.user_id      = d.user_id
+                    AND      ee.lctr_stng_ord=d.lctr_stng_ord
+            )	AS lctrAreaCnt				
+			
+					
+			, CASE WHEN d.mon_lctr_yn = 'Y' THEN 1
+				ELSE 0
+			END AS monLctrYn
+			, CASE WHEN d.tue_lctr_yn = 'Y' THEN 1
+				ELSE 0
+			END AS tueLctrYn
+			, CASE WHEN d.wed_lctr_yn = 'Y' THEN 1
+				ELSE 0
+			END AS wedLctrYn
+			, CASE WHEN d.thu_lctr_yn = 'Y' THEN 1
+				ELSE 0
+			END AS thuLctrYn
+			, CASE WHEN d.fri_lctr_yn = 'Y' THEN 1
+				ELSE 0
+			END AS friLctrYn
+			, (SELECT  g.sbmt_pnttm
+				FROM     ve_instr_detail g
+					WHERE    g.user_id = a.user_id
+					AND g.instr_detail_ord = '1'
+					AND g.instr_div = a.instr_div
+			  )AS regSbmtPnttm
+			  
+		FROM   ( SELECT  COUNT(1) OVER()   AS totCnt ,
+		                a0.instr_div        AS instrDiv ,
+		                a0.user_id          AS userId ,
+		                a0.instr_detail_ord AS instrDetailOrd
+		       FROM     ve_instr b0 ,
+		                ve_instr_detail a0
+		       WHERE    1        =1
+		       /*
+		       AND      a0.user_id=b0.user_id
+		       AND      a0.sbmt_yn='Y'
+		       AND      a0.use_yn = 'Y'
+		       AND
+		                (
+		                         b0.tngr_instr_yn ='Y' OR a0.qlfct_end_yn = 'Y'
+		                )
+		       AND      a0.instr_div='10'
+		       */
+		       
+				<isNotEmpty property="selectPagingListQuery">
+					$selectPagingListQuery$
+				</isNotEmpty>		       
+		       
+		       GROUP BY a0.instr_div ,
+		                a0.user_id ,
+		                a0.instr_detail_ord
+		       ) a00
+			, <include refid="VEInstrMixDAO.detail_table_name"/> a
+			LEFT OUTER JOIN ve_lctr_stng d
+				ON (d.instr_div = a.instr_div
+					AND d.user_id = a.user_id
+					AND	d.use_yn='Y'
+					)
+		WHERE  1=1
+			AND		a00.instrDiv      =a.instr_div
+			AND     a00.userId        =a.user_id
+			AND     a00.instrDetailOrd=a.instr_detail_ord
+
+		
+		<isNotEmpty property="searchQlfctEndYn">
+			<isEqual property="searchQlfctEndYn" compareValue="Y">
+			AND a.qlfct_end_yn = #searchQlfctEndYn#
+			</isEqual>
+			<isEqual property="searchQlfctEndYn" compareValue="N">
+			AND (a.qlfct_end_yn = #searchQlfctEndYn# OR a.qlfct_end_yn IS NULL)
+			</isEqual>
+		</isNotEmpty>		
+		<isNotEmpty property="searcDivCd">
+			AND a.div_cd = #searcDivCd#
+		</isNotEmpty>		
+		<isNotEmpty property="searchEduSlctAreaCd">
+			AND a.rsdne LIKE '%'||#rsdne#||'%'
+		</isNotEmpty>		
+		<isNotEmpty property="instrDiv">
+			AND a.instr_div=#instrDiv#
+		</isNotEmpty>								
+					
+		<isNotEmpty property="searchStartDt">
+		<isNotEmpty property="searchEndDt">
+			HAVING TO_CHAR(regSbmtPnttm, 'YYYYMMDD') >= REPLACE(#searchStartDt#, '.', '')			
+			<![CDATA[ AND TO_CHAR(regSbmtPnttm, 'YYYYMMDD') <= REPLACE(#searchEndDt#, '.', '') ]]>
+		</isNotEmpty>			
+		</isNotEmpty>			
+		ORDER BY 1					
+			
+		<isEmpty property="orderByQuery">
+			, a.user_id desc
+		</isEmpty>
+		<isNotEmpty property="orderByQuery">
+			, $orderByQuery$
+		</isNotEmpty>
+		
+					
+	</select>		
+	
 	<!-- 강사 디테일 정보 L page -->
 	<select id="VEInstrMixDAO.selectPagingDetailList4Asgnm" parameterClass="VEInstrDetailVO" resultClass="VEInstrDetailVO">
 		/*	VEInstrMixDAO.selectPagingDetailList4Asgnm	*/
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctMngList.jsp
@ -70,6 +70,22 @@
 			listForm.submit();
 		}	

+		function fncReset(thisObj){
+			var targetObj = $(thisObj).closest('.list_top').find('select,input');
+			$.each(targetObj, function(){
+				if($(this).prop('tagName') == 'SELECT'){
+					if($(this).attr('name').indexOf('Month') != -1){
+						$(this).val(new Date().getMonth()+1);
+					}else if($(this).attr('name').indexOf('Year') != -1){
+						$(this).val(new Date().getFullYear());
+					}else{
+						$(this).prop("selectedIndex", 0);
+					}
+				}else{
+					$(this).val('');
+				}
+			});
+		}	
 	</script>
 	<title>강사신청 관리</title>
 </head>
@ -112,6 +128,7 @@
 							maxlength="20" onkeydown="if(event.keyCode==13) {linkPage('1');}"
 								>
 							<button type="button" class="btn_type08" onclick="fncGoList(); return false;">검색</button>
+							<button class="btn_type03" onclick="fncReset(this); return false;">초기화</button>
 						</div>
 					</div>
 					<div class="list_top_2">
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp
@ -819,6 +819,12 @@ function getYears(getYear){
 			
 			<div class="btn_wrap btn_layout01">
 				<div class="btn_left">
+					<c:if test="${info.qlfctEndYn eq 'Y'}">
+						<button type="button" class="btn_type02" onclick="fncSave('N'); return false;">강사위촉</button>
+					</c:if>
+					<c:if test="${info.qlfctEndYn ne 'Y'}">
+						<button type="button" class="btn_type02" onclick="fncSave('Y'); return false;">강사해촉</button>
+					</c:if>				
 				</div>
 				<div class="btn_center">
 					<%-- <button type="button" class="btn_type04" onclick="fncLctrSave();">
@ -827,12 +833,7 @@ function getYears(getYear){
 					</button> --%>
 				</div>
 				<div class="btn_right">
-					<%-- <c:if test="${info.qlfctEndYn eq 'Y'}">
-						<button type="button" class="btn_type02" onclick="fncSave('N'); return false;">강사위촉</button>
-					</c:if>
-					<c:if test="${info.qlfctEndYn ne 'Y'}">
-						<button type="button" class="btn_type02" onclick="fncSave('Y'); return false;">강사해촉</button>
-					</c:if> --%>
+
 					<button type="button" class="btn_type02" onclick="fncLctrModify(); return false;">정보저장</button>
 					<button type="button" class="btn_type03" onclick="fncGoList(); return false;">목록</button>
 					
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp
@ -44,10 +44,12 @@
 		function linkPage(pageNo){
 			var listForm = document.listForm ;
 			listForm.pageIndex.value = pageNo ;
+			/*
 			if(listForm.searchStartDt.value > listForm.searchEndDt.value){
 				alert("시작일은 종료일보다 작아야합니다.");
 				return;
 			}
+			*/
 			/* 
 			if($('#searchEduSlctAreaCd option:selected').text() != '전체'){
 				listForm.rsdne.value = $('#searchEduSlctAreaCd option:selected').text();
@ -166,6 +168,7 @@
 							<button class="btn_type03" onclick="fncReset(this); return false;">초기화</button>
 						</div>
 					</div>
+					<!-- 
 					<div class="list_top_3">
 						<div class="util_left">
 							<p>요청일</p>
@ -180,6 +183,7 @@
 							</div>
 						</div>
 					</div>
+					 -->
 				</div>
 				<!-- //list_top -->

@ -287,6 +291,17 @@
 				</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_type06" onclick="fncCmpltCrtfc(); return false;">강사일괄출력</button>
+					</div>
+				</div>

 				<!-- page -->
 				<div class="page">
@ -298,4 +313,55 @@
 	</div>
 	<!-- //cont -->

-</form:form>
+</form:form>
+
+<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_searchQlfctEndYn	=	$('#searchQlfctEndYn').val();
+ 		var v_searcDivCd		=	$('#searcDivCd').val();
+ 		var v_searchKeyword		=	$('#searchKeyword').val();
+
+ 		//alert('/rf [http://192.168.0.59:3080/offedu/ve/aplct/adultVisitEdu/eduAplct/instrDetailListAjax.do?p_searchQlfctEndYn="'+v_searchQlfctEndYn+'"&p_searcDivCd="'+v_searcDivCd+'"&p_searchKeyword="'+v_searchKeyword+'"]');
+ 		
+ 		
+ 		var viewer = new m2soft.crownix.Viewer('http://119.193.215.98:8093/ReportingServer/service');
+		//viewer.openFile('cmplt_crtfc_20231030.mrd', '/rfn [jsonsample_red_2.json]');
+		//viewer.openFile('cmplt_crtfc_20231030.mrd','/rexport [5]');
+		//viewer.openFile('sample.mrd','/rfn [sample.txt]');
+		viewer.hideToolbarItem(["save"]);
+		viewer.showToolbarItem(["print_pdf"]);
+		//viewer.openFile('cmplt_crtfc_20231030.mrd');
+		//viewer.openFile('cmplt_crtfc_20231030.mrd', '/rfn [cmplt_crtfc_20231030.json]');
+		//viewer.openFile('cmplt_crtfc_20231030.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']');
+		//viewer.openFile('sample.mrd');p_prcsAplctPrdOrd, p_eduAplctOrd
+		//viewer.openFile('adult_instr_20231102.mrd', '/rfn [adult_instr_20231102.json]');
+		//viewer.openFile('adult_instr_20231102.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetailAjax.do?p_instrId='+('#p_instrId').val()+']');
+		//viewer.openFile('adult_instrs_20231107.mrd', '/rf [http://192.168.0.59:3080/offedu/ve/aplct/adultVisitEdu/eduAplct/instrDetailListAjax.do?p_searchQlfctEndYn="'+v_searchQlfctEndYn+'"&p_searcDivCd="'+v_searcDivCd+'"&p_searchKeyword="'+v_searchKeyword+'"]');
+		//viewer.openFile('adult_instrs_20231107.mrd', '/rf [http://192.168.0.59:3080/offedu/ve/aplct/adultVisitEdu/eduAplct/instrDetailListAjax.do?p_searchQlfctEndYn='+v_searchQlfctEndYn+'&p_searcDivCd='+v_searcDivCd+'&p_searchKeyword='+v_searchKeyword+']');
+		viewer.openFile('adult_instrs_20231107.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/adultVisitEdu/eduAplct/instrDetailListAjax.do?p_searchQlfctEndYn='+v_searchQlfctEndYn+'&p_searcDivCd='+v_searcDivCd+'&p_searchKeyword='+v_searchKeyword+']');
+
+		//System.out.println(request.getParameter("searchQlfctEndYn"));
+		//System.out.println(request.getParameter("searcDivCd"));
+		//System.out.println(request.getParameter("searchKeyword"));
+		
+		
+		/*
+		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>