강사선택출력 xml 수정

2023-12-26 18:13:40 +09:00 · 2023-12-26 18:13:40 +09:00 · 377f58b56b
commit 377f58b56b
parent 11aa1ed604 f3142d00ce
34 changed files with 1216 additions and 282 deletions
--- a/src/main/java/kcc/let/my/web/MyPageController.java
+++ b/src/main/java/kcc/let/my/web/MyPageController.java
@ -133,6 +133,10 @@ public class MyPageController {
 												)
 											);
 			
+			 System.out.println(tngrMap);
+			 System.out.println(tngrMap);
+			 
+			 
 			model.addAttribute("tngrMap", tngrMap);
 			model.addAttribute("tngrList", tngrList);
 		}
--- a/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java
+++ b/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java
@ -110,7 +110,7 @@ public class NotifyManageServiceImpl extends EgovAbstractServiceImpl implements
 		notifyManageVO.setNotifyPath(notifyPath);
 		notifyManageVO.setNotifyChk("N");
 		notifyManageVO.setEduAplctOrd(eduAplctOrd); 
-		notifyManageVO.setEduChasiOrd(eduChasiOrdList.toString());
+		notifyManageVO.setEduChasiOrd(eduChasiOrdList.get(0).toString());
 		notifyManageVO.setFrstRegisterId(loginVO.getUniqId());
 		for(NotifyManageVO vo : notifyManageListVO) {
 			notifyManageVO.setToUserId(vo.getMngUserId());
--- a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduAplct/service/impl/EduAplctAdultServiceImpl.java
+++ b/src/main/java/kcc/ve/aplct/adultVisitEdu/eduAplct/service/impl/EduAplctAdultServiceImpl.java
@ -155,8 +155,12 @@ public class EduAplctAdultServiceImpl implements EduAplctAdultService {
            vEEduChasiVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]",""));
            vEEduChasiVO.setEndTm(s_endTm[i].replaceAll("[^0-9]",""));
            vEEduChasiVO.setLrnTm(s_lrnTm[i]);
+            if(s_trgt != null && !s_trgt[i].isEmpty()) {
            	vEEduChasiVO.setTrgt(s_trgt[i]);
+            }
+        	if(s_prsnl != null && !s_prsnl[i].isEmpty()) {	
            	vEEduChasiVO.setPrsnl(s_prsnl[i]);
+            }
            vVEEduChasiService.insert(vEEduChasiVO);
            
            // 알림을 위한 LIST
@ -243,8 +247,12 @@ public class EduAplctAdultServiceImpl implements EduAplctAdultService {
            vEEduChasiVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]",""));
            vEEduChasiVO.setEndTm(s_endTm[i].replaceAll("[^0-9]",""));
            vEEduChasiVO.setLrnTm(s_lrnTm[i]);
+            if(s_trgt != null && !s_trgt[i].isEmpty()) {
            	vEEduChasiVO.setTrgt(s_trgt[i]);
+            }
+            if(s_prsnl != null && !s_prsnl[i].isEmpty()) {
            	vEEduChasiVO.setPrsnl(s_prsnl[i]);
+            }
            vVEEduChasiService.insert(vEEduChasiVO);
        }
        return true;
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java
@ -442,6 +442,9 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable {
 	public String lctrEndH;		
 	public String lctrEndM;
 	
+	public String eduMdCd;			//교육매체 코드
+	public String feeInsttCd;		//강사료지급기관코드
+	
 	
 	public String getSpecialWorkAllow() {
 		return specialWorkAllow;
@ -1944,6 +1947,18 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable {
 	public void setLctrEndM(String lctrEndM) {
 		this.lctrEndM = lctrEndM;
 	}
+	public String getEduMdCd() {
+		return eduMdCd;
+	}
+	public void setEduMdCd(String eduMdCd) {
+		this.eduMdCd = eduMdCd;
+	}
+	public String getFeeInsttCd() {
+		return feeInsttCd;
+	}
+	public void setFeeInsttCd(String feeInsttCd) {
+		this.feeInsttCd = feeInsttCd;
+	}
 	
 	
 }
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java
@ -134,6 +134,7 @@ public class VEEduChasiVO extends ComDefaultVO implements Serializable {
 	
 	private String prcsAplctPrdOrd;	//기간과정신청정보
 	
+	private String	eduTrgt;				//대상
 	
 	
 	public String getQustnrQesitmId10Cnt() {
@ -708,5 +709,11 @@ public class VEEduChasiVO extends ComDefaultVO implements Serializable {
 	public void setPrcsAplctPrdOrd(String prcsAplctPrdOrd) {
 		this.prcsAplctPrdOrd = prcsAplctPrdOrd;
 	}
+	public String getEduTrgt() {
+		return eduTrgt;
+	}
+	public void setEduTrgt(String eduTrgt) {
+		this.eduTrgt = eduTrgt;
+	}
 	
 }
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryService.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryService.java
@ -8,6 +8,8 @@ public interface VEInstrDetailActvtHstryService {

 	List<VEInstrDetailActvtHstryVO> selectPagingList(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO);
 	
+	List<VEInstrDetailActvtHstryVO> selectSignPagingList(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO);
+
 	VEInstrDetailActvtHstryVO findById(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO);

 	void updateStateCd(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO);
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryDAO.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryDAO.java
@ -5,9 +5,7 @@ import java.util.List;
 import org.springframework.stereotype.Repository;

 import egovframework.rte.psl.dataaccess.EgovAbstractDAO;
-import kcc.kccadr.accdnt.acd.service.AdjstChangeDateVO;
 import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailActvtHstryVO;
-import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO;

@Repository("vEInstrDetailActvtHstryDAO")
 public class VEInstrDetailActvtHstryDAO extends EgovAbstractDAO {
@ -24,6 +22,10 @@ public class VEInstrDetailActvtHstryDAO extends EgovAbstractDAO {
 		return (List<VEInstrDetailActvtHstryVO>) list("VEInstrDetailActvtHstryDAO.selectPagingList", vEInstrDetailActvtHstryVO);
 	}

+	public List<VEInstrDetailActvtHstryVO> selectSignPagingList(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) {
+		return (List<VEInstrDetailActvtHstryVO>) list("VEInstrDetailActvtHstryDAO.selectSignPagingList", vEInstrDetailActvtHstryVO);
+	}
+	
 	public VEInstrDetailActvtHstryVO findById(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) {
 		return (VEInstrDetailActvtHstryVO) select("VEInstrDetailActvtHstryDAO.findById", vEInstrDetailActvtHstryVO);
 		// TODO Auto-generated method stub
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryServiceImpl.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryServiceImpl.java
@ -29,6 +29,10 @@ public class VEInstrDetailActvtHstryServiceImpl implements VEInstrDetailActvtHst
 		return vEInstrDetailActvtHstryDAO.selectPagingList(vEInstrDetailActvtHstryVO);
 	}

+	@Override
+	public List<VEInstrDetailActvtHstryVO> selectSignPagingList(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) {
+		return vEInstrDetailActvtHstryDAO.selectSignPagingList(vEInstrDetailActvtHstryVO);
+	}

 	@Override
 	public VEInstrDetailActvtHstryVO findById(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) {
--- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/service/impl/EduAplctMngAdultServiceImpl.java
+++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/service/impl/EduAplctMngAdultServiceImpl.java
@ -147,8 +147,12 @@ public class EduAplctMngAdultServiceImpl implements EduAplctMngAdultService {
            vEEduChasiVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]",""));
            vEEduChasiVO.setEndTm(s_endTm[i].replaceAll("[^0-9]",""));
            vEEduChasiVO.setLrnTm(s_lrnTm[i]);
+            if(s_trgt != null && !s_trgt[i].isEmpty()) {
            	vEEduChasiVO.setTrgt(s_trgt[i]);
+            }
+        	if(s_prsnl != null && !s_prsnl[i].isEmpty()) {	
            	vEEduChasiVO.setPrsnl(s_prsnl[i]);
+            }
            vVEEduChasiService.insert(vEEduChasiVO);
        }
        return true;
@ -232,8 +236,12 @@ public class EduAplctMngAdultServiceImpl implements EduAplctMngAdultService {
            vEEduChasiVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]",""));
            vEEduChasiVO.setEndTm(s_endTm[i].replaceAll("[^0-9]",""));
            vEEduChasiVO.setLrnTm(s_lrnTm[i]);
+            if(s_trgt != null && !s_trgt[i].isEmpty()) {
            	vEEduChasiVO.setTrgt(s_trgt[i]);
+            }
+        	if(s_prsnl != null && !s_prsnl[i].isEmpty()) {	
            	vEEduChasiVO.setPrsnl(s_prsnl[i]);
+            }
            //vVEEduChasiService.insert(vEEduChasiVO);
            vVEEduChasiService.update(vEEduChasiVO);
        }
--- a/src/main/java/kcc/ve/oprtn/comweb/CommonManageController.java
+++ b/src/main/java/kcc/ve/oprtn/comweb/CommonManageController.java
@ -0,0 +1,181 @@
+package kcc.ve.oprtn.comweb;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+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 egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
+import kcc.com.utl.user.service.CheckLoginUtil;
+import kcc.let.utl.fcc.service.EgovCryptoUtil;
+import kcc.ve.cmm.VeConstants;
+import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailActvtHstryService;
+import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailActvtHstryVO;
+
+@Controller
+//@RequestMapping("/kccadr/oprtn/comm")
+public class CommonManageController {
+
+	/*
+    @Resource(name = "scholInfoService")
+    private ScholInfoService scholInfoService;
+    
+    @Resource(name = "scholInfoMIXService")
+    private ScholInfoMIXService scholInfoMIXService;
+
+    @Resource(name = "vEEduAplctService")
+    private VEEduAplctService vEEduAplctService;
+
+    @Resource(name = "vEPrcsOnlnCntntService")
+    private VEPrcsOnlnCntntService vEPrcsOnlnCntntService;
+    
+    //로그인 체크 util
+  	@Resource(name = "checkLoginUtil")
+  	private CheckLoginUtil checkLoginUtil;
+  	
+	//snd_hstry id gen
+	@Resource(name = "sndGnrService")
+    private EgovIdGnrService sndGnrService;
+	
+	// 교육신청발송이력
+	@Resource(name = "vEEduAplctSndHstryService")
+	private VEEduAplctSndHstryService vEEduAplctSndHstryService;
+
+	
+	//회원조회
+	@Resource(name = "userManageService")
+	private EgovUserManageService userManageService;
+	
+
+	//강의 회차 정보
+	@Resource(name = "vEAStngService")
+	private VEAStngService vEAStngService;
+
+
+	@Resource(name = "NotifyManageService")
+	private NotifyManageService notifyManageService;
+	*/
+	
+	//로그인 체크 util
+	@Resource(name = "checkLoginUtil")
+	private CheckLoginUtil checkLoginUtil;
+	
+	//암복호화 유틸
+	@Resource(name = "egovCryptoUtil")
+	EgovCryptoUtil egovCryptoUtil;
+	
+	// 첨부파일 정보
+	@Resource(name="vEInstrDetailActvtHstryService")
+	private VEInstrDetailActvtHstryService vEInstrDetailActvtHstryService;
+	
+	/** 
+	 * @methodName	: instrActvtHstryMngList 
+	 * @author		: 이호영
+	 * @date		: 2023.11.16 
+	 * @description	: 강사활동확인서신청관리 목록
+	 * @param vEInstrDetailActvtHstryVO
+	 * @param model
+	 * @param request
+	 * @return
+	 * @throws Exception 
+	 */
+	@RequestMapping("/kccadr/oprtn/cmm/instrActvtHstrySignMngList.do")
+	public String instrActvtHstrySignMngList(
+			@ModelAttribute("vEInstrActvtHstryVO") VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO
+			, ModelMap model
+			, HttpServletRequest request
+			) throws Exception {
+
+		//로그인 처리====================================
+		//로그인 정보 가져오기		
+	    //LoginVO loginVO = checkLoginUtil.getAuthLoginVO();				//권한에 따른 로그인 정보 가져오기
+        //SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request);	//SSO 로그인 정보 가져오기
+        
+//        if (loginVO == null || ssoLoginVO == null) {
+//        	return checkLoginUtil.getUserLoginPage(model);	//로그인 정보가 없으면 로그인 페이지로 이동한다.
+//        }
+		//로그인 처리==================================== 
+		vEInstrDetailActvtHstryVO.setInstrDiv(VeConstants.LCTR_DIV_CD_10); //청소년
+		
+    	//1.pageing step1
+    	PaginationInfo paginationInfo = this.setPagingStep1(vEInstrDetailActvtHstryVO);
+    	//2. pageing step2
+    	vEInstrDetailActvtHstryVO = this.setPagingStep2(vEInstrDetailActvtHstryVO, paginationInfo);
+    	vEInstrDetailActvtHstryVO.setSearchKeyword(egovCryptoUtil.encrypt(vEInstrDetailActvtHstryVO.getSearchKeyword()));
+    	List<VEInstrDetailActvtHstryVO> vEInstrDetailActvtHstryVOList = vEInstrDetailActvtHstryService.selectSignPagingList(vEInstrDetailActvtHstryVO);
+    	
+    	vEInstrDetailActvtHstryVOList.stream().forEach(t-> t.setInstrNm(egovCryptoUtil.decrypt(t.getInstrNm())));
+    	
+    	//3.pageing step3
+    	paginationInfo = this.setPagingStep3(vEInstrDetailActvtHstryVOList, paginationInfo);
+    	model.addAttribute("paginationInfo", paginationInfo);
+    	
+    	// 검색어 복호화
+    	vEInstrDetailActvtHstryVO.setSearchKeyword(egovCryptoUtil.decrypt(vEInstrDetailActvtHstryVO.getSearchKeyword()));
+    	//대상 리스트, 페이징 정보 전달
+    	model.addAttribute("list", vEInstrDetailActvtHstryVOList);
+    	 
+    	
+    	
+		return "oprtn/cmm/instrActvtHstrySignMngList";
+	}
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    //
+    //
+    //	private function
+    //
+    //
+	    
+    //페이징을 위한 처리 step1 - 페이징 기본 정보 설정
+    private PaginationInfo setPagingStep1(
+    		VEInstrDetailActvtHstryVO p_vEEduAplctVO
+    		)throws Exception{
+    	// pageing step1
+    	PaginationInfo paginationInfo = new PaginationInfo();
+    	paginationInfo.setCurrentPageNo(p_vEEduAplctVO.getPageIndex());
+    	paginationInfo.setRecordCountPerPage(p_vEEduAplctVO.getPageUnit());
+    	paginationInfo.setPageSize(p_vEEduAplctVO.getPageSize());
+    	
+    	return paginationInfo;
+    }
+
+    
+    //페이징을 위한 처리 step2 - 게시물 리스트 수량 설정 및 검색 조건 초기화
+    private VEInstrDetailActvtHstryVO setPagingStep2(
+    		VEInstrDetailActvtHstryVO p_vEEduAplctVO
+    		, PaginationInfo p_paginationInfo
+    		)throws Exception{
+    	// pageing step2
+    	p_vEEduAplctVO.setFirstIndex(p_paginationInfo.getFirstRecordIndex());
+    	p_vEEduAplctVO.setLastIndex(p_paginationInfo.getLastRecordIndex());
+    	p_vEEduAplctVO.setRecordCountPerPage(p_paginationInfo.getRecordCountPerPage());
+    	
+    	if("".equals(p_vEEduAplctVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
+    		p_vEEduAplctVO.setSearchSortCnd("prcs_ord");
+    		p_vEEduAplctVO.setSearchSortOrd("desc");
+    	}
+    	
+    	return p_vEEduAplctVO;    	
+    }
+    
+    
+    //페이징을 위한 처리 step3 - 전체 게시물 수량 설정하기
+    private PaginationInfo setPagingStep3(
+    		List<VEInstrDetailActvtHstryVO> p_vEEduAplctVOList
+    		 
+    		, PaginationInfo p_paginationInfo    		
+    		)throws Exception{
+    	// pageing step3
+    	int totCnt = 0;
+    	if(p_vEEduAplctVOList.size() > 0) totCnt = p_vEEduAplctVOList.get(0).getTotCnt();
+    	p_paginationInfo.setTotalRecordCount(totCnt);
+    	
+    	return p_paginationInfo;
+    }
+}
--- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml
@ -91,6 +91,9 @@
 		
 		, RNDS_ORD
 		, APLCT_CN
+		
+		, EDU_MD_CD
+		, FEE_INSTT_CD
 	</sql>
 	
 	<!-- 조회용 공통 컬럼 명 -->
@ -161,6 +164,8 @@
 		, A.RNDS_ORD						AS	rndsOrd
 		, A.APLCT_CN						AS	aplctCn
 		, A.RSLT_ATCH_FILE_ID				AS	rsltAtchFileId
+		, A.EDU_MD_CD						AS eduMdCd
+		, A.FEE_INSTT_CD					AS feeInsttCd
 	</sql>
 	
 	<!-- 강사 등록 C -->
@ -250,6 +255,8 @@
 			, #rndsOrd#
 			, #aplctCn#
 			
+			, #eduMdCd#
+			, #feeInsttCd#
 		)
 	</insert>
 	
@ -1007,6 +1014,12 @@
 		<isNotEmpty property="rndsOrd">
 		, RNDS_ORD	= #rndsOrd#
 		</isNotEmpty>
+		<isNotEmpty property="feeInsttCd">
+		, FEE_INSTT_CD	= #feeInsttCd#
+		</isNotEmpty>
+		<isNotEmpty property="eduMdCd">
+		, EDU_MD_CD	= #eduMdCd#
+		</isNotEmpty>
 		<!-- <isNotEmpty property="aplctCn"> -->
 		, APLCT_CN	= #aplctCn#
 		<!-- </isNotEmpty> -->
--- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
@ -2361,6 +2361,7 @@
 				a.chrg_nm                             AS chrgNm ,
 				a.schol_div_cd                        AS scholDivCd ,
 				a.stndrd_schol_cd                     AS stndrdScholCd ,
+				a.edu_trgt                            AS eduTrgt ,
 				a.clphone                             AS clphone ,
 				a.email                               AS email ,
 				b.edu_chasi_ord                       AS eduChasiOrd ,
@ -3858,6 +3859,7 @@
 		, G.aprvl_cd                                  AS acmdtAprvlCd
 		, H.oneway_dstnc                              AS onewayDstnc
 		, A.rslt_atch_file_id                         AS rsltAtchFileId
+		, A.edu_trgt                                  AS eduTrgt
 	FROM
 		VE_EDU_APLCT A
 		, VE_EDU_CHASI B
--- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml
@ -126,6 +126,40 @@

 	</select>
 	
+	<select id="VEInstrDetailActvtHstryDAO.selectSignPagingList" parameterClass="VEInstrDetailActvtHstryVO" resultClass="VEInstrDetailActvtHstryVO">
+	/* VEInstrDetailActvtHstryDAO.selectSignPagingList */
+		SELECT 										   
+			COUNT(1) OVER() AS totCnt ,
+			TO_CHAR(a.state_pnttm, 'YYYY') ||'-'||a.docu_nmbr||'호' AS docuNmbrDp ,
+			b.INSTR_NM AS instrNm ,
+			<include refid="VEInstrDetailActvtHstryDAO.select_column_name"/>
+		FROM 
+			<include refid="VEInstrDetailActvtHstryDAO.table_name"/> a
+		JOIN ve_instr_detail b
+		ON a.user_id = b.user_id
+		AND a.instr_detail_ord = b.instr_detail_ord
+		 
+		WHERE
+			1=1		
+			AND a.docu_nmbr IS not null
+		<isNotEmpty prepend="AND" property="searchKeyword">
+			b.INSTR_NM	=	#searchKeyword#
+		</isNotEmpty>
+		<isNotEmpty prepend="AND" property="searchSelStatus">
+			a.state_cd	=	#searchSelStatus#
+		</isNotEmpty>
+		
+		<isNotEmpty prepend="AND" property="searchStartDt">
+			TO_CHAR(a.aplct_pnttm,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#searchStartDt#, '.' , '')
+		</isNotEmpty>
+		<isNotEmpty prepend="AND" property="searchEndDt">
+			TO_CHAR(a.aplct_pnttm,'YYYYMMDD')<![CDATA[ <= ]]> REPLACE(#searchEndDt#, '.' , '')
+		</isNotEmpty>
+		
+		OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;		
+
+	</select>
+		
 	<select id="VEInstrDetailActvtHstryDAO.findById" parameterClass="VEInstrDetailActvtHstryVO" resultClass="VEInstrDetailActvtHstryVO">
 	/*VEInstrDetailActvtHstryDAO.findById */
 		SELECT 						
--- 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
@ -945,7 +945,7 @@
 	
 	<!-- 강사 디테일 정보 L page -->
 	<select id="VEInstrMixDAO.selectWhereInDetailReport" parameterClass="VEInstrDetailVO" resultClass="VEInstrDetailVO">
-		/*	VEInstrMixDAO.selectPagingDetailList4Report	*/
+		/*	VEInstrMixDAO.selectWhereInDetailReport	*/
 		SELECT
 			COUNT(1) OVER() AS totCnt ,
 			<include refid="VEInstrMixDAO.select_detail_column_name"/>,
@ -1066,7 +1066,7 @@
 			AND		a00.instrDiv      =a.instr_div
 			AND     a00.userId        =a.user_id
 			AND     a00.instrDetailOrd=a.instr_detail_ord
-			AND
+			AND userId IN
 		  <iterate property="userIdList" open="(" close=")" conjunction=",">
 		     #userIdList[]#
 		  </iterate>
--- a/src/main/webapp/WEB-INF/decorators.xml
+++ b/src/main/webapp/WEB-INF/decorators.xml
@ -52,6 +52,8 @@
 	
 	<!-- 찾교 추가 관리자 -->
 	<decorator name="adminVelayout" page="/WEB-INF/jsp/layout/adminVeLayout.jsp">
+		<pattern>*/oprtn/cmm/*</pattern>					<!-- 공통 화면 -->
+		
 		<pattern>*/oprtn/tngrVisitEdu/*</pattern>			<!-- 청소년 교육 화면 -->
 		<pattern>*/oprtn/instr/tngrVisitEdu/*</pattern>		<!-- 청소년 교육 강사 화면 -->
 		
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctCnfrmMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctCnfrmMngDetail.jsp
@ -123,7 +123,12 @@
 										<p>교육매체</p>
 									</th>
 									<td colspan="3">
+										<c:if test="${info.eduMdCd eq '99' }">
 											<c:out value="${info.eduMd}"/>
+										</c:if>
+										<c:if test="${info.eduMdCd ne '99' }">
+											<ve:code codeId="VEA015" code="${info.eduMdCd}"/>
+										</c:if>
 									</td>
 								</tr>
 							</c:when>
@ -170,6 +175,18 @@
 							</th>
 							<td colspan="3">${info.email}</td>
 						</tr>
+						<tr>
+							<th scope="row">
+								<p>교육대상</p>
+							</th>
+							<td colspan="3">${info.eduTrgt}</td>
+						</tr>
+						<tr>
+							<th scope="row">
+								<p>교육인원</p>
+							</th>
+							<td colspan="3">${info.eduPrsnl}</td>
+						</tr>
 						<tr>
 							<th scope="row">
 								<p>신청내용</p>
@ -196,6 +213,12 @@
 							</th>
 							<td colspan="3"><p><c:out value='${fn:replace(info.rqstCn, replaceChar, "<br/>")}' escapeXml="false" /></p></td>
 						</tr>
+						<tr>
+							<th scope="row">
+								<p>강의료지급기관</p>
+							</th>
+							<td colspan="3"><ve:code codeId="VEA016" code="${info.feeInsttCd}"/></td>
+						</tr>
 						<tr>
 							<th scope="row">
 								<p>신청상태</p>
@ -260,19 +283,19 @@
 				<div class="tb_type01 list2">
 					<table>
 						<colgroup>
-							<col style="width: 20%;">
 							<col style="width: 20%;">
 							<col style="width: auto;">
+							<%-- <col style="width: auto;"> --%>
 							<col style="width: 14%;">
-							<col style="width: 10%;">
+							<%-- <col style="width: 10%;"> --%>
 						</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>
@ -298,19 +321,19 @@
 									<fmt:formatDate value="${endTm}" pattern="kk:mm"/>
 									(${list.lrnTm}분)
 								</td>
-								<td>${list.trgt}</td>
+								<%-- <td>${list.trgt}</td> --%>
 								<td>
 									<c:out value="${cryptoUtil.decrypt(list.instrNm)}"/>
 									<c:if test="${list.instrNm eq null}">
 										-
 									</c:if>
 								</td>
-								<td>${list.prsnl}</td>
+								<%-- <td>${list.prsnl}</td> --%>
 							</tr>
 						</c:forEach>
 						<c:if test="${fn:length(chasiList) eq 0}">
 							<tr>
-								<td colspan="5"><spring:message code="common.nodata.msg" /></td>
+								<td colspan="3"><spring:message code="common.nodata.msg" /></td>
 							</tr>
 						</c:if>
 						</tbody>
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngCreate.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngCreate.jsp
@ -8,6 +8,7 @@
 <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
 <%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %>
 <un:useConstants var="VeConstants" className="kcc.ve.cmm.VeConstants" />

@ -20,6 +21,7 @@
 	$( document ).ready(function(){
 		//교육 선택에 따른 항목 노출
 		itemChg($("#eduSlctCd").val());
+		eduMdChg();
 	});

 	function fncGoList(){
@ -198,6 +200,26 @@
 			$("#rqstCn").focus();
 			return false;
 		};	
+		if($("#eduTrgt").val() == ''){
+			alert('교육대상을 입력해주세요..');
+			$("#eduTrgt").focus();
+			return false;
+		};
+		if($("#eduPrsnl").val() == ''){
+			alert('교육인원을 입력해주세요.');
+			$("#eduPrsnl").focus();
+			return false;
+		};
+
+		if($("#eduSlctCd").val() == "10"){
+			if($("input[name='eduMdCd']:checked").val() == "99"){
+				if($("#eduMd").val() == ''){
+					alert('교육매체를 입력해주세요.');
+					$("#eduMd").focus();
+					return false;
+				};
+			}
+		}


 		var trObj = $('.addClassRow').find('tbody > tr').not('.calendar_wrap tr');
@ -279,6 +301,22 @@
 		);
 	}

+	//교육 매체 따른 내용 변경
+	function eduMdChg(){
+
+		var v_eduMdCd	=	$("input[name='eduMdCd']:checked").val();
+		var v_eduMd	=	$('#eduMd');
+		
+		
+		if (v_eduMdCd=='99'){
+			v_eduMd.removeAttr('disabled');	
+		}else{
+			v_eduMd.val('');
+			v_eduMd.attr('disabled', 'disabled');	
+		}
+		
+	}
+	
 </script>

 </head>
@ -304,6 +342,8 @@
 	<input type="hidden" name="limitcount" id="limitcount" value="1" /><!-- 최대 업로드 파일갯수 -->
 	<input type="hidden" name="eduAplctOrd" id="eduAplctOrd" value="${info.eduAplctOrd}" />
 	<input type="hidden" name="mode" id="mode" value="${modelVO.mode}" />
+	<input type="hidden" name="sbmtYn" id="sbmtYn" value=""/><!-- 제출여부 -->
+	<input type="hidden" name="aprvlCd" id="aprvlCd" value=""/><!-- 승인코드 -->
 	
 	<input type="hidden" id="eduSlctAreaCd" name="eduSlctAreaCd" value="<c:out value='${info.eduSlctAreaCd}'/>"/><!-- 오프라인 선택 시 지역 정보 -->
 	<input type="hidden" id="sigunguCode" name="sigunguCode" value=""/>
@ -391,6 +431,10 @@
 							</th>
 							<td colspan="3">
 								<label for="eduMd" class="label">교육매체 입력</label>
+								<ve:radio codeId="VEA015"  id="eduMdCd" name="eduMdCd" 
+								selectedValue="${empty info.eduMdCd ? '01' : info.eduMdCd}"
+								onChange="eduMdChg();" 
+								/>
 								<input type="text" name="eduMd" id="eduMd" value="${info.eduMd}" size="25">
 							</td>
 						</tr>
@ -463,6 +507,24 @@
 					</span>
 							</td>
 						</tr>
+						<tr>
+							<th scope="row">
+								<p class="req_text"><span>필수입력 항목</span>*</p>
+								<p>교육대상</p>
+							</th>
+							<td colspan="3">
+								<input type="text" name="eduTrgt" id="eduTrgt" value="${info.eduTrgt}" size="25" title="교육대상" placeholder="*예시) 대학생/교직원/ 연구직 등">
+							</td>
+						</tr>
+						<tr>
+							<th scope="row">
+								<p class="req_text"><span>필수입력 항목</span>*</p>
+								<p>교육인원</p>
+							</th>
+							<td colspan="3">
+								<input type="text" name="eduPrsnl" value="${info.eduPrsnl}" id="eduPrsnl" size="25" title="교육인원" onkeyup="onlyNumber(this);">
+							</td>
+						</tr>

 						<tr>
 							<th scope="row">
@ -499,6 +561,17 @@
 							</th>
 							<td colspan="3"><textarea name="rqstCn" id="rqstCn">${info.rqstCn}</textarea></td>
 						</tr>
+						<tr>
+							<th scope="row">
+								<p class="req_text"><span>필수입력 항목</span>*</p>
+								<p>강의료지급기관</p>
+							</th>
+							<td colspan="3">
+								<label for="feeInsttCd" class="label">강의료 지급 기관 입력</label>
+								<ve:radio codeId="VEA016"  id="feeInsttCd" name="feeInsttCd" 
+								selectedValue="${empty info.feeInsttCd ? '01' : info.feeInsttCd}"/>
+							</td>
+						</tr>
 					</tbody>
 				</table>
 			</div>
@ -513,17 +586,17 @@
 					<colgroup>
 						<col style="width: 16%;">
 						<col style="width: 35%;">
-						<col style="width: 15%;">
-						<col style="width: 15%;">
-						<col style="width: 15%;">
-						<col style="width: auto;">
+						<%-- <col style="width: 15%;">
+						<col style="width: 15%;"> --%>
+						<%-- <col style="width: 15%;">
+						<col style="width: auto;"> --%>
 					</colgroup>
 					<thead>
 						<tr>
 							<th scope="col"><p class="req_text"><span>필수입력 항목</span>*</p>교육희망일</th>
 							<th scope="col"><p class="req_text"><span>필수입력 항목</span>*</p>시간</th>
-							<th scope="col"><p class="req_text"><span>필수입력 항목</span>*</p>대상</th>
-							<th scope="col" colspan="3"><p class="req_text"><span>필수입력 항목</span>*</p>인원</th>
+							<!-- <th scope="col"><p class="req_text"><span>필수입력 항목</span>*</p>대상</th>
+							<th scope="col" colspan="3"><p class="req_text"><span>필수입력 항목</span>*</p>인원</th> -->
 						</tr>
 					</thead>
 					<tbody>
@ -797,8 +870,8 @@
 										<kc:select codeId="VE0010" name="divCd" styleClass="sel_type1"/>
 									</td>
 									 -->
-									<td><input type="text" style="width: 75%;" name="trgt"></td>
-									<td colspan="2"><input type="text" style="width: 63%;" name="prsnl" maxlength="3" onkeyup="onlyNumber(this);"><p class="input_text">명</p></td>
+									<!-- <td><input type="text" style="width: 75%;" name="trgt"></td>
+									<td colspan="2"><input type="text" style="width: 63%;" name="prsnl" maxlength="3" onkeyup="onlyNumber(this);"><p class="input_text">명</p></td> -->
 <%-- 									<td><button type="button" class="table_del" onclick="tableDel(this)"><img src="${pageContext.request.contextPath}/visitEdu/adm/publish/image/content/btn_del.png"></button></td> --%>
 								</tr>
 							</c:forEach>
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp
@ -393,7 +393,12 @@
 							<p>교육매체</p>
 						</th>
 						<td colspan="3">
+							<c:if test="${info.eduMdCd eq '99' }">
 								<c:out value="${info.eduMd}"/>
+							</c:if>
+							<c:if test="${info.eduMdCd ne '99' }">
+								<ve:code codeId="VEA015" code="${info.eduMdCd}"/>
+							</c:if>
 						</td>
 					</tr>
 				</c:when>
@ -448,6 +453,18 @@
 							</th>
 							<td colspan="3">${info.email}</td>
 						</tr>
+						<tr>
+							<th scope="row">
+								<p>교육대상</p>
+							</th>
+							<td colspan="3">${info.eduTrgt}</td>
+						</tr>
+						<tr>
+							<th scope="row">
+								<p>교육인원</p>
+							</th>
+							<td colspan="3">${info.eduPrsnl}</td>
+						</tr>
 						<tr>
 							<th scope="row">
 								<p>신청내용</p>
@ -474,6 +491,12 @@
 							</th>
 							<td colspan="3"><p><c:out value='${fn:replace(info.rqstCn, replaceChar, "<br/>")}' escapeXml="false" /></p></td>
 						</tr>
+						<tr>
+							<th scope="row">
+								<p>강의료지급기관</p>
+							</th>
+							<td colspan="3"><ve:code codeId="VEA016" code="${info.feeInsttCd}"/></td>
+						</tr>
 						<tr>
 							<th scope="row">
 								<p>신청상태</p>
@ -540,17 +563,17 @@
 						<colgroup>
 							<col style="width: 20%;">
 							<col style="width: 20%;">
-							<col style="width: auto;">
+							<%-- <col style="width: auto;"> --%>
 							<col style="width: 14%;">
-							<col style="width: 10%;">
+							<%-- <col style="width: 10%;"> --%>
 						</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>
@ -576,14 +599,14 @@
 									<fmt:formatDate value="${endTm}" pattern="kk:mm"/>
 									(${list.lrnTm}분)
 								</td>
-								<td>${list.trgt}</td>
+								<%-- <td>${list.trgt}</td> --%>
 								<td>${empty list.instrNm ? '-' : list.instrNm}</td>
-								<td>${list.prsnl}</td>
+								<%-- <td>${list.prsnl}</td> --%>
 							</tr>
 						</c:forEach>
 						<c:if test="${fn:length(chasiList) eq 0}">
 							<tr>
-								<td colspan="5"><spring:message code="common.nodata.msg" /></td>
+								<td colspan="3"><spring:message code="common.nodata.msg" /></td>
 							</tr>
 						</c:if>
 						</tbody>
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngReg.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngReg.jsp
@ -8,6 +8,7 @@
 <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
 <%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %>
 <un:useConstants var="VeConstants" className="kcc.ve.cmm.VeConstants" />

@ -20,6 +21,7 @@
 	$( document ).ready(function(){
 		//교육 선택에 따른 항목 노출
 		itemChg($("#eduSlctCd").val());
+		eduMdChg();
 	});

 	function fncGoList(){
@ -268,6 +270,21 @@
 		}
 	}

+	function eduMdChg(){
+
+		var v_eduMdCd	=	$("input[name='eduMdCd']:checked").val();
+		var v_eduMd	=	$('#eduMd');
+		
+		
+		if (v_eduMdCd=='99'){
+			v_eduMd.removeAttr('disabled');	
+		}else{
+			v_eduMd.val('');
+			v_eduMd.attr('disabled', 'disabled');	
+		}
+		
+	}
+	
 </script>

 </head>
@ -367,6 +384,10 @@
 							</th>
 							<td colspan="3">
 								<label for="eduMd" class="label">교육매체 입력</label>
+								<ve:radio codeId="VEA015"  id="eduMdCd" name="eduMdCd" 
+								selectedValue="${empty info.eduMdCd ? '01' : info.eduMdCd}"
+								onChange="eduMdChg();" 
+								/>
 								<input type="text" name="eduMd" id="eduMd" value="${info.eduMd}" size="25">
 							</td>
 						</tr>
@ -440,6 +461,21 @@
 							</td>
 						</tr>
 						
+						<tr>
+							<th scope="row">
+								<p class="req_text"><span>필수입력 항목</span>*</p>
+								<p>교육대상</p>
+							</th>
+							<td colspan="3"><input type="text" name="eduTrgt" id="eduTrgt" value="${info.eduTrgt}" size="25" title="기관(단체)명"></td>
+						</tr>
+						<tr>
+							<th scope="row">
+								<p class="req_text"><span>필수입력 항목</span>*</p>
+								<p>교육인원</p>
+							</th>
+							<td colspan="3"><input type="text" name="eduPrsnl" id="eduPrsnl" value="${info.eduPrsnl}" size="25" title="기관(단체)명"></td>
+						</tr>
+						
 						<tr>
 							<th scope="row">
 								<p class="req_text"><span>필수입력 항목</span>*</p>
@ -475,6 +511,17 @@
 							</th>
 							<td colspan="3"><textarea name="rqstCn" id="rqstCn">${info.rqstCn}</textarea></td>
 						</tr>
+						<tr>
+							<th scope="row">
+								<p class="req_text"><span>필수입력 항목</span>*</p>
+								<p>강의료 지급 기관</p>
+							</th>
+							<td colspan="3">
+								<label for="feeInsttCd" class="label">강의료 지급 기관 입력</label>
+								<ve:radio codeId="VEA016"  id="feeInsttCd" name="feeInsttCd" 
+								selectedValue="${empty info.feeInsttCd ? '01' : info.feeInsttCd}"/>
+							</td>
+						</tr>
 					</tbody>
 				</table>
 			</div>
@ -489,15 +536,15 @@
 					<colgroup>
 						<col style="width: 16%;">
 						<col style="width: auto;">
-						<col style="width: 35%;">
-						<col style="width: 12%;">
+						<%-- <col style="width: 35%;">
+						<col style="width: 12%;"> --%>
 					</colgroup>
 					<thead>
 					<tr>
 						<th scope="col"><p class="req_text"><span>필수입력 항목</span>*</p>교육희망일</th>
 						<th scope="col"><p class="req_text"><span>필수입력 항목</span>*</p>시간</th>
-						<th scope="col"><p class="req_text"><span>필수입력 항목</span>*</p>대상</th>
-						<th scope="col"><p class="req_text"><span>필수입력 항목</span>*</p>인원</th>
+						<!-- <th scope="col"><p class="req_text"><span>필수입력 항목</span>*</p>대상</th>
+						<th scope="col"><p class="req_text"><span>필수입력 항목</span>*</p>인원</th> -->
 					</tr>
 					</thead>
 					<tbody>
@ -633,8 +680,8 @@
 											</div>(<input type="text" readonly="readonly" value="${list.lrnTm}" class="input_time" name="lrnTm">분)
 										</div>
 									</td>
-									<td><input type="text" style="width: 75%;" name="trgt" value="${list.trgt}"></td>
-									<td><input type="text" style="width: 63%;" name="prsnl" value="${list.prsnl}" maxlength="3" onkeyup="onlyNumber(this);"><p class="input_text">명</p></td>
+									<%-- <td><input type="text" style="width: 75%;" name="trgt" value="${list.trgt}"></td>
+									<td><input type="text" style="width: 63%;" name="prsnl" value="${list.prsnl}" maxlength="3" onkeyup="onlyNumber(this);"><p class="input_text">명</p></td> --%>
 								</tr>
 							</c:forEach>
 						</c:when>
@ -769,8 +816,8 @@
 									<td>
 										<kc:select codeId="VE0010" name="divCd" styleClass="sel_type1"/>
 									</td>
-									<td><input type="text" style="width: 75%;" name="trgt"></td>
-									<td><input type="text" style="width: 63%;" name="prsnl" maxlength="3" onkeyup="onlyNumber(this);"><p class="input_text">명</p></td>
+									<!-- <td><input type="text" style="width: 75%;" name="trgt"></td>
+									<td><input type="text" style="width: 63%;" name="prsnl" maxlength="3" onkeyup="onlyNumber(this);"><p class="input_text">명</p></td> -->
 									<td><button type="button" class="table_del" onclick="tableDel(this)"><img src="${pageContext.request.contextPath}/visitEdu/adm/publish/image/content/btn_del.png"></button></td>
 								</tr>
 							</c:forEach>
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp
@ -9,6 +9,7 @@
 <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
 <%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %>
 <un:useConstants var="VeConstants" className="kcc.ve.cmm.VeConstants" />
 <%
@ -310,7 +311,12 @@
 										<p>교육매체</p>
 									</th>
 									<td colspan="3">
+										<c:if test="${info.eduMdCd eq '99' }">
 											<c:out value="${info.eduMd}"/>
+										</c:if>
+										<c:if test="${info.eduMdCd ne '99' }">
+											<ve:code codeId="VEA015" code="${info.eduMdCd}"/>
+										</c:if>
 									</td>
 								</tr>
 							</c:when>
@ -370,6 +376,18 @@
 								${info.email}
 							</td>
 						</tr>
+						<tr>
+							<th scope="row">
+								<p>교육대상</p>
+							</th>
+							<td colspan="3">${info.eduTrgt}</td>
+						</tr>
+						<tr>
+							<th scope="row">
+								<p>교육인원</p>
+							</th>
+							<td colspan="3">${info.eduPrsnl}</td>
+						</tr>
 						<tr>
 							<th scope="row">
 								<p>신청내용</p>
@ -402,6 +420,13 @@
 								</p>
 							</td>
 						</tr>
+						</tr>
+						<tr>
+							<th scope="row">
+								<p>강의료지급기관</p>
+							</th>
+							<td colspan="3"><ve:code codeId="VEA016" code="${info.feeInsttCd}"/></td>
+						</tr>
 					</tbody>
 				</table>
 			</div>
@ -415,10 +440,10 @@
 			<div class="tb_type01 list2">
 				<table>
 					<colgroup>
-						<col style="width: 20%;">
 						<col style="width: 20%;">
 						<col style="width: auto;">
-						<col style="width: 14%;">
+						<col style="width: 20%;">
+						<%-- <col style="width: 14%;"> --%>
 <%-- 						<col style="width: 10%;"> --%>
 <%-- 						<col style="width: 20%;"> --%>
 					</colgroup>
@ -426,9 +451,9 @@
 						<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> -->
 <!-- 							<th scope="col">이동거리</th> -->
 <!-- 							<th scope="col">숙박신청정보</th> -->
 						</tr>
@ -456,18 +481,18 @@
 									<fmt:formatDate value="${endTm}" pattern="kk:mm"/>
 									(<c:out value="${list.lrnTm}" />분)
 								</td>
-								<td>
+								<%-- <td>
 									<c:out value="${list.trgt}" />
-								</td>
+								</td> --%>
 								<td>
 									<a onclick="javascript:fncAsgnmPopup('${list.eduChasiOrd}','${list.instrDetailOrd}','${list.userId}');"><c:out value="${cryptoUtil.decrypt(list.instrNm)}"/></a>
 									<c:if test="${list.instrNm eq null}">
 										-
 									</c:if>
 								</td>
-								<td>
+								<%-- <td>
 									<c:out value="${list.prsnl}" />
-								</td>
+								</td> --%>
 								<!-- 
 								<td>
 									<c:choose>
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngList.jsp
@ -237,7 +237,7 @@
 										<ve:code codeId="VE0012" code="${list.insttDivCd}"/>
 									</td>
 									<td>
-										<c:out value="${list.trgt}"/>
+										<c:out value="${list.eduTrgt}"/>
 									</td>
 									<td>
 										<c:out value="${list.chrgNm}"/>
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp
@ -679,7 +679,7 @@
 								</td>
 								<td>
 									<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;">
-										<c:out value="${list.trgt}"/>
+										<c:out value="${list.eduTrgt}"/>
 									</a>
 								</td>
 								<td>
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp
@ -255,7 +255,12 @@
 									<p>교육매체</p>
 								</th>
 								<td colspan="3">
+									<c:if test="${info.eduMdCd eq '99' }">
 										<c:out value="${info.eduMd}"/>
+									</c:if>
+									<c:if test="${info.eduMdCd ne '99' }">
+										<ve:code codeId="VEA015" code="${info.eduMdCd}"/>
+									</c:if>
 								</td>
 							</tr>
 						</c:when>
@ -294,6 +299,18 @@
 						<th scope="row"><p>이메일</p></th>
 						<td><c:out value='${info.email}'/></td>
 					</tr>
+					<tr>
+						<th scope="row">
+							<p>교육대상</p>
+						</th>
+						<td colspan="3">${info.eduTrgt}</td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<p>교육인원</p>
+						</th>
+						<td colspan="3">${info.eduPrsnl}</td>
+					</tr>
 					<tr>
 						<th scope="row"><p>희망주제</p></th>
 						<td><c:out value='${info.hopeSbjct}'/></td>
@ -302,7 +319,12 @@
 						<th scope="row"><p style="font-size:14px;">교육 주제 관련 상세 요청사항<br/>및 사전 질의</p></th>
 						<td><p><c:out value='${fn:replace(info.rqstCn, replaceChar, "<br/>")}' escapeXml="false" /></p></td>
 					</tr>
-						
+					<tr>
+						<th scope="row">
+							<p>강의료지급기관</p>
+						</th>
+						<td colspan="3"><ve:code codeId="VEA016" code="${info.feeInsttCd}"/></td>
+					</tr>
 					</tbody>

 				</table>
@ -316,8 +338,8 @@
 					<colgroup>
 						<col style="width: 10%;">
 						<col style="width: auto;">
-						<col style="width: 10%;">
-						<col style="width: 10%;">
+						<%-- <col style="width: 10%;">
+						<col style="width: 10%;"> --%>
 						<col style="width: 20%;">
 						<col style="width: 10%;">
 					</colgroup>
@ -325,8 +347,8 @@
 						<tr>
 							<th scope="col"><p>교육희망일</p></th>
 							<th scope="col"><p>시간</p></th>
-							<th scope="col"><p>대상</p></th>
-							<th scope="col"><p>인원</p></th>
+							<!-- <th scope="col"><p>대상</p></th>
+							<th scope="col"><p>인원</p></th> -->
 							<th scope="col"><p>배정강사</p></th>
 							<th scope="col"><p>강의계획서</p></th>
 						</tr>
@ -342,8 +364,8 @@
 								~<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.trgt}'/></td>
-							<td><c:out value='${list.prsnl}'/></td>
+							<%-- <td><c:out value='${list.trgt}'/></td>
+							<td><c:out value='${list.prsnl}'/></td> --%>
 							<td><c:out value="${list.instrNm}"/></td>
 							<td>
 								<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrActvtHstryMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrActvtHstryMngList.jsp
@ -65,7 +65,22 @@
 			form.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>
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp
@ -240,19 +240,19 @@
 						</thead>
 						<tbody>
 						<c:forEach var="list" items="${resultList}" varStatus="status">
-							<tr onclick="fncGoDetail('<c:out value="${list.userId}"/>', '<c:out value="${list.instrDiv}"/>' , '<c:out value="${list.instrDetailOrd}"/>', '<c:out value="${list.rqstCnt}"/>');" style="cursor:pointer;">
+							<tr>
 							
 								<td>
 									<input name="chk" value="${list.userId}"  title="Check" type="checkbox"/>
 								</td>
-								<td>
+								<td onclick="fncGoDetail('<c:out value="${list.userId}"/>', '<c:out value="${list.instrDiv}"/>' , '<c:out value="${list.instrDetailOrd}"/>', '<c:out value="${list.rqstCnt}"/>');" style="cursor:pointer;">
 									<c:out value="${list.instrNm}"/>
 								</td>
-								<td>
+								<td onclick="fncGoDetail('<c:out value="${list.userId}"/>', '<c:out value="${list.instrDiv}"/>' , '<c:out value="${list.instrDetailOrd}"/>', '<c:out value="${list.rqstCnt}"/>');" style="cursor:pointer;">
 									<ve:code codeId="VE0018" code="${list.apptDiv}"/>
 									
 								</td>
-								<td>
+								<td onclick="fncGoDetail('<c:out value="${list.userId}"/>', '<c:out value="${list.instrDiv}"/>' , '<c:out value="${list.instrDetailOrd}"/>', '<c:out value="${list.rqstCnt}"/>');" style="cursor:pointer;">
 									<c:out value="${list.rsdne}"/>
 								</td>
 								<td>
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetailAdult.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetailAdult.jsp
@ -139,7 +139,12 @@
 									<p>교육매체</p>
 								</th>
 								<td>
+									<c:if test="${info.eduMdCd eq '99' }">
 										<c:out value="${info.eduMd}"/>
+									</c:if>
+									<c:if test="${info.eduMdCd ne '99' }">
+										<ve:code codeId="VEA015" code="${info.eduMdCd}"/>
+									</c:if>
 								</td>
 							</c:if>
 							<c:if test="${info.eduSlctCd eq '20'}">
@ -226,12 +231,12 @@
 							<th scope="row">
 								<p>인원</p>
 							</th>
-							<td><c:out value="${chasi.prsnl}" /></td>						
+							<td><c:out value="${info.eduPrsnl}" /></td>						
 							
 							<th scope="row">
 								<p>대상</p>
 							</th>
-							<td><c:out value="${chasi.trgt}" /></td>
+							<td><c:out value="${info.eduTrgt}" /></td>
 						</tr>
 						<!-- 
 						<tr>
@ -265,6 +270,12 @@
 							</th>
 							<td colspan="3"><p><c:out value='${fn:replace(info.rqstCn, replaceChar, "<br/>")}' escapeXml="false" /></p></td>
 						</tr>											
+						<tr>
+							<th scope="row">
+								<p>강의료지급기관</p>
+							</th>
+							<td colspan="3"><p><ve:code codeId="VEA016" code="${info.feeInsttCd}"/></p></td>
+						</tr>											
 						
 						<!-- 																	
 						<tr>
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/instrActvtHstrySignMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/instrActvtHstrySignMngList.jsp
@ -0,0 +1,278 @@
+<!DOCTYPE html>
+<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
+<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<un:useConstants var="KccadrStatus" className="kcc.kccadr.cmm.KccadrConstants" />
+<%
+	/**
+	 * @Class Name : instrActvtHstrySignMngList.jsp
+	 * @Description : 운영관리 > 직인대장관리
+	 * @Modification Information
+	 * @
+	 * @  수정일      수정자          수정내용
+	 * @  -------     --------    ---------------------------
+	 * @ 2022.12.7   안주영          최초 생성
+	 *  @author 안주영
+	 *  @since 2022.2.7
+	 *  @version 1.0
+	 *  @see
+	 *
+	 */
+%>
+<html lang="ko">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<style>
+		input:read-only{
+			background-color: #ededed;
+		}
+	</style>
+	<script type="text/javascript">
+		$(document).ready(function(){
+
+		});
+		
+	    function press(event) {
+	        if (event.keyCode==13) {
+	        	fncGoList();
+	        }
+	    }
+
+		function fncGoList(){
+			linkPage(1);
+		}
+
+		function linkPage(pageNo){
+			var listForm = document.listForm ;
+			listForm.pageIndex.value = pageNo ;
+			listForm.searchCondition.value = $('#searchCondition').val();
+			listForm.searchKeyword.value = $('#searchKeyword').val();
+			listForm.action = "<c:url value='/kccadr/oprtn/cmm/instrActvtHstrySignMngList.do'/>";
+			listForm.submit();
+		}
+
+		function fn_goDetail(instrDetailActvtHstryOrd){
+			var form = document.detailForm;
+			form.instrDetailActvtHstryOrd.value = instrDetailActvtHstryOrd ;
+			form.action = "<c:url value='/kccadr/oprtn/tngrVisitEdu/instrActvtHstryMngDetail.do'/>";
+			form.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>
+<body>
+<form id="detailForm" name="detailForm" method="post">
+	<input type="hidden" name="instrDetailActvtHstryOrd" id="instrDetailActvtHstryOrd" value=""/>
+</form>
+<form id="listForm" name="listForm" method="post">
+	<input type="hidden" name="pageIndex" value="<c:out value='${vEInstrActvtHstryVO.pageIndex}' default='1' />"/>
+	<input type="hidden" name="searchSortCnd" value="<c:out value="${vEInstrActvtHstryVO.searchSortCnd}" />" />
+	<input type="hidden" name="searchSortOrd" value="<c:out value="${vEInstrActvtHstryVO.searchSortOrd}" />" />
+	
+	<div class="cont_wrap">
+		<div class="box">
+
+			<!-- cont_tit -->
+			<div class="cont_tit">
+				<h2>직인대장관리 목록</h2>
+				<ul class="cont_nav">
+					<li class="home"><a href="/"><i></i></a></li>
+					<li>
+						<p>운영관리</p>
+					</li>
+					<li><span class="cur_nav">직인대장관리</span></li>
+				</ul>
+			</div>
+			<!-- //cont_tit -->
+
+			<div class="cont">
+				<!-- list_top -->
+				<div class="list_top">
+					<!-- 
+					<div class="list_top_1">
+						<div class="util_left">
+							<p>구분</p>
+						</div>
+						<div class="util_right">
+							<ve:select codeId="VEA011" name="searchSelStatus" id="searchSelStatus" css="class='sel_type1'" 
+							selectedValue="${vEInstrActvtHstryVO.searchSelStatus}" defaultValue=''
+							defaultText='전체'
+							/>
+						</div>
+					</div>
+					 -->
+					<div class="list_top_2">
+						<div class="util_left">
+							<p>신청일자</p>
+						</div>
+						<div class="util_right">
+							<div class="calendar_wrap">
+								<input type="text" class="calendar" title="시작일 선택" id="searchStartDt" name="searchStartDt" value="<c:out value='${vEInstrActvtHstryVO.searchStartDt}'/>">
+							</div>
+							~
+							<div class="calendar_wrap">
+								<input type="text" class="calendar" title="종료일 선택" id="searchEndDt" name="searchEndDt" value="<c:out value='${vEInstrActvtHstryVO.searchEndDt}'/>">
+							</div>
+
+						</div>
+					</div>
+					<div class="list_top_2">
+						<div class="util_left">
+							<p>강사명</p>
+						</div>
+						<div class="util_right">
+							<input type="text" id=searchKeyword name="searchKeyword" class="search_input" placeholder="검색어를 입력하세요" value="<c:out value='${vEInstrActvtHstryVO.searchKeyword}'/>" onkeyDown="press(event);">
+							<button class="btn_type08" onclick="fncGoList(); return false;">검색</button>
+							<button class="btn_type03" onclick="fncReset(this); return false;">초기화</button>
+						</div>
+					</div>
+				</div>
+				<!-- //list_top -->
+
+				<!-- list util -->
+				<div class="list_util">
+					<p class="list_util_p">총 건수 : <span><c:out value="${paginationInfo.totalRecordCount}" /></span>건</p>
+					<div>
+						<select class="sel_type1" name="pageUnit" id="pageUnit" onchange="linkPage(1);" title="줄 선택" style="width: 140px">
+							<option value='10' <c:if test="${vEInstrActvtHstryVO.pageUnit == '10' or vEInstrActvtHstryVO.pageUnit == ''}">selected</c:if>>10줄</option>
+							<option value='20' <c:if test="${vEInstrActvtHstryVO.pageUnit == '20'}">selected</c:if>>20줄</option>
+							<option value='30' <c:if test="${vEInstrActvtHstryVO.pageUnit == '30'}">selected</c:if>>30줄</option>
+							<option value='100' <c:if test="${vEInstrActvtHstryVO.pageUnit == '100'}">selected</c:if>>100줄</option>
+						</select>
+					</div>
+				</div>
+
+				<!-- list -->
+				<div class="tb_type01">
+					<table>
+						<colgroup>
+							<col style="width: 60px;">
+							<col style="width: 150px;">
+							<col style="width: 60px;">
+							<col style="width: auto;">
+							<col style="width: 150px;">
+							<col style="width: 120px;">
+							<col style="width: 120px;">
+							<col style="width: 120px;">
+							<col style="width: 120px;">
+							
+<%-- 							<col style="width: 10%;"> --%>
+<%-- 							<col style="width: 10%;"> --%>
+<%-- 							<col style="width: 15%;"> --%>
+						</colgroup>
+						<thead>
+							<tr>
+								<th>번호</th>
+								<th>강사명</th>
+								<th>성별</th>
+								<th>용도</th>
+								<th>사업자명<br/>사업자등록번호</th>
+								<th>신청일</th>
+								<th>처리일</th>
+								<th>문서번호</th>
+								<th>발급상태</th>
+							</tr>
+						</thead>
+						<tbody>
+						<c:forEach var="list" items="${list}" varStatus="status">
+							<tr onclick="fn_goDetail('${list.instrDetailActvtHstryOrd}')" style="cursor:pointer;">
+								<td>
+									<c:out value="${ ( paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1)*paginationInfo.recordCountPerPage) ) - status.index }"/>
+								</td>
+								<td>									
+									<c:out value="${list.instrNm }" />
+								</td>
+								<td>									
+									<c:out value="${list.sex }" />
+								</td>
+								<td>									
+									<c:out value="${list.purpose }" />
+								</td>
+								<td>									
+									<c:out value="${list.bsnsNm }" />
+									<br/>									
+									(<c:out value="${list.bsnsNmbr }" />)
+								</td>
+								
+								<td>
+									<c:out value="${list.aplctPnttm }" />
+									
+								</td>
+								<td>
+									<c:choose>
+										<c:when test="${list.stateCd eq 10 }">
+											-
+										</c:when>
+										<c:otherwise>
+											<c:out value="${list.statePnttm }" />
+										</c:otherwise>
+									</c:choose>
+								</td>
+								<td>					
+									<c:choose>
+										<c:when test="${list.docuNmbr ne '' and not empty list.docuNmbr}">
+											<c:out value="${list.docuNmbrDp }" />
+										</c:when>
+										<c:otherwise>
+											-
+										</c:otherwise>
+									</c:choose>		
+								</td>
+								<td>
+									<ve:code codeId="VEA011" code="${list.stateCd}"/>
+								</td>
+							</tr>
+						</c:forEach>
+						<c:if test="${empty list}">
+							<tr><td colspan="9"><spring:message code="common.nodata.msg" /></td></tr>
+						</c:if>
+						</tbody>
+					</table>
+				</div>
+				<!-- //list -->
+				<!-- page -->
+				<div class="page">
+					<ui:pagination paginationInfo = "${paginationInfo}"  type="image" jsFunction="linkPage" />
+				</div>
+				<!-- //page -->
+				<div class="btn_wrap btn_layout01">
+					<div class="btn_left">
+					</div>
+					<div class="btn_center">
+					</div>
+					<div class="btn_right">
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<!-- //cont -->
+
+</form>
+
+</body>
+</html>
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/rejectPopup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/rejectPopup.jsp
@ -25,9 +25,12 @@
 		if(lctrDivCd == '40') {
 			msg = "반려";
 			aprvlCd = VeConstants.APRVL_CD_30;
-		} else {
+		} else if(lctrDivCd == '30'){
 			msg = "수정요청";
 			aprvlCd = '11';
+		} else{
+			msg = "수정요청";
+			aprvlCd = VeConstants.APRVL_CD_70;
 		}
 		if(confirm(msg+" 하시겠습니까?")){
 			$.ajax({
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngList.jsp
@ -65,7 +65,22 @@
 			form.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>
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp
@ -436,7 +436,12 @@
 							<p>교육매체</p>
 						</th>
 						<td colspan="3">
+							<c:if test="${info.eduMdCd eq '99' }">
 								<c:out value="${info.eduMd}"/>
+							</c:if>
+							<c:if test="${info.eduMdCd ne '99' }">
+								<kc:code codeId="VEA015" code="${info.eduMdCd}"/>
+							</c:if>
 						</td>
 					</tr>
 				</c:when>
@ -491,6 +496,18 @@
 				</th>
 				<td colspan="3">${info.email}</td>
 			</tr>
+			<tr>
+				<th scope="row">
+					<p>교육대상</p>
+				</th>
+				<td colspan="3">${info.eduTrgt}</td>
+			</tr>
+			<tr>
+				<th scope="row">
+					<p>교육인원</p>
+				</th>
+				<td colspan="3">${info.eduPrsnl}</td>
+			</tr>
 			<tr>
 				<th scope="row">
 					<p>신청내용</p>
@ -517,6 +534,12 @@
 				</th>
 				<td colspan="3"><p><c:out value='${fn:replace(info.rqstCn, replaceChar, "<br/>")}' escapeXml="false" /></p></td>
 			</tr>
+			<tr>
+				<th scope="row">
+					<p>강의료 지급 기관</p>
+				</th>
+				<td colspan="3"><kc:code codeId="VEA016" code="${info.feeInsttCd}"/></td>
+			</tr>
 			<tr>
 				<th scope="row">
 					<p>신청상태</p>
@ -576,17 +599,13 @@
 			<colgroup>
 				<col style="width: 18%;">
 				<col style="width: auto;">
-				<col style="width: 14%;">
 				<col style="width: 12%;">
-				<col style="width: 8%;">
 			</colgroup>
 			<thead>
 			<tr>
 				<th scope="col">교육희망일</th>
 				<th scope="col">시간</th>
-				<th scope="col">대상</th>
 				<th scope="col">배정강사</th>
-				<th scope="col">인원</th>
 			</tr>
 			</thead>
 			<tbody>
@ -612,7 +631,6 @@
 						<fmt:formatDate value="${endTm}" pattern="kk:mm"/>
 						(${list.lrnTm}분)
 					</td>
-					<td>${list.trgt}</td>
 					<td>
 <%-- 						${empty list.instrNm ? '-' : list.instrNm} --%>
 						<c:choose>
@ -625,12 +643,11 @@
 							</c:otherwise>
 						</c:choose>					
 					</td>
-					<td>${list.prsnl}</td>
 				</tr>
 			</c:forEach>
 			<c:if test="${fn:length(chasiList) eq 0}">
 				<tr>
-					<td colspan="6"><spring:message code="common.nodata.msg" /></td>
+					<td colspan="4"><spring:message code="common.nodata.msg" /></td>
 				</tr>
 			</c:if>
 			</tbody>
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp
@ -20,6 +20,7 @@
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
 <%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %>
 <un:useConstants var="VeConstants" className="kcc.ve.cmm.VeConstants" />

@ -230,12 +231,14 @@
 		}

 		if($("#eduSlctCd").val() == "10"){
+			if($("input[name='eduMdCd']:checked").val() == "99"){
 				if($("#eduMd").val() == ''){
 					alert('교육매체를 입력해주세요.');
 					$("#eduMd").focus();
 					return false;
 				};
 			}
+		}
 		
 		if($("#chrgNm").val() == ''){
 			alert('담당자를 입력해주세요.');
@ -278,6 +281,16 @@
 			$("#rqstCn").focus();
 			return false;
 		};
+		if($("#eduTrgt").val() == ''){
+			alert('교육대상을 입력해주세요..');
+			$("#eduTrgt").focus();
+			return false;
+		};
+		if($("#eduPrsnl").val() == ''){
+			alert('교육인원을 입력해주세요.');
+			$("#eduPrsnl").focus();
+			return false;
+		};


 		var trObj = $('.addClassRow').find('tbody > tr').not('.calendar_wrap tr');
@ -402,6 +415,8 @@
 		$("#addrDetail").val(info.addrDetail);
 		$("#chrgNm").val(info.chrgNm);
 		$("#jobNm").val(info.jobNm);
+		$("#eduTrgt").val(info.eduTrgt);
+		$("#eduPrsnl").val(info.eduPrsnl);
 		if(isNotEmpty(info.aplctCn)){
 			var aplctCnList =  info.aplctCn.split(',');
 			$.each(aplctCnList, function(idx, value){
@ -428,6 +443,13 @@
 			$("#email2").val(email[1]);
 		}

+		if(isNotEmpty(info.eduMdCd)){
+			$('input[name=eduMdCd][value='+info.eduMdCd+']').prop('checked',true);
+		}
+		if(isNotEmpty(info.feeInsttCd)){
+			$('input[name=feeInsttCd][value='+info.feeInsttCd+']').prop('checked',true);
+		}
+		
 		$("#hopeSbjct").val(info.hopeSbjct);
 		$("#rqstCn").val(info.rqstCn);

@ -467,6 +489,7 @@
 		if(item == '10'){
 			mechae.show();
 			mechae.find("input").removeAttr("disabled", "disabled");
+			$("#eduMd").attr("disabled", "disabled");
 			juso.hide();
 			juso.find("input").attr("disabled", "disabled");
 		}
@ -479,6 +502,21 @@
 		}
 	}
 	
+	//교육 매체 따른 내용 변경
+	function eduMdChg(){
+
+		var v_eduMdCd	=	$("input[name='eduMdCd']:checked").val();
+		var v_eduMd	=	$('#eduMd');
+		
+		
+		if (v_eduMdCd=='99'){
+			v_eduMd.removeAttr('disabled');	
+		}else{
+			v_eduMd.val('');
+			v_eduMd.attr('disabled', 'disabled');	
+		}
+		
+	}	
 </script>
 <div class="mask2" onclick="timeLayerUtil()"></div>
 <div class="cont_wrap" id="sub">
@ -583,6 +621,10 @@
 				</th>
 				<td colspan="3">
 					<label for="eduMd" class="label">교육매체 입력</label>
+					<ve:radio codeId="VEA015"  id="eduMdCd" name="eduMdCd" 
+					selectedValue="${empty info.eduMdCd ? '01' : info.eduMdCd}"
+					onChange="eduMdChg();" 
+					/>
 					<input type="text" name="eduMd" id="eduMd" value="${info.eduMd}" size="25">
 				</td>
 			</tr>
@ -672,6 +714,27 @@
 					</span>
 				</td>
 			</tr>
+			<tr>
+				<th scope="row">
+					<p class="req_text"><span>필수입력 항목</span>*</p>
+					<p>교육대상</p>
+				</th>
+				<td colspan="3">
+					<label for="eduTrgt" class="label">교육대상 입력</label>
+					<input type="text" name="eduTrgt" id="eduTrgt" value="${info.eduTrgt}" size="25" placeholder="*예시) 대학생/교직원/ 연구직 등">
+					<br/>* 교육대상자의 주요업무 또는 직업군 등 교육대상자가 명확히 드러나도록 기재 바랍니다. <br/>* 교육대상자의 주요업무 또는 직업군이 여러 개일 경우, 모두 기재 하셔도 됩니다.
+				</td>
+			</tr>			
+			<tr>
+				<th scope="row">
+					<p class="req_text"><span>필수입력 항목</span>*</p>
+					<p>교육인원</p>
+				</th>
+				<td>
+					<label for="eduPrsnl" class="label">교육인원 입력</label>
+					<input type="text" name="eduPrsnl" value="${info.eduPrsnl}" id="eduPrsnl" size="25" onkeyup="onlyNumber(this);">
+				</td>					
+			</tr>			
 			<tr>
 				<th scope="row">
 					<p class="req_text"><span>필수입력 항목</span>*</p>
@ -714,10 +777,22 @@
 					<textarea name="rqstCn" id="rqstCn" placeholder="예시) 홍보 담당자들이 홍보 업무 중 발생할 수 있는 저작권 문제 또는 논란이 된 주요 사례, 판례 등을 반영한 저작권 교육 요청 / 만화.웹툰 분야 계약할 때 반드시 알아야 할 필수 용어와 팁이 있나요? 등">${info.rqstCn}</textarea>
 				</td>
 			</tr>
+			<tr>
+				<th scope="row">
+					<p class="req_text"><span>필수입력 항목</span>*</p>
+					<p>강의료 지급 기관</p>
+				</th>
+				<td colspan="3">
+					<label for="feeInsttCd" class="label">강의료 지급 기관 입력</label>
+					<ve:radio codeId="VEA016"  id="feeInsttCd" name="feeInsttCd" 
+					selectedValue="${empty info.feeInsttCd ? '01' : info.feeInsttCd}"/>
+				</td>
+			</tr>
 			</tbody>
 		</table>
 	</div>

+	<!-- 22.12.21 교육 신청 항목에 대상과 인원 추가로 인하여 차시에서 대상, 인원 제외 --> 
 	<div class="tb_tit01">
 		<div class="tb_tit01_left">
 			<p>교육일정 정보</p>
@ -731,17 +806,17 @@
 		<table class="addClassRow">
 			<caption>교육차시 정보 교육희망일, 시간,  대상, 배정강사, 인원, 삭제 을/를 입력하는 표</caption>
 			<colgroup>
-				<col style="width: 20%;">
+				<col style="width: 30%;">
 				<col style="width: auto;">
-				<col style="width: 25%;">
-				<col style="width: 10%;">
+				<%-- <col style="width: 25%;">
+				<col style="width: 10%;"> --%>
 			</colgroup>
 			<thead>
 			<tr>
 				<th scope="col"><p class="req_text"><span>필수입력 항목</span>*</p>교육희망일</th>
 				<th scope="col"><p class="req_text"><span>필수입력 항목</span>*</p>시간</th>
-				<th scope="col"><p class="req_text"><span>필수입력 항목</span>*</p>대상</th>
-				<th scope="col"><p class="req_text"><span>필수입력 항목</span>*</p>인원</th>
+				<!-- <th scope="col"><p class="req_text"><span>필수입력 항목</span>*</p>대상</th>
+				<th scope="col"><p class="req_text"><span>필수입력 항목</span>*</p>인원</th> -->
 			</tr>
 			</thead>
 			<tbody>
@ -756,7 +831,7 @@
 								</div>
 							</th>
 							<td>
-								<div class="table_time_wrap">
+								<div class="table_time_wrap" style="display: inline-flex;">
 									<div class="time_wrap time_select_wrap">
 										<fmt:parseDate value="${list.strtTm}" var="strtTm" pattern="kkmm"/>
 										<input type="text" value="<fmt:formatDate value="${strtTm}" pattern="kk:mm"/>" class="time" name="strtTm" title="시작 시간 입력">
@ -879,14 +954,14 @@
 									</div>(<input type="text" readonly="readonly" value="${list.lrnTm}" class="input_time" name="lrnTm" title="교육 시간">분)
 								</div>
 							</td>
-							<td>
+							<%-- <td>
 								<label for="target" class="label">대상 입력</label>
 								<input type="text" id="target" name="trgt" value="${list.trgt}">
 							</td>
 							<td>
 								<label for="personnel" class="label">인원 입력</label>
 								<input type="text" name="prsnl" id="personnel" onchange="prsnlCheck(this)" value="${list.prsnl}" maxlength="3" onkeyup="onlyNumber(this);"><p class="input_text">명</p>
-							</td>
+							</td> --%>
 						</tr>
 					</c:forEach>
 				</c:when>
@ -899,7 +974,7 @@
 							</div>
 						</th>
 						<td>
-							<div class="table_time_wrap">
+							<div class="table_time_wrap" style="display: inline-flex;">
 								<div class="time_wrap time_select_wrap">
 									<input type="text" class="time" name="strtTm" title="시작 시간 입력">
 									<button type="button" title="팝업 열림" class="time_set_btn"><img src="<c:url value='/visitEdu/usr/publish/images/content/timeIcon.png'/>" alt="시작 시간 선택"></button>
@ -1020,14 +1095,14 @@
 								</div>(<input type="text" readonly="readonly" class="input_time" name="lrnTm" title="교육 시간">분)
 							</div>
 						</td>
-						<td>
+						<!-- <td>
 							<label for="target" class="label">대상 입력</label>
 							<input type="text" name="trgt" id="target">
 						</td>
 						<td>
 							<label for="personnel" class="label">인원 입력</label>
 							<input type="text" name="prsnl" onchange="prsnlCheck(this)" id="personnel" maxlength="3" onkeyup="onlyNumber(this);"><p class="input_text">명</p>
-						</td>
+						</td> -->
 					</tr>
 				</c:otherwise>
 			</c:choose>
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp
@ -20,6 +20,7 @@
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>


 <!-- for validator #1 -->
@ -1179,7 +1180,12 @@
 							<p>교육매체</p>
 						</th>
 						<td colspan="3">
+							<c:if test="${info.eduMdCd eq '99' }">
 								<c:out value="${info.eduMd}"/>
+							</c:if>
+							<c:if test="${info.eduMdCd ne '99' }">
+								<ve:code codeId="VEA015" code="${info.eduMdCd}"/>
+							</c:if>
 						</td>
 					</tr>
 				</c:when>
@ -1244,6 +1250,18 @@
 				</th>
 				<td colspan="3">${info.email}</td>
 			</tr>
+			<tr>
+				<th scope="row">
+					<p>교육대상</p>
+				</th>
+				<td colspan="3">${info.eduTrgt}</td>
+			</tr>
+			<tr>
+				<th scope="row">
+					<p>교육인원</p>
+				</th>
+				<td colspan="3">${info.eduPrsnl}</td>
+			</tr>
 			<tr>
 				<th scope="row">
 					<p>신청내용</p>
@ -1270,6 +1288,12 @@
 				</th>
 				<td colspan="3"><p><c:out value='${fn:replace(info.rqstCn, replaceChar, "<br/>")}' escapeXml="false" /></p></td>
 			</tr>
+			<tr>
+				<th scope="row">
+					<p>강의료지급기관</p>
+				</th>
+				<td colspan="3"><ve:code codeId="VEA016" code="${info.feeInsttCd}"/></td>
+			</tr>
 			<!-- 
 			<tr>
 				<th scope="row">
@ -1341,9 +1365,9 @@
 			<colgroup>
 				<col style="width: 130px;">
 				<col style="width: auto;">
-				<col style="width: 14%;">
+				<%-- <col style="width: 14%;"> --%>
 				<col style="width: 120px;">
-				<col style="width: 8%;">
+				<%-- <col style="width: 8%;"> --%>
 				<col style="width: 360px;">
 				<col style="width: 12%;">
 			</colgroup>
@ -1351,9 +1375,9 @@
 			<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> -->
 				<th scope="col">만족도조사(학생)</th>
 				<th scope="col">만족도조사(신청인)</th>
 			</tr>
@ -1381,7 +1405,7 @@
 							<fmt:formatDate value="${endTm}" pattern="kk:mm"/>
 						 	(${list.lrnTm}분)
 						</td>
-						<td>${list.trgt}</td>
+						<%-- <td>${list.trgt}</td> --%>
 						<td>
 <%-- 						${empty list.instrNm ? '-' : list.instrNm} --%>
 						<c:choose>
@ -1394,7 +1418,7 @@
 							</c:otherwise>
 						</c:choose>							
 						</td>
-						<td>${list.prsnl}</td>
+						<%-- <td>${list.prsnl}</td> --%>
 						
 						<!-- 
 						<td>
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndList.jsp
@ -154,7 +154,7 @@
 								</td>
 								<td>
 									<a href="javascript:goDetail('<c:out value="${list.eduAplctOrd}"/>', '<c:out value="${list.eduChasiOrd}"/>');">
-										<c:out value='${list.trgt}'/>
+										<c:out value='${list.eduTrgt}'/>
 									</a>
 								</td>
 								<td>
@ -204,7 +204,7 @@
 						</li>
 						<li>
 							<span>교육대상</span>
-							<span><c:out value='${list.trgt}'/></span>
+							<span><c:out value='${list.eduTrgt}'/></span>
 						</li>
 						<li>
 							<span>교육내용</span>
--- a/src/main/webapp/visitEdu/usr/publish/css/common.css
+++ b/src/main/webapp/visitEdu/usr/publish/css/common.css
@ -64,7 +64,8 @@ header.scroll{box-shadow: 0 5px 8px rgba(0,0,0,0.15);}
 .header_inner{max-width: 1400px; width: 100%; height: 90px; display: flex; align-items: center; justify-content: space-between; margin: 0 auto; position: relative;}
 	/* 교육기부우수기관 위치변경 231218*/
 .header_inner .area_left {display:flex;}
-.header_inner .edumark{border:1px solid #e5e5e5; color:#666; font-size:16px; padding: 7px 14px; margin:0 0 0 30px;}
+.header_inner .edumark{border:1px solid #e5e5e5; color:#666; font-size:16px; padding: 7px 12px; margin:0 0 0 30px; display:flex; align-items:center;}
+.header_inner .edumark img{margin:0 5px 0 0;}
 .header_inner .area_right{display: flex;}

 .header .nav_wrap{box-sizing: border-box; height: 100%; max-width:1400px; margin: 0 auto;}