Merge branch 'advc' of http://subsub8729@vcs.iten.co.kr:9999/hylee/offedu into advc

src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java

@@ -112,7 +112,7 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService {
 //
 //			// step0.해당 계정으로 신청한 정보가 있는지 확인 하고, 있다면 동일한 정보로 신청했는지 확인 할것.
 			CndtnTrgtMngVO	cndtnTrgtMngVO = cndtnTrgtInfoMngDAO.checkSspnIdtmtNewStep0(cndtnTrgtInfoMngVO);
-			
+			/*
 			if ("F".equals(cndtnTrgtMngVO.getResultCd())) {	//해당 계정으로 신청한 정보중에 다른 개인정보(이름, 생년월일, 성별)를 사용해서 신청한 내용이 있다.
 				
 				result="fail";
@@ -124,6 +124,7 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService {
 				return modelAndView;
 				
 			}
+			*/
 			
 			
 			// step1.신청 가능한 대상이 있는지 찾는다.

src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java

@@ -754,14 +754,16 @@ public class SspnIdtmtController {
 			LoginVO loginVO = checkLoginUtil.getAuthLoginVO();				//권한에 따른 로그인 정보 가져오기
 			
 			
-			System.out.println(cndtnTrgtInfoMngVO.getUserId());
+			//System.out.println(cndtnTrgtInfoMngVO.getUserId());
 			cndtnTrgtInfoMngVO.setUserId(loginVO.getUniqId());
-			System.out.println(cndtnTrgtInfoMngVO.getUserId());
+			//System.out.println(cndtnTrgtInfoMngVO.getUserId());
 			
+			/*
 			System.out.println(cndtnTrgtInfoMngVO.getSex());
 			//System.out.println(cndtnTrgtInfoMngVO.getDBirth());
 			System.out.println(cndtnTrgtInfoMngVO.getdBirth());
 			System.out.println(cndtnTrgtInfoMngVO.getTrgtNm());
+			*/
 			
 			cndtnTrgtInfoMngVO	=	egovCryptoUtil.encryptCndtnTrgtMngVOInfo(cndtnTrgtInfoMngVO);
 			

src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java

@@ -202,14 +202,16 @@ public class CndtnTrgtMngController {
     	if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeyword())){
     		String searchStatus = cndtnTrgtInfoMngVO.getSearchStatus();
     		
-    		selectCondition = "AND	a."+searchStatus+" LIKE CONCAT ('%', '" +cndtnTrgtInfoMngVO.getSearchKeyword() + "', '%')";
+    		//selectCondition = "AND	a."+searchStatus+" LIKE CONCAT ('%', '" +cndtnTrgtInfoMngVO.getSearchKeyword() + "', '%')";
+    		selectCondition = "AND	a."+searchStatus+" LIKE '%'||'" +cndtnTrgtInfoMngVO.getSearchKeyword() + "'||'%'	";
     		cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
     		
     	}
     	
 		//성명검색
 		if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordFrom())){
-			selectCondition = "	AND	a.trgt_nm = '" +cndtnTrgtInfoMngVO.getSearchKeywordFrom() + "'	";
+			//cndtnTrgtInfoMngVO.setSearchKeywordFrom(egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordFrom()));
+			selectCondition = "	AND	a.trgt_nm = '" +egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordFrom()) + "'	";
 			//cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
 		}
 		
@@ -351,7 +353,7 @@ public class CndtnTrgtMngController {
 		
 		//성명검색
 		if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordFrom())){
-			selectCondition += "	AND	a.trgt_nm = '" +cndtnTrgtInfoMngVO.getSearchKeywordFrom() + "'	";
+			selectCondition += "	AND	a.trgt_nm = '" +egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordFrom()) + "'	";
 			//cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
 		}
 		
@@ -448,14 +450,22 @@ public class CndtnTrgtMngController {
 		//2. pageing step2
 		cndtnTrgtInfoMngVO = this.setCndtnPagingStep2(cndtnTrgtInfoMngVO, paginationInfo);
 		
+		//성명검색
+		String selectCondition = "";
+		if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordFrom())){
+			selectCondition += "	AND	a.trgt_nm = '" +egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordFrom()) + "'	";
+			cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
+		}
+		
 		//검색 조회
 		if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeyword())){
 			
 			
-			String selectCondition = "";
+			
 			String searchStatus = cndtnTrgtInfoMngVO.getSearchStatus();
 			
-			selectCondition = "AND	a."+searchStatus+" LIKE CONCAT ('%', '" +cndtnTrgtInfoMngVO.getSearchKeyword() + "', '%')";
+			//selectCondition = "AND	a."+searchStatus+" LIKE CONCAT ('%', '" +cndtnTrgtInfoMngVO.getSearchKeyword() + "', '%')";
+			selectCondition = "AND	a."+searchStatus+" LIKE '%'||'" +cndtnTrgtInfoMngVO.getSearchKeyword() + "'||'%'	";
 			cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
 			
 		}
@@ -743,16 +753,6 @@ public class CndtnTrgtMngController {
 		        	cndtnTrgtMngVO	=	egovCryptoUtil.encryptCndtnTrgtMngVOInfo(cndtnTrgtMngVO);
 		        	
 		        	
-					//병합이면 대상을 찾아서 넣는다.
-		        	System.out.println("cndtnTrgtMngVO.getMergeStatus()");
-		        	System.out.println(cndtnTrgtMngVO.getMergeStatus());
-		        	if (cndtnTrgtMngVO.getMergeStatus()!=null && !"".equals(cndtnTrgtMngVO.getMergeStatus())) {
-			        	CndtnTrgtMngVO cndtnTrgtMergeVO	=	cndtnTrgtInfoMngService.selectDetail4Merge(cndtnTrgtMngVO);
-			        	if (cndtnTrgtMergeVO!=null) {
-			        		cndtnTrgtMngVO.setPrcsAplctPrdOrdCmplt(cndtnTrgtMergeVO.getSspnIdtmtTrgtOrd());
-			        	}		        		
-		        	}
-		        	
 		        	LOGGER.info(cndtnTrgtMngVO.toString());
 		        	
 		        	
@@ -775,6 +775,16 @@ public class CndtnTrgtMngController {
 		        LOGGER.info(" 엑셀 insert :: [{}]건", trgtExcelVOList.size());
 		        
 		        for(CndtnTrgtMngVO cndtnTrgtMngVO : trgtExcelVOList) {
+					//병합이면 대상을 찾아서 넣는다.
+		        	System.out.println("cndtnTrgtMngVO.getMergeStatus()");
+		        	System.out.println(cndtnTrgtMngVO.getMergeStatus());
+		        	if (cndtnTrgtMngVO.getMergeStatus()!=null && !"".equals(cndtnTrgtMngVO.getMergeStatus())) {
+			        	CndtnTrgtMngVO cndtnTrgtMergeVO	=	cndtnTrgtInfoMngService.selectDetail4Merge(cndtnTrgtMngVO);
+			        	if (cndtnTrgtMergeVO!=null && cndtnTrgtMergeVO.getTrgtNm().equals(cndtnTrgtMngVO.getTrgtNm())) {
+			        		cndtnTrgtMngVO.setPrcsAplctPrdOrdCmplt(cndtnTrgtMergeVO.getSspnIdtmtTrgtOrd());
+			        	}		        		
+		        	}
+		        	
 		        	i+=cndtnTrgtInfoMngService.insert4Merge(cndtnTrgtMngVO);
 		        }
 		        	

src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml

@@ -252,6 +252,7 @@
 			AND trgt_nm=#trgtNm#
 			AND sex=#sex#
 			AND d_birth=#dBirth#
+			AND prcs_aplct_prd_ord_cmplt IS null
 		ORDER BY req_pnttm			
 		LIMIT 1
 	</select>	

src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltList.jsp

@@ -141,7 +141,7 @@
 							<p>구분1</p>
 						</div>
 						<div class="util_right">
-							<input type="text" id="trgtNm" name="trgtNm" placeholder="이름을 입력해주세요." title="검색어 입력" class="search_input" value="<c:out value='${cndtnTrgtInfoMngVO.trgtNm}'/>">
+							<input type="text" id="searchKeywordFrom" name="searchKeywordFrom" placeholder="이름을 입력해주세요." title="검색어 입력" class="search_input" value="<c:out value='${cndtnTrgtInfoMngVO.searchKeywordFrom}'/>">
 							<button type="button" class="btn_type08" onclick="fncGoList(); return false;">검색</button>
 							<button class="btn_type03" onclick="fncReset(this); return false;">초기화</button>
 						</div>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp

@@ -499,8 +499,8 @@ $(document).ready(function(){
 		
 			<!-- <div class="list_top">
 				<div class="list_top_left">
-					<label for="" class="label">교육과정 선택</label>
+					<label for="subSel" class="label">교육과정 선택</label>
-					<select class="selType1">
+					<select id="subSel" name="subSel" class="selType1">
 						<option for="">전체</option>
 						<option for="">지난교육일정</option>
 						<option for="">당월교육일정</option>

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

@@ -237,6 +237,43 @@
 		$('#trgtNm').val('');
 		$('#dBirth').val('');
 	}
+
+	//기소유예 신청
+	function fncAplctPopup(
+			p_prcsAplctPrdOrd
+			, id				//aplctOrd
+			, chId			//chasiOrd
+			, p_site_id_cd	//10,20,30
+			, p_action		//select, insert			
+			, p_qustnrTmplatId		//select, insert
+			, p_qestnrId			//select, insert
+			, p_qustnrRespondId		//select, insert
+			) {
+		
+		paramObj = {
+				"prcsAplctPrdOrd": p_prcsAplctPrdOrd
+				,"eduAplctOrd" : id
+				,"eduChasiOrd" : chId
+				,"siteIdCd" : p_site_id_cd
+				,"siteId" 	: "60"			//설문정보를 위해서 설문지의 대상값을 넣는다.	VE0011	10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소
+
+				,"action" : p_action
+
+				,"qustnrTmplatId" 	: p_qustnrTmplatId
+				,"qestnrId" 		: p_qestnrId
+				,"qustnrRespondId" 	: p_qustnrRespondId
+		};
+		
+		commonPopLayeropen(
+				//"${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/qustnrPopList.do"
+				"${pageContext.request.contextPath}/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.do"
+				, 800
+				, 700
+				, paramObj
+				, "Y"
+				, "AplctPopup"
+		);
+	}		
 </script>
 
 	<form name="regForm" id="regForm">
@@ -249,6 +286,7 @@
 	<form name="confirmForm" id="confirmForm">
 		<input type="hidden" name="trgtNm">
 		<input type="hidden" name="dBirth">
+		<input type="hidden" name="sex">
 	</form>
 <div class="cont_wrap" id="sub">
 	<div class="cont_tit">
@@ -362,7 +400,11 @@
 		<div class="btn_center">
 		</div>
 		<div class="btn_right" class="aplctBtn">
-			<button type="button" class="btnType04" id="regBtn" data-info="<c:out value="${info.prcsAplctPrdOrd}"/>" data-tooltip="target_confirm_popup" >신청</button>
+<%-- 			<button type="button" class="btnType04" id="regBtn" data-info="<c:out value="${info.prcsAplctPrdOrd}"/>" data-tooltip="target_confirm_popup" >신청</button> --%>
+			<button type="button" class="btnType04" data-tooltip="" 
+						onclick="fncAplctPopup('<c:out value="${list.prcsAplctPrdOrd}"/>','','','10','select'
+						,'','',''
+						)" title="팝업 열림">신청</button>			
 		</div>
 	</div>
 

src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp

@@ -527,7 +527,7 @@ $(document).ready(function(){
         return Math.ceil((parseInt(date.substring(6,8))+fd.getDay())/7);
 	}
 
-	//설문 팝업
+	//기소유예 신청
 	function fncAplctPopup(
 			p_prcsAplctPrdOrd
 			, id				//aplctOrd

src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp

@@ -340,18 +340,21 @@ $(document).ready(function(){
 						<div class="btn_right">
 						</div>
 					</div>
-					<div class="pop_btn_wrap btn_layout01">
-						<div class="btn_left">
-						</div>
-						<div class="btn_center">
-						</div>
-						<div class="btn_right">
-							<button type="button" id="qaBtn" class="btnType05" onclick="fn_qa()" style="display:none;">문의하기</button>						
-						</div>
-					</div>	
 	
-					<!-- <div class="pop_tb_type01" style="overflow:visible;" id="VOList"> -->
+					
-					<div class="pop_tb_type01" style="overflow:visible;display:none;" id="VOList">
+<!-- 					<div class="pop_tb_type01" style="overflow:visible;display:none;" id="VOList">					 -->
+					<div class="pop_tb_type01" style="display:none;" id="VOList">
+					
+						<div class="pop_btn_wrap btn_layout01">
+							<div class="btn_left">
+							</div>
+							<div class="btn_center">
+							</div>
+							<div class="btn_right">
+								<button type="button" id="qaBtn" class="btnType05" onclick="fn_qa()" style="display:none;">문의하기</button>						
+							</div>
+						</div>					
+					
 						<table>
 							<colgroup>
 								<col style="width:30%;">
@@ -369,10 +372,8 @@ $(document).ready(function(){
 									<th>선택</th>
 								</tr>														
 							</div>												
-
-							
 						</table>
-
+						<br/><br/><br/>
 					</div>					
 									
 				</div>

src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail.jsp

@@ -34,12 +34,15 @@ $( document ).ready(function() {
 });
 
 
+	function _goPage(){
+		history.back();
+	}
 	
 	function linkPage(pageNo){
-		var listForm = document.listForm ;
+		var list2Form = document.list2Form ;
-		listForm.pageIndex.value = pageNo ;
+		list2Form.pageIndex.value = pageNo ;
-		listForm.action = "<c:url value='/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndList.do'/>";
+		list2Form.action = "<c:url value='/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndList.do'/>";
-		listForm.submit();
+		list2Form.submit();
 	}
 	
 	function eduRsltRprtRegPop(){
@@ -105,7 +108,7 @@ $( document ).ready(function() {
 
 	<!-- cont -->
 	<div class="cont_wrap" id="sub">
-	<form:form id="listForm" name="listForm" commandName="vEEduAplctVO" method="post">
+	<form:form id="list2Form" name="list2Form" commandName="vEEduAplctVO" method="post">
 		<input type="hidden" id="eduAplctOrd" name="eduAplctOrd" value="<c:out value="${eduAplctOrd}" />" />
 		<input type="hidden" id="eduChasiOrd" name="eduChasiOrd" value="<c:out value="${eduChasiOrd}" />" />
 		<input type="hidden" id="searchSubmitYn" name="searchSubmitYn" value="<c:out value="${vEInstrAsgnmVO.searchSubmitYn}" />" />
@@ -762,7 +765,7 @@ $( document ).ready(function() {
 			</div>
 			<div class="btn_right">
 				
-				<button type="button" class="btnType02 m_btn_block" onclick="linkPage(1)">목록</button>
+				<button type="button" class="btnType02 m_btn_block" onclick="_goPage()">목록</button>
 			</div>
 		</div>