Merge branch 'hylee' into advc

src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java

@@ -46,6 +46,8 @@ public interface CndtnTrgtMngService {
 	VEAStngVO selectSMSSndString(VEAStngVO vEAStngVO);
 	
 	void updateSMSSndString(VEAStngVO vEAStngVO);
+
+	CndtnTrgtMngVO findByEduAplctOrdAndMberId(CndtnTrgtMngVO cndtnTrgtInfoMngVO);
 	
 	
 /*	//C

src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java

@@ -185,5 +185,9 @@ public class CndtnTrgtMngDAO extends EgovAbstractDAO {
 	public void updateSMSSndString(VEAStngVO vEAStngVO) {
 		update("cndtnTrgtInfoMngDAO.updateSMSSndString", vEAStngVO);
 	}
+
+	public CndtnTrgtMngVO findByEduAplctOrdAndMberId(CndtnTrgtMngVO cndtnTrgtInfoMngVO) {
+		return (CndtnTrgtMngVO) select("cndtnTrgtInfoMngDAO.findByEduAplctOrdAndMberId", cndtnTrgtInfoMngVO);
+	}
 	
 }

src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java

@@ -125,6 +125,11 @@ public class CndtnTrgtMngServiceImpl implements CndtnTrgtMngService {
 	public void updateSMSSndString(VEAStngVO vEAStngVO) {
 		cndtnTrgtInfoMngDAO.updateSMSSndString(vEAStngVO);
 	}
+
+	@Override
+	public CndtnTrgtMngVO findByEduAplctOrdAndMberId(CndtnTrgtMngVO cndtnTrgtInfoMngVO) {
+		return cndtnTrgtInfoMngDAO.findByEduAplctOrdAndMberId(cndtnTrgtInfoMngVO);
+	}
 	
 	
 }

src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java

@@ -55,6 +55,7 @@ import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO;
 import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsOnlnCntntService;
 import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsService;
 import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngService;
+import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO;
 import kcc.ve.oprtn.fndtnEnhanceTrn.prcsAplctPrdMng.service.ExcelVO;
 
 /**
@@ -796,7 +797,6 @@ public class CndtnPrcsInfoMngController {
 //			List<VEEduAplctVO> vEPrcsDetailVOList = vEEduMIXService.selectList(paramVO);
 			List<VEEduAplctVO> vEPrcsDetailVOList = vEEduMIXService.selectCndtnList(paramVO);
 			vEPrcsDetailVOList = egovCryptoUtil.decryptVeEduAplctList(vEPrcsDetailVOList);
-
 			
 	    	//대상 리스트, 페이징 정보 전달
 	    	model.addAttribute("listPrcsAplct", vEPrcsDetailVOList);
@@ -1862,6 +1862,33 @@ public class CndtnPrcsInfoMngController {
 		
 		return "/oprtn/cndtnSspnIdtmt/popup/cnclPopup";
 	}
+	
+	
+	
+	
+	
+	@RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/popup/detailPopup.do")
+	public String detailPopup(
+//			@ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO
+			@ModelAttribute("vEPrcsDetailVO") CndtnTrgtMngVO cndtnTrgtInfoMngVO
+			, ModelMap model
+			, HttpServletRequest request
+			) throws Exception {
+		
+		LoginVO loginVO = checkLoginUtil.getAuthLoginVO();				//권한에 따른 로그인 정보 가져오기
+		SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request);	//SSO 로그인 정보 가져오기
+		
+		//로그인 처리====================================  
+
+		CndtnTrgtMngVO cndtnTrgtInfoVO = cndtnTrgtInfoMngService.findByEduAplctOrdAndMberId(cndtnTrgtInfoMngVO);
+		
+		//복호화
+		cndtnTrgtInfoVO	=	egovCryptoUtil.decryptCndtnTrgtMngVOInfo(cndtnTrgtInfoVO);		
+		model.addAttribute("info", cndtnTrgtInfoVO);
+		
+		
+		return "/oprtn/cndtnSspnIdtmt/popup/detailPopup";
+	}
 
 	/** 
 	 * @methodName	: cnclPopup 

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

@@ -640,6 +640,43 @@
 					AND b.SEX 		=	#sex#	
 			)bb
 	</select>
+
+	<select id="cndtnTrgtInfoMngDAO.findByEduAplctOrdAndMberId" parameterClass="CndtnPrcsInfoMngVO" resultClass="CndtnPrcsInfoMngVO">
+		/* cndtnTrgtInfoMngDAO.findByEduAplctOrdAndMberId 	- 교육대상목록에서 상세 popup 정보	*/
+		SELECT
+			a.sspn_idtmt_trgt_ord AS sspnIdtmtTrgtOrd ,
+			a.user_id AS userId ,
+			a.edu_state_cd AS eduStateCd ,
+			a.frst_regist_pnttm AS frstRegistPnttm ,
+			a.frst_register_id AS frstRegisterId ,
+			a.last_updt_pnttm AS lastUpdtPnttm ,
+			a.last_updusr_id AS lastUpdusrId ,
+			a.trgt_nm AS trgtNm ,
+			a.clphone AS clphone ,
+			a.d_birth AS dBirth ,
+			a.addr AS addr ,
+			a.addr_detail AS addrDetail ,
+			a.post AS post ,
+			a.email AS email ,
+			a.req_pnttm AS reqPnttm ,
+			a.vnt_year AS vntYear ,
+			a.vnt_nmbr AS vntNmbr ,
+			a.cmptnt_athrt AS cmptntAthrt ,
+			a.sex AS sex ,
+			a.req_nmbr AS reqNmbr ,
+			a.prsctr_nm AS prsctrNm ,
+			a.req_state_cd AS reqStateCd ,
+			a.atch_file_id AS atchFileId ,
+			a.prcs_aplct_prd_ord_cmplt AS prcsAplctPrdOrdCmplt ,
+			a.rmrks AS rmrks ,
+			a.edu_aplct_ord AS eduAplctOrd
+		FROM
+			vea_sspn_idmt_trgt a
+		WHERE
+			1 = 1
+			AND a.EDU_APLCT_ORD  = #eduAplctOrd#
+			AND a.USER_ID  = #userId#
+	</select>
 	
 	<update id="cndtnTrgtInfoMngDAO.memoUpdate" parameterClass="CndtnPrcsInfoMngVO">
 		/* cndtnTrgtInfoMngDAO.memoUpdate	*/

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

@@ -274,6 +274,17 @@
 	
 
 	
+	function fn_goDetailPop(p_eduAplctOrd, p_mberId) {
+
+			var form = document.detailPopForm;
+			
+			form.eduAplctOrd.value = p_eduAplctOrd;
+			form.userId.value = p_mberId;
+			form.action = "<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/popup/detailPopup.do'/>";
+		    openPopupAndSubmitForm('detailPopForm', 'detailPopForm', 1000, 720);
+		   
+	}
+	
 	function fnCnclPopup(eduAplctOrd, prcsAplctPrdOrd) {
 
 			var form = document.cnclPopupForm;
@@ -298,6 +309,10 @@
 </head>
 <body>
 
+<form id="detailPopForm" name="detailPopForm" method="post">
+	<input type="hidden" id="eduAplctOrd" name="eduAplctOrd" />
+	<input type="hidden" id="userId" name="userId" />
+</form>
 <form id="cnclPopupForm" name="cnclPopupForm" method="post">
 	<input type="hidden" id="eduAplctOrd" name="eduAplctOrd" />
 	<input type="hidden" name="prcsAplctPrdOrd" id="prcsAplctPrdOrd" />
@@ -607,7 +622,7 @@
 											<c:out value="${list.trgtNm}"/>
 										</td>
 										<td>
-											<c:out value="${list.mberId}"/>
+											<a href="#none" onclick="fn_goDetailPop('${list.eduAplctOrd}','${list.mberId}')"><c:out value="${list.mberId}"/></a>
 										</td>
 										<td>
 											<c:out value="${list.email}"/>

src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/detailPopup.jsp

@@ -0,0 +1,210 @@
+<!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(){
+
+	 	});
+
+		function fncPopClose(){
+			self.close();
+		}
+		
+		function fn_updateCnclUpdate(aplctStateCd, aprvlCd, p_msg) {
+			var msg = p_msg;
+			
+			var form = document.updateForm ;
+			form.aplctStateCd.value = aplctStateCd ;
+			form.aprvlCd.value = aprvlCd ;
+			var data1 = new FormData(document.getElementById("updateForm"));
+			if(confirm(msg+" 하시겠습니까?")){
+				$.ajax({
+					type:"POST",
+					url:"${pageContext.request.contextPath}/kccadr/oprtn/cndtnSspnIdtmt/updateAplctStateCdAjax_only.do",
+					data: data1,
+					dataType:'json',
+					async: false,
+					processData: false,
+					contentType: false,
+					cache: false,
+					success:function(returnData){
+						if(returnData.result == 'success'){
+							alert("처리 되었습니다.");
+							window.opener.location.reload();
+							fncPopClose();
+						}
+					},
+					error:function(request , status, error){
+						alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+					}
+				});
+			}
+		}
+	</script>
+</head>
+<body>
+
+	<div class="cont_popup">
+		
+			
+			<div class="area_popup">
+				<div class="cont_popup">
+				
+			<!-- list_상세 -->
+			<div class="tb_tit01">
+				<p>대상자 상세</p>
+			</div>
+			<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">의뢰일</th>
+						<td>
+							<div id="calendar">
+								<div class="calendar_wrap">
+<!-- 									<input type="text" class="calendar" placeholder="의뢰일" title="의뢰일 선택" id="reqPnttm" name="reqPnttm" value=""> -->
+<!-- 									<input type="text" class="calendar" placeholder="의뢰일" title="의뢰일 선택" id="reqPnttm" name="reqPnttm" value=""> -->
+									<c:set var="reqPnttm" value="${fn:substring(info.reqPnttm, 0, 10)}" />
+<%-- 									<fmt:formatDate value="${list.reqPnttm }" pattern="yyyy-MM-dd" />									 --%>
+									<c:out value="${reqPnttm }" />
+								</div>
+							</div>
+						</td>
+					</tr>
+					<tr>
+						<th scope="row">사건번호</th>
+						<td>
+							<c:out value="${info.vntYear }" />형제<c:out value="${info.vntNmbr }" />
+						</td>
+					</tr>
+					<tr>
+						<th scope="row">관할청</th>
+						<td>
+							<ve:code codeId="VEA008" code="${info.cmptntAthrt }"/>  		
+						</td>
+					</tr>
+					<tr>
+						<th scope="row">성별</th>
+						<td>
+							<ve:code codeId="COM014" code="${info.sex }"/>  		
+						</td>
+						<th scope="row">연락처</th>
+						<td>
+							<c:out value="${info.clphone }" />  		
+						</td>
+					</tr>
+					<tr>
+						<th scope="row">성명</th>
+						<td>
+							<c:out value="${info.trgtNm }" />
+						</td>
+						<th scope="row">생년월일</th>
+						<td>
+							<c:out value="${info.dBirth }" />
+						</td>
+					</tr>
+					<!-- <tr>
+						<th scope="row">연락처(핸드폰)</th>
+						<td>
+							<input type="text" name="clphone" />	
+							
+						</td>
+					</tr> -->
+					<tr>
+						<th scope="row">의뢰번호</th>
+						<td>
+							<c:out value="${info.reqNmbr }" />
+						</td>
+						<th scope="row">의뢰상태</th>
+						<td>							
+							<c:choose>
+								<c:when test="${not empty info.prcsAplctPrdOrdCmplt }">
+									병합대상
+								</c:when>
+								<c:otherwise>
+									<ve:code codeId="VEA005" code="${info.reqStateCd }"/>
+								</c:otherwise>
+							</c:choose>
+						</td>
+					</tr>
+					<tr>
+						<th scope="row">교육상태</th>
+						<td>
+							<ve:code codeId="VEA002" code="${info.eduStateCd }"/>  		
+						</td>
+						<th scope="row">검사명</th>
+						<td>
+							<c:out value="${info.prsctrNm }" />
+						</td>
+					</tr>
+					<tr class="input_adress">
+						<th scope="row">
+							<p>주소</p>
+						</th>
+						<td colspan="3">
+                        	<label for="post" class="label">우편번호 입력</label>
+                            <c:out value='${info.post}'/>
+                            <div class="detail_address">
+                                <c:out value='${info.addr}'/>
+                                <c:out value='${info.addrDetail}'/>
+                            </div>
+						</td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<p>첨부파일</p>
+						</th>
+						<td>
+							<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
+								<c:param name="param_atchFileId" value="${info.atchFileId}" />
+								<c:param name="pdf_view" value="Y" />
+							</c:import>
+						</td>
+					</tr>
+					</tbody>
+				</table>
+				</div>
+			</div>
+				
+	</div>
+</body>
+</html>