From 69d9c887991218d2ab4843acd1ae9dcb55e2e29f Mon Sep 17 00:00:00 2001
From: kmg <kmg@DESKTOP-VIC6KQU>
Date: Fri, 16 Feb 2024 15:09:02 +0900
Subject: [PATCH 1/3] =?UTF-8?q?2024/02/16=20=ED=83=9C=EA=B7=B8=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp
index 66d922fd..99091aaa 100644
--- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp
@@ -42,8 +42,7 @@ function footerSiteLinkPageGo (){
 
 	<!-- 찾교 footer -->
 	
-	</div>
-	</div>
+
 	<footer>
 		<div class="inner">
 			<div class="site">

From f20083e54fa19cc13ad25c3a9f11977fc137f9f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?ITN=5F=EB=94=94=EC=9E=90=EC=9D=B8=ED=8C=80?=
 <ITN_디자인팀@ITN>
Date: Fri, 16 Feb 2024 15:15:22 +0900
Subject: [PATCH 2/3] =?UTF-8?q?2024/02/16=20=EA=B4=80=EB=A6=AC=EC=9E=90?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsp/oprtn/adultVisitEdu/instrAplctReg.jsp | 22 ++++++---------
 .../oprtn/adultVisitEdu/instrMngDetail.jsp    | 20 ++++++-------
 .../fndthEnhanceTrn/fndthEduPrcsMngDetail.jsp | 28 ++++++++-----------
 .../WEB-INF/jsp/oprtn/stts/sttsEduCnt.jsp     |  2 +-
 .../olp/qrm/EgovQustnrRespondManageList.jsp   |  2 +-
 5 files changed, 31 insertions(+), 43 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctReg.jsp
index 9106fbb1..5ed1e832 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctReg.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctReg.jsp
@@ -326,18 +326,14 @@ $( document ).ready(function(){
 							</th>
 							<td colspan="3" style="position: relative;">
 								<input type="text" name="instrNm"/>
-								<div class="put_photo">
+			                   	<div class="put_photo">
 									<div class="put_photo_in">
-			                            <div class="put_photo">
-											<div class="put_photo_in">
-												<div class="put_photo_box">
-													<img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/content/img_add.png" alt="이미지를 넣어주세요">
-												</div>
-												<!-- <button type="button" class="btnType01" onclick="fncPhotoPopup(); return false;">사진등록</button> -->
-											</div>
-			                            </div>
+										<div class="put_photo_box">
+											<img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/content/img_add.png" alt="이미지를 넣어주세요">
+										</div>
+										<!-- <button type="button" class="btnType01" onclick="fncPhotoPopup(); return false;">사진등록</button> -->
 									</div>
-								</div>
+			                	</div>
 							</td>
 						</tr>
 						<tr>
@@ -363,7 +359,7 @@ $( document ).ready(function(){
 								@
 								<input type="text" id="email2" size="20" title="이메일 직접 입력" placeholder="">
 								<label for="emailSelect" class="label">이메일 선택</label>
-								<select name="emailSelect" id="emailSelect" class="selType1" onchange="emailChange(this)">
+								<select name="emailSelect" id="emailSelect" class="selType1 sel_type1" onchange="emailChange(this)">
 									<option value="">직접입력</option>
 									<option value="naver.com">naver.com</option>
 									<option value="daum.net">daum.net</option>
@@ -378,7 +374,7 @@ $( document ).ready(function(){
 							<td colspan="3">
 	                        	<label for="post" class="label">우편번호 입력</label>
 	                            <input type="text" size="20" name="post" id="post" class="adr_input" style="background-color: #eee;" value="<c:out value='${info.post}'/>" readonly>
-	                            <button class="btnType01 btn_adr_search" onclick="fn_postCode(this); return false;">우편번호 검색</button>
+	                            <button class="btnType01 btn_adr_search btn_type08" onclick="fn_postCode(this); return false;">우편번호 검색</button>
 	                            <div class="detail_address">
 	                            	<label for="addr" class="label">주소 입력</label>
 	                                <input type="text" size="60" name="addr" id="addr"  class="searchResultAddr" value="<c:out value='${info.addr}'/>" readonly>
@@ -395,7 +391,7 @@ $( document ).ready(function(){
 								<input type="text" title="거주지" size="25" placeholder="ex) 경기(군포시 용포동)" readonly="readonly"
 	                            value="<c:out value='${info.rsdne}'/>" maxLength="20" name="rsdne" id="rsdne">
 	                            <button 
-	                            type="button" class="btnType01" data-tooltip="sub26_pop01" onclick="fncRsdnePopup();return false;">선택</button>
+	                            type="button" class="btnType01 btn_type01" data-tooltip="sub26_pop01" onclick="fncRsdnePopup();return false;">선택</button>
 	                            <input type="hidden" name="rsdneId" id="rsdneId" value=""/><!-- 거주지ID -->							
 							</td>
 						</tr>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp
index a6b88223..5fbcbbf0 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp
@@ -622,18 +622,14 @@ function getYears(getYear){
 							</th>
 							<td colspan="3" style="position: relative;">
 								<input type="text" name="instrNm" value="<c:out value='${info.instrNm}' />"/>								
-								<div class="put_photo">
+			                    <div class="put_photo">
 									<div class="put_photo_in">
-			                            <div class="put_photo">
-											<div class="put_photo_in">
-												<div class="put_photo_box">
-													<img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/content/img_add.png" alt="이미지를 넣어주세요">
-												</div>
-												<!-- <button type="button" class="btnType01" onclick="fncPhotoPopup(); return false;">사진등록</button> -->
-											</div>
-			                            </div>
+										<div class="put_photo_box">
+											<img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/content/img_add.png" alt="이미지를 넣어주세요">
+										</div>
+										<!-- <button type="button" class="btnType01" onclick="fncPhotoPopup(); return false;">사진등록</button> -->
 									</div>
-								</div>
+			                    </div>
 							</td>
 						</tr>
 						<tr>
@@ -691,7 +687,7 @@ function getYears(getYear){
 								<input type="text" title="거주지" size="25" placeholder="ex) 경기(군포시 용포동)" readonly="readonly"
 	                            value="<c:out value='${info.rsdne}'/>" maxLength="20" name="rsdne" id="rsdne">
 	                            <button 
-	                            type="button" class="btnType01 btn_type08" data-tooltip="sub26_pop01" onclick="fncRsdnePopup();return false;">선택</button>
+	                            type="button" class="btnType01 btn_type01" data-tooltip="sub26_pop01" onclick="fncRsdnePopup();return false;">선택</button>
 	                            <input type="hidden" name="rsdneId" id="rsdneId" value=""/><!-- 거주지ID -->							
 							</td>
 						</tr>
@@ -758,7 +754,7 @@ function getYears(getYear){
 							</th>
 							<td>
 	                            <label for="apptDiv" class="label">구분 선택</label>
-	                            /<ve:code codeId="VE0018" code="${info.divCd}"/>/
+	                            <%--/<ve:code codeId="VE0018" code="${info.divCd}"/>/ --%>
 								<ve:select codeId="VE0018" name="divCd" id="divCd" css="class='sel_type1'" selectedValue="${info.divCd}" />							
 							</td>
 						</tr>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngDetail.jsp
index 6cb09e49..faf0b815 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngDetail.jsp
@@ -88,24 +88,20 @@
 						<th scope="row">교육부문</th>
 						<td colspan="3" style="position: relative;">
 							<ve:code codeId="VEA001" code="${info.prcsDiv}"/>
-								<div class="put_photo">
+			                	<div class="put_photo">
 									<div class="put_photo_in">
-			                            <div class="put_photo">
-											<div class="put_photo_in">
-												<div class="put_photo_box">
-													<c:if test="${empty info.imageAtchFileId}">
-														<img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/content/img_add.png" alt="이미지를 넣어주세요">
-													</c:if>
-													<c:if test="${not empty info.imageAtchFileId}">
-														<img id="instrPhoto" class="id_pic" alt="사진" src='<c:url value='/uss/ion/pwm/getImage.do'/>?atchFileId=<c:out value="${info.imageAtchFileId}"/>' />
-													</c:if>
-													<input type="hidden" name="imageAtchFileId" id="imageAtchFileId" value="<c:out value='${info.imageAtchFileId}'/>"/>
-												</div>
-												<!-- <button type="button" class="btnType01" onclick="fncPhotoPopup(); return false;">사진등록</button> -->
-											</div>
-			                            </div>
+										<div class="put_photo_box">
+											<c:if test="${empty info.imageAtchFileId}">
+												<img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/content/img_add.png" alt="이미지를 넣어주세요">
+											</c:if>
+											<c:if test="${not empty info.imageAtchFileId}">
+												<img id="instrPhoto" class="id_pic" alt="사진" src='<c:url value='/uss/ion/pwm/getImage.do'/>?atchFileId=<c:out value="${info.imageAtchFileId}"/>' />
+											</c:if>
+											<input type="hidden" name="imageAtchFileId" id="imageAtchFileId" value="<c:out value='${info.imageAtchFileId}'/>"/>
+										</div>
+										<!-- <button type="button" class="btnType01" onclick="fncPhotoPopup(); return false;">사진등록</button> -->
 									</div>
-								</div>
+			                	</div>
 						</td>
 					</tr>
 					<tr>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/stts/sttsEduCnt.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/stts/sttsEduCnt.jsp
index 02129e75..64e8ef91 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/stts/sttsEduCnt.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/stts/sttsEduCnt.jsp
@@ -70,7 +70,7 @@
 						<div class="util_left">
 							<p>년도</p>
 						</div>
-						<ve:select codeId="VE0029" name="year" id="year" css="class='sel_type1'" 
+						<ve:select codeId="VE0029" name="year" id="year" styleClass="sel_type1" css='style="width:140px; margin-right:5px;"'
 								selectedValue="${sttsVO.year}" 
 								/>
 						<button class="btn_type08" onclick="linkPage(); return false;">검색</button>
diff --git a/src/main/webapp/WEB-INF/jsp/uss/olp/qrm/EgovQustnrRespondManageList.jsp b/src/main/webapp/WEB-INF/jsp/uss/olp/qrm/EgovQustnrRespondManageList.jsp
index e5fb61a1..8822c32b 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/olp/qrm/EgovQustnrRespondManageList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/olp/qrm/EgovQustnrRespondManageList.jsp
@@ -96,7 +96,7 @@ function fn_egov_search_QustnrRespondManage(){
 						</select>
 						<input name="searchKeyword" title="검색어" type="text" size="35" value="${searchKeyword}"  maxlength="35" id="searchKeyword" >
 						<button id="main2_list_btn" onclick="fn_egov_search_QustnrRespondManage(); return false;" class="btn_search">검 색</button>
-						<button id="main2_save_btn" onclick="location.href='<c:url value='/uss/olp/qrm/EgovQustnrRespondManageRegist.do'/>'; return false;" >등 록</button>
+						<button class="btn_type06" style="margin-left: 0px;" id="main2_save_btn" onclick="location.href='<c:url value='/uss/olp/qrm/EgovQustnrRespondManageRegist.do'/>'; return false;" >등 록</button>
 						<select class="sel2 sel_type1" name="pageUnit" id="pageUnit" onchange="linkPage(1);" title="줄 선택" style="width: 140px">
 							<option value='10' <c:if test="${searchVO.pageUnit == '10' or adjReqMgrVO.pageUnit == ''}">selected</c:if>>10줄</option>
 							<option value='20' <c:if test="${searchVO.pageUnit == '20'}">selected</c:if>>20줄</option>

From 2cc3a9385d7e578d977609e40c343c5367836938 Mon Sep 17 00:00:00 2001
From: jiwoo <jiwoo@DESKTOP-SIDMR4Q>
Date: Fri, 16 Feb 2024 17:26:49 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B8=B0?=
 =?UTF-8?q?=EC=86=8C=EC=9C=A0=EC=98=88=20=EC=88=98=EC=A0=95=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20ppt=20=EC=9E=91=EC=97=85.=20=EB=8C=80=EC=83=81?=
 =?UTF-8?q?=EC=9E=90=20=EB=93=B1=EB=A1=9D=20=EC=8B=9C=20=EC=A4=91=EB=B3=B5?=
 =?UTF-8?q?=EC=B2=B4=ED=81=AC=20=EC=9E=91=EC=97=85=20=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trgtMng/web/CndtnTrgtMngController.java   |  68 +++++
 .../jsp/oprtn/cndtnSspnIdtmt/duplChkTable.jsp | 153 +++++++++++
 .../jsp/oprtn/cndtnSspnIdtmt/trgtDplctChk.jsp | 246 ++++++++++++++++++
 .../jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp     |   4 +-
 .../jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp      | 110 ++++++--
 .../ve/aplct/sspnIdtmt/popup/eduAplctPop.jsp  |   4 +-
 6 files changed, 561 insertions(+), 24 deletions(-)
 create mode 100644 src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/duplChkTable.jsp
 create mode 100644 src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDplctChk.jsp

diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java
index ffaa13d5..9a0bc24e 100644
--- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java
+++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java
@@ -494,6 +494,26 @@ public class CndtnTrgtMngController {
 		return "oprtn/cndtnSspnIdtmt/trgtCmpltList";
 	}
 	
+	/**
+	 * 조건부기소유예대상자 중복확인 화면
+	 */
+	//@RequestMapping("trgtDplctChk.do")
+	@RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/trgtDplctChk.do")
+	public String trgtDplctChk(
+			@ModelAttribute("cndtnTrgtInfoMngVO") CndtnTrgtMngVO cndtnTrgtInfoMngVO
+			, ModelMap model
+			, HttpServletRequest request
+			) throws Exception {
+		
+		//로그인 처리====================================
+		//로그인 정보 가져오기
+		String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model);
+		if (!"".equals(s_oprtnLoginCheckNInfo))	return s_oprtnLoginCheckNInfo;		
+		
+		//로그인 처리==================================== 
+		return "oprtn/cndtnSspnIdtmt/trgtDplctChk";
+	}	
+	
 	/**
 	 * 조건부기소유예대상자 등록 화면
 	 */
@@ -997,6 +1017,54 @@ public class CndtnTrgtMngController {
 		
 	}
 
+	@RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/popup/duplChkTable.do")
+	public String duplChkTable(
+    		@ModelAttribute("cndtnTrgtInfoMngVO") CndtnTrgtMngVO cndtnTrgtInfoMngVO
+						
+			, ModelMap model
+			, RedirectAttributes redirectAttributes
+			, HttpSession session
+			, HttpServletRequest request
+			) throws Exception {
+		
+		
+			LoginVO loginVO = checkLoginUtil.getAuthLoginVO();				//권한에 따른 로그인 정보 가져오기
+	        SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request);	//SSO 로그인 정보 가져오기
+	        
+
+	        //현재 등록자 정보
+	        CndtnTrgtMngVO cndtnTrgtInfo = cndtnTrgtInfoMngService.selectDetail(cndtnTrgtInfoMngVO);
+	        //cndtnTrgtInfo	=	egovCryptoUtil.decryptCndtnTrgtMngVOInfo(cndtnTrgtInfo);
+	        
+	        
+	        if(StringUtils.isEmpty(cndtnTrgtInfoMngVO.getdBirth())) {
+		        cndtnTrgtInfoMngVO.setdBirth(cndtnTrgtInfoMngVO.getDBirth());
+	        	
+	        } 
+	
+			//검색을 위한 암호화
+	        cndtnTrgtInfoMngVO	=	egovCryptoUtil.encryptCndtnTrgtMngVOInfo(cndtnTrgtInfoMngVO);
+	        
+	        
+	        
+			//병합대상자 검색		
+	        cndtnTrgtInfoMngVO.setEduStateCd("");
+	        cndtnTrgtInfoMngVO.setSspnIdtmtTrgtOrd("중복확인");
+			List<CndtnTrgtMngVO> cndtnTrgtInfoMngVOList = this._getMergeSearchList(model, cndtnTrgtInfoMngVO);
+				
+			//복호화
+			cndtnTrgtInfoMngVOList	=	egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoMngVOList);
+	        cndtnTrgtInfoMngVO	=	egovCryptoUtil.decryptCndtnTrgtMngVOInfo(cndtnTrgtInfoMngVO);
+					
+	    	model.addAttribute("list", cndtnTrgtInfoMngVOList);
+	    	model.addAttribute("cndtnTrgtInfo", cndtnTrgtInfo);
+	        
+	        
+	        
+	        
+		return "/oprtn/cndtnSspnIdtmt/duplChkTable";
+	}
+	
 	// 사건번호 
 	// 형식 : - 예시로 A-서울중앙-100-23-1 경우  
 	// A (성인/미성년 구분), 서울중앙,	100, 23, 1
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/duplChkTable.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/duplChkTable.jsp
new file mode 100644
index 00000000..bafab3bf
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/duplChkTable.jsp
@@ -0,0 +1,153 @@
+<!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"%>
+<%
+	/**
+	 * @Class Name : instrAsgnmPopup.jsp
+	 * @Description : 강사배치 팝업
+	 * @Modification Information
+	 * @
+	 * @  수정일      수정자          수정내용
+	 * @  -------     --------    ---------------------------
+	 * @ 2021.08.09   김봉호          최초 생성
+	 *  @author 안주영
+	 *  @since 2022.1.8
+	 *  @version 1.0
+	 *  @see
+	 *
+	 */
+%>
+<html lang="ko">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">	
+	
+<%-- 	<script type="text/javascript" src="<c:url value='/js/ve/tmapJS.js'/>"></script> --%>
+		
+	<script type="text/javascript">
+	</script>
+	<title>동명인 교육대상자 목록</title>
+	<script type="text/javaScript" language="javascript">
+	 	$(document).ready(function(){
+		});
+	</script>
+</head>
+<body>
+
+<div class="area_popup supm_popup">
+	<div class="cont_popup">
+		<form:form id="listForm" name="listForm" method="post" onsubmit="return false;">
+			<input type="hidden" name="sspnIdtmtTrgtOrd" id="sspnIdtmtTrgtOrd" value="<c:out value="${cndtnTrgtInfoMngVO.sspnIdtmtTrgtOrd}" />" />
+  
+  
+			<div class="area_popup">
+				<div class="tb_tit01">
+					<p>동명인 교육대상자 목록</p>
+				</div>
+				<div class="cont_popup">
+						<!-- list_top -->
+					<div class="pop_tb_type01">
+						<table>
+							<colgroup>
+								<col style="width: 40px">
+								<col style="width: 100px">
+								<col style="width: 100px">
+								<col style="width: 80px">
+								<col style="width: 100px">
+								<col style="width: 80px">
+								<col style="width: 60px">
+								<col style="width: 140px">
+								<col style="width: 80px">
+								<col style="width: 80px">
+								<col style="width: auto">
+								<col style="width: 80px">
+							</colgroup>
+							<thead>
+							<tr>
+								<th></th>
+								<th>의뢰일</th>
+								<th>사건번호</th>
+								<th>관할청</th>
+								<th>생년월일</th>
+								<th>성명</th>
+								<th>성별</th>
+								<th>의뢰번호</th>
+								<th>의뢰상태</th>
+								<th>교육상태</th>
+								<th>주소</th>
+								<th>검사명</th>
+							</tr>
+							</thead>
+							<tbody>
+							<c:forEach var="list" items="${list}" varStatus="status">
+								<tr>
+									<td>
+										<c:choose>
+										<c:when test="${list.eduStateCd ne 20}">
+											<input name="chk" 
+											value="${list.sspnIdtmtTrgtOrd}" title="Check" type="radio"/>
+										</c:when>
+										<c:otherwise>
+											<button type="button" class="btn_type05" onclick="fncDel('${list.sspnIdtmtTrgtOrd}'); return false;">취소</button>
+										</c:otherwise>
+										</c:choose>
+									</td>							
+									<td>
+										<c:set var="reqPnttm" value="${fn:substring(list.reqPnttm, 0, 10)}" />
+										<c:out value="${reqPnttm }" />
+									</td>							
+									<td>									
+										<c:out value="${info.vntYear }" />형제<c:out value="${info.vntNmbr }" />
+									</td>
+									<td>									
+										<c:out value="${list.cmptntAthrt }" />
+									</td>
+									<td>									
+										<c:out value="${list.dBirth }" />
+									</td>
+									<td>									
+										<c:out value="${list.trgtNm }" />
+									</td>
+									<td>							
+										<ve:code codeId="COM014" code="${list.sex }"/>  		
+									</td>
+									<td>									
+										<c:out value="${list.reqNmbr }" />
+									</td>
+									<td>									
+										<ve:code codeId="VEA005" code="${list.reqStateCd }"/>  		
+									</td>
+									<td>									
+										<ve:code codeId="VEA002" code="${list.eduStateCd }"/>  		
+									</td>
+									<c:set var="fullAddr" value="${list.addr} ${list.addrDetail}" />
+									<td title="${fullAddr}">
+										<c:out value="${list.addr }" />
+										<c:out value="${list.addrDetail }" />
+									</td>
+									<td>									
+										<c:out value="${list.prsctrNm }" />
+									</td>
+								</tr>
+							</c:forEach>
+							<c:if test="${empty list}">
+								<tr><td colspan="12"><spring:message code="common.nodata.msg" /></td></tr>
+							</c:if>
+							</tbody>
+						</table>
+					</div>
+				</div>
+			</div>
+				
+		</form:form>		
+		
+	</div>
+</div>
+
+</body>
+</html>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDplctChk.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDplctChk.jsp
new file mode 100644
index 00000000..677a3293
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDplctChk.jsp
@@ -0,0 +1,246 @@
+<!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="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
+<%
+ /**
+  * @Class Name : cndtnEduPrcsMngReg.jsp
+  * @Description : 조건부기소유예 과정 등록
+  * @Modification Information
+  * @
+  * @  수정일      수정자          수정내용
+  * @  -------     --------    ---------------------------
+  * @ 2021.12.16   조용준          최초 생성
+  *  @author 조용주
+  *  @since 2021.12.16
+  *  @version 1.0
+  *  @see
+  *
+  */
+%>
+<html lang="ko">
+<head>
+<title>교육과정관리</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<script type="text/javascript">
+//세부과정 추가 버튼 클릭 시 세부과정 추가
+    $(document).ready(function() {
+		$("#duplInsert").hide();
+		$("#newInsert").hide();
+    });
+
+	// 중복 대상자가 있는지 확인
+	function fn_duplChk(){
+		
+		if(fn_valChk())
+		{
+			return false;
+		}
+		
+		var data = new FormData(document.getElementById("createForm"));
+
+// 		if(confirm("저장하시겠습니까?")){ 
+			var url = "${pageContext.request.contextPath}/kccadr/oprtn/cndtnSspnIdtmt/duplChkAjax.do";
+			console.log(data);
+			$.ajax({
+				type:"POST",
+				enctype: 'multipart/form-data',
+				url: url,
+				data: data,
+				dataType:'json',
+				async: false,
+				processData: false,
+				contentType: false,
+				cache: false,
+				success:function(returnData){
+					console.log('returnData :: ', returnData);
+					if(returnData.result == "success"){
+						if(returnData.trgtDuplSize == 0){
+							alert("중복 대상자가 없습니다.");
+							fncCreate();
+						}else{
+							alert("중복 대상자가 있습니다.");
+							var sendData = $(document.createForm).serializeArray() ;
+							$("#loadDiv").load("<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/popup/duplChkTable.do' />", sendData ,function(response, status, xhr){
+								$("#duplInsert").show();
+								$("#newInsert").show();
+								
+							});
+							
+						}
+						//
+					}else if(returnData.result == "fail"){
+						alert(returnData.message);
+						fncGoList();
+					}
+				},
+				error:function(request , status, error){
+					alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+				}
+			}); 
+// 		}
+		
+	}
+	
+	
+	function fncCreate() {
+		var createForm = document.createForm ;
+		createForm.action = "<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/trgtReg.do'/>";
+		createForm.submit();
+	}	
+	
+	
+	function fncCreateWithDupl() {
+		var chkVal = $('input[name=chk]:checked').val();
+		if(chkVal == null || chkVal ==''){
+			alert("병합 대상을 선택해주세요.");
+			return false;
+		}
+		
+		var createForm = document.createForm ;
+		createForm.prcsAplctPrdOrdCmplt.value = chkVal;
+		createForm.action = "<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/trgtReg.do'/>";
+		createForm.submit();
+	}	
+	
+	
+	function fn_valChk(){
+		    
+		    if($("#sex").val() == "선택" || $("#sex").val().trim() == ""){
+		        alert("성별을 선택해주세요.");
+		        $("#sex").focus();
+		        return true;
+		    }
+		    
+		    // 성명 검사
+		    if($("input[name='trgtNm']").val().trim() == ""){
+		        alert("성명을 입력해주세요.");
+		        $("input[name='trgtNm']").focus();
+		        return true;
+		    }
+
+		    // 생년월일 검사
+		    if($("#DBirth").val().trim() == ""){
+		        alert("생년월일을 입력해주세요.");
+		        $("#DBirth").focus();
+		        return true;
+		    }
+		    
+		    return false; // 모든 검사를 통과하면 false 반환
+		
+		
+	}
+	
+	function fncGoList(){
+		var listForm = document.listForm ;
+		listForm.action = "<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/trgtList.do'/>";
+		listForm.submit();
+	}
+
+</script>
+
+</head>
+<body>
+<form:form id="listForm" name="listForm" commandName="vEPrcsDetailVO" method="post">
+</form:form>
+<form:form id="createForm" name="createForm" commandName="adjustDeptManageVO" method="post">
+<input type="hidden" name="sspnIdtmtTrgtOrd" id="sspnIdtmtTrgtOrd" value="" />
+<input type="hidden" name="prcsAplctPrdOrdCmplt" id="prcsAplctPrdOrdCmplt" value="" />
+<input type="hidden" name="cmptntAthrtNm" id="cmptntAthrtNm" value="" />
+
+
+<!-- cont -->
+<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>
+					<li><span class="cur_nav">대상자 중복확인</span></li>
+				</ul>
+			</div>
+			<!-- //cont_tit -->		
+
+		<div class="cont">
+			<!-- list_상세 -->
+			<div class="tb_type02">
+				<table>
+					<colgroup>
+						<col style="width: 210px;">
+						<col style="width: auto;">
+						<col style="width: 210px;">
+						<col style="width: auto;">
+					</colgroup>
+
+					<tbody>
+					<tr>
+						<th scope="row">
+							<p class="req_text"><span>필수입력 항목</span>*</p>
+							<p>성별</p>
+						</th>
+						<td>
+							<ve:select codeId="COM014" name="sex" id="sex" css="class='sel_type1'" 
+							selectedText="" defaultValue=""
+							defaultText='선택'
+							/>
+						</td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<p class="req_text"><span>필수입력 항목</span>*</p>
+							<p>성명</p>
+						</th>
+						<td>
+							<input type="text" name="trgtNm" />
+						</td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<p class="req_text"><span>필수입력 항목</span>*</p>
+							<p>생년월일</p>
+						</th>
+						<td>
+							<input type="text" name="DBirth" id="DBirth" placeholder="00000000" maxlength="8"/>
+						</td>
+					</tr>
+					</tbody>
+				</table>
+			</div>
+			<!-- //list_상세 -->
+	
+			<!-- 대상자 중복 테이블 -->
+			<div id="loadDiv">
+			</div>
+	
+			<!-- btn_wrap -->
+			<div class="btn_wrap btn_layout01">
+				<div class="btn_left">
+				</div>
+				<div class="btn_center">
+				</div>
+				<div class="btn_right">
+					<button type="button" class="btn_type02" id="duplInsert" onclick="fncCreateWithDupl(); return false;">병합처리</button>
+					<button type="button" class="btn_type02" id="newInsert" onclick="fncCreate(); return false;">신규등록</button>
+					<button type="button" class="btn_type02" id="duplChk" onclick="fn_duplChk(); return false;">중복확인</button>
+					<button type="button" class="btn_type03" onclick="fncGoList(); return false;">목록</button>
+				</div>
+			</div>			
+		</div>
+	</div>
+</div>
+</form:form>
+<!-- //cont -->
+</body>
+</html>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp
index 80b020f7..63d38c23 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp
@@ -117,7 +117,9 @@
 
 		function fncCreate() {
 			var listForm = document.listForm ;
-			listForm.action = "<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/trgtReg.do'/>";
+			/* listForm.action = "<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/trgtReg.do'/>"; */
+			//등록 전 대상자 중복확인
+			listForm.action = "<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/trgtDplctChk.do'/>";
 			listForm.submit();
 		}
 
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp
index bdcf6a97..ec38e2be 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp
@@ -47,6 +47,11 @@
 			selectCmptntAthrtCodeAjax($(this).val());
 		});
 		
+		
+		//의뢰일 오늘로 디폴트 지정
+		$('.picker__button--today').removeAttr('disabled').click();
+		 //클릭 이벤트 후 disabled 자동으로 적용
+		/* $('.picker__button--today').attr('disabled', 'disabled'); */
 
     });
 
@@ -218,11 +223,11 @@
 		    }
 
 		    // 관할청 검사
-// 		    if($("input[name='cmptntAthrt']").val()){
-// 		        alert("관할청을 입력해주세요.");
-// 		        $("input[name='cmptntAthrt']").focus();
-// 		        return true;
-// 		    }
+ 		    if($("select[name='cmptntAthrt']").val() == ""){
+ 		        alert("관할청을 선택해주세요.");
+ 		        $("select[name='cmptntAthrt']").focus();
+ 		        return true;
+		    }
 		    
 		    if($("#sex").val() == "선택" || $("#sex").val().trim() == ""){
 		        alert("성별을 선택해주세요.");
@@ -243,6 +248,13 @@
 		        $("#DBirth").focus();
 		        return true;
 		    }
+		    
+		    // 생년월일 검사
+		    if($("#clphone").val().trim() == ""){
+		        alert("연락처를 입력해주세요.");
+		        $("#clphone").focus();
+		        return true;
+		    }
 
 		    // 의뢰번호 검사
 		    /* if($("input[name='reqNmbr']").val().trim() == ""){
@@ -279,6 +291,12 @@
 		        return true;
 		    }
 
+			if($('#tbody_fiielist tr').length*1<=0){
+				alert("으뢰통지서를 등록해 주세요");
+				return false;
+				
+			}
+			
 		    return false; // 모든 검사를 통과하면 false 반환
 		
 		
@@ -369,7 +387,10 @@
 
 					<tbody>
 					<tr>
-						<th scope="row">의뢰일</th>
+						<th scope="row">
+							<p class="req_text"><span>필수입력 항목</span>*</p>
+							<p>의뢰일</p>
+						</th>
 						<td>
 							<div id="calendar">
 								<div class="calendar_wrap">
@@ -379,14 +400,20 @@
 						</td>
 					</tr>
 					<tr>
-						<th scope="row">사건번호</th>
+						<th scope="row">
+							<p class="req_text"><span>필수입력 항목</span>*</p>
+							<p>사건번호</p>
+						</th>
 						<td>
 							<input type="text" name="vntYear" style="width: 150px;margin-right: 10px;"/>형제
 							<input type="text" name="vntNmbr" style="width: 150px;margin-left: 10px;" />
 						</td>
 					</tr>
 					<tr>
-						<th scope="row">관할청</th>
+						<th scope="row">
+							<p class="req_text"><span>필수입력 항목</span>*</p>
+							<p>관할청</p>
+						</th>
 						<td>
 							<c:choose>
 								<c:when test="${empty userWork }">
@@ -417,26 +444,57 @@
 						</td>
 					</tr>
 					<tr>
-						<th scope="row">성별</th>
+						<th scope="row">
+							<p class="req_text"><span>필수입력 항목</span>*</p>
+							<p>성별</p>
+						</th>
 						<td>
-							<ve:select codeId="COM014" name="sex" id="sex" css="class='sel_type1'" 
-							selectedText="" defaultValue=""
-							defaultText='선택'
-							/>
+							<c:if test="${!empty cndtnTrgtInfoMngVO.sex}">
+								<ve:code codeId="COM014" code="${cndtnTrgtInfoMngVO.sex}"/>
+								<input type="hidden" name="sex" value="${cndtnTrgtInfoMngVO.sex}"/>
+							</c:if>
+							<c:if test="${empty cndtnTrgtInfoMngVO.sex}">
+								<ve:select codeId="COM014" name="sex" id="sex" css="class='sel_type1'" 
+								selectedText="" defaultValue=""
+								defaultText='선택'
+								/>
+							</c:if>
 						</td>
-						<th scope="row">연락처</th>
+						<th scope="row">
+							<p class="req_text"><span>필수입력 항목</span>*</p>
+							<p>연락처</p>
+						</th>
 						<td>
 							<input type="text" name="clphone" id="clphone" placeholder="00000000000" maxlength="11"/>
 						</td>
 					</tr>
 					<tr>
-						<th scope="row">성명</th>
+						<th scope="row">
+							<p class="req_text"><span>필수입력 항목</span>*</p>
+							<p>성명</p>
+						</th>
 						<td>
-							<input type="text" name="trgtNm" />
+							<c:if test="${!empty cndtnTrgtInfoMngVO.trgtNm}">
+								<c:out value="${cndtnTrgtInfoMngVO.trgtNm}"/>
+								<input type="hidden" name="trgtNm" value="${cndtnTrgtInfoMngVO.trgtNm}"/>
+							</c:if>
+							<c:if test="${empty cndtnTrgtInfoMngVO.trgtNm}">
+								<input type="text" name="trgtNm" />
+							</c:if>
 						</td>
-						<th scope="row">생년월일</th>
+						<th scope="row">
+							<p class="req_text"><span>필수입력 항목</span>*</p>
+							<p>생년월일</p>
+						</th>
 						<td>
-							<input type="text" name="DBirth" id="DBirth" placeholder="00000000" maxlength="8"/>
+							<c:if test="${!empty cndtnTrgtInfoMngVO.trgtNm}">
+								<c:out value="${cndtnTrgtInfoMngVO.DBirth}"/>
+								<input type="hidden" name="DBirth" id="DBirth" value="${cndtnTrgtInfoMngVO.DBirth}"/>
+							</c:if>
+							<c:if test="${empty cndtnTrgtInfoMngVO.trgtNm}">
+								<input type="text" name="DBirth" id="DBirth" placeholder="00000000" maxlength="8"/>
+							</c:if>
+							
 						</td>
 					</tr>
 					<!-- <tr>
@@ -451,18 +509,27 @@
 						<td>
 							<input type="text" name="reqNmbr" />
 						</td> -->
-						<th scope="row">의뢰상태</th>
+						<th scope="row">
+							<p class="req_text"><span>필수입력 항목</span>*</p>
+							<p>의뢰상태</p>
+						</th>
 						<td>
 							<ve:select codeId="VEA005" name="reqStateCd" id="reqStateCd" css="class='sel_type1'" 
 							/>
 						</td>
-						<th scope="row">검사명</th>
+						<th scope="row">
+							<p class="req_text"><span>필수입력 항목</span>*</p>
+							<p>검사명</p>
+						</th>
 						<td>
 							<input type="text" name="prsctrNm" />
 						</td>
 					</tr>
 					<tr>
-						<th scope="row">교육상태</th>
+						<th scope="row">
+							<p class="req_text"><span>필수입력 항목</span>*</p>
+							<p>교육상태</p>
+						</th>
 						<td>
 							교육대기
 							<input type="hidden" name="eduStateCd" id="eduStateCd" value="10"/>
@@ -474,6 +541,7 @@
 					</tr>
 					<tr class="input_adress">
 						<th scope="row">
+							<p class="req_text"><span>필수입력 항목</span>*</p>
 							<p>주소</p>
 						</th>
 						<td colspan="3">
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPop.jsp
index 4e4c527c..9fa30ead 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPop.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPop.jsp
@@ -243,10 +243,10 @@ $(document).ready(function(){
  한국저작권위원회에서는 귀하의 개인정보를 중요시하며, 개인정보보호법 제15조, 제17조, 제22조, 제23조 및 제24조에 따라 아래와 같이 개인정보 처리에 관하여 동의를 얻고자 합니다.
 										
  &lt;개인정보 수집 및 이용에 대한 동의 &gt;
-	ο 개인정보의 수집 이용 목적 : 이수증 발급, 이수자 관리
+	ο 개인정보의 수집 이용 목적 : 교육 대상자 및 이수자 관리
 	ο 수집하는 개인정보 항목 : 성명, 생년월일, 휴대전화, 이메일
 	ο 개인정보의 보유 및 이용기간 : 사업 종료시까지
-	ο 동의를 거부할 권리가 있다는 사실 및 동의 거부에 따른 불이익이 있는 경우에는 그 불이익의 내용 : 귀하의 개인정보 제공 및 동의를 거부할 권리가 있으며, 위 항목 동의 거부시 수강신청 및 이수증 발급이 어려워질 수 있음
+	ο 동의를 거부할 권리가 있다는 사실 및 동의 거부에 따른 불이익이 있는 경우에는 그 불이익의 내용 : 귀하의 개인정보 제공 및 동의를 거부할 권리가 있으며, 위 항목 동의 거부시 수강신청이 불가할 수 있음
 </pre>
 					<div class="pop_btn_wrap btn_layout01">
 						<div class="btn_left">