Merge branch 'hylee' into advc

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

@@ -30,6 +30,7 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable {
 	private String post;				// 우편주소
 	
 	private String reqPnttm;			// 의뢰일 
+	private String vntYear;				// 사건년도
 	private String vntNmbr;				// 사건번호
 	private String cmptntAthrt;			// 관할청
 	private String sex;					// 성별
@@ -134,6 +135,12 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable {
 	public void setReqPnttm(String reqPnttm) {
 		this.reqPnttm = reqPnttm;
 	}
+	public String getVntYear() {
+		return vntYear;
+	}
+	public void setVntYear(String vntYear) {
+		this.vntYear = vntYear;
+	}
 	public String getVntNmbr() {
 		return vntNmbr;
 	}

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

@@ -519,6 +519,7 @@ public class CndtnPrcsInfoMngController {
 		
 		
 		modelAndView.addObject("result", "success");
+		modelAndView.addObject("prcsDivCd", vEPrcsDetailVODetail.getPrcsDiv());
 		modelAndView.addObject("prcsDiv", cmmUseDAO.selectCmmCodeDetailValue(codeVO)
 																		.getCodeNm());
 		
@@ -1406,6 +1407,7 @@ public class CndtnPrcsInfoMngController {
 			ComDefaultCodeVO codeVO = new ComDefaultCodeVO();
 			codeVO.setCodeId("VEA001");//기관구분코드
 			codeVO.setCode(vEPrcsDetailVOList.get(0).getPrcsDiv()); 
+			model.addAttribute("prcsDiv", vEPrcsDetailVOList.get(0).getPrcsDiv());
 			model.addAttribute("prcsDivNm", cmmUseDAO.selectCmmCodeDetailValue(codeVO).getCodeNm());
 			
 			// 상세교육과정 내용 가져오는 영역
@@ -1479,6 +1481,14 @@ public class CndtnPrcsInfoMngController {
 		
         //과정 조회
         VEPrcsDetailVO vEPrcsDetailVODetail = vEPrcsAplctPrdService.selectDetailNewOne4Fndth(vEPrcsDetailVO);
+        
+
+		ComDefaultCodeVO codeVO = new ComDefaultCodeVO();
+		codeVO.setCodeId("VEA001");//기관구분코드
+		codeVO.setCode(vEPrcsDetailVODetail.getPrcsDiv()); 
+		model.addAttribute("prcsDivNm", cmmUseDAO.selectCmmCodeDetailValue(codeVO).getCodeNm());
+        
+        
 		model.addAttribute("info", vEPrcsDetailVODetail);
 
 		return "oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngMdfy";

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

@@ -28,6 +28,7 @@
 			, post  
 			, email
 			, req_pnttm
+			, vnt_year
 			, vnt_nmbr
 			, cmptnt_athrt
 			, sex
@@ -54,6 +55,7 @@
 			, 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             
@@ -84,6 +86,7 @@
 			, #post#
 			, #email#
 			, #reqPnttm#
+			, #vntYear#
 			, #vntNmbr#
 			, #cmptntAthrt#
 			, #sex#
@@ -94,6 +97,7 @@
 	</insert>
 	
 	<select id="cndtnTrgtInfoMngDAO.selectDetail" parameterClass="CndtnPrcsInfoMngVO" resultClass="CndtnPrcsInfoMngVO">
+	/* cndtnTrgtInfoMngDAO.selectDetail */
 		SELECT
 			<include refid="CndtnTrgtInfoMngDAO.select_column_name"/>
 		FROM 
@@ -121,6 +125,7 @@
 			, post             = #post#
 			, email            = #email#
 			, req_pnttm        = #reqPnttm#
+			, vnt_year         = #vntYear#
 			, vnt_nmbr         = #vntNmbr#
 			, cmptnt_athrt     = #cmptntAthrt#
 			, sex              = #sex#
@@ -178,6 +183,7 @@
 		<isNotEmpty property="searchSmbtEndDt">
 			AND TO_CHAR(A.FRST_REGIST_PNTTM, 'YYYYMMDD') <![CDATA[ <= ]]> REPLACE(#searchSmbtEndDt#, '.' , '')
 		</isNotEmpty>
+		ORDER BY a.frst_regist_pnttm desc
 		OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;
 		   
 	</select>

src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml

@@ -79,7 +79,7 @@
 	
 	<!-- 강사 등록 C -->
 	<insert id="VEPrcsAplctPrdDAO.insert" parameterClass="VEPrcsDetailVO">
-				
+		/* VEPrcsAplctPrdDAO.insert */
 		INSERT INTO <include refid="VEPrcsAplctPrdDAO.table_name"/> (
 			<include refid="VEPrcsAplctPrdDAO.column_name"/>
 			

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

@@ -293,16 +293,18 @@
 							<c:out value="${info.strtPnttm}"/>~<c:out value="${info.endPnttm}"/>
 						</td>
 					</tr>
-					<tr>
+					<c:if test="${info.prcsDiv eq 10}">
-						<th scope="row">교육장소</th>
+						<tr>
-						<td class="addPro_wrap">
+							<th scope="row">교육장소</th>
-							<c:out value="${info.eduPlace}"/>							
+							<td class="addPro_wrap">
-						</td>
+								<c:out value="${info.eduPlace}"/>							
-					</tr>
+							</td>
+						</tr>
+					</c:if>
 					<tr>
 						<th scope="row">교육기간</th>
 						<td>
-							<c:out value="${info.eduStrtPnttm}"/>~<c:out value="${info.eduDdlnPnttm}"/>
+							<c:out value="${info.eduStrtPnttm}"/>
 						</td>
 					</tr>				
 					<tr>

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

@@ -260,7 +260,7 @@
 						<thead>
 						<tr>
 							<th>NO</th>
-							<th>교육구분코드</th>
+							<th>대면구분</th>
 							<th>과정명</th>
 							<th>신청기간</th>
 							<th>교육기간</th>

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

@@ -30,6 +30,61 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <script type="text/javascript">
 //세부과정 추가 버튼 클릭 시 세부과정 추가
+
+
+
+	$(document).ready(function(){
+
+		$('#prcsOrd').change(function(){
+			fnSelectDivAndCn($(this).val());
+		});
+		
+        var prcsDiv = "<c:out value='${info.prcsDiv }' />";
+        prcsDivChk(prcsDiv)
+	});
+
+	/*
+	 * prcsDivChk
+	 * 10:대면 20:비대면
+	 * 10:대면 20:비대면
+	 *  */
+	function prcsDivChk(prcsDiv){
+		if(prcsDiv==10){
+			$('#tr_eduPlace').show();
+		}else{
+			$('#tr_eduPlace').hide();
+		}
+		
+	}
+	
+
+	// div codeNm 가져오는 function
+	function fnSelectDivAndCn(prcsOrdVal){
+
+		var url = "${pageContext.request.contextPath}/kccadr/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctSelectDivAndCnAjax.do";
+		$.ajax({
+			type:"POST",
+			url: url,
+			data:{ "prcsOrd" : prcsOrdVal},
+			dataType:'json',
+			async: false,
+			success:function(returnData){
+				if(returnData.result == "success"){
+					// 대면인지 비대면인지
+					var prcsDiv = returnData.prcsDivCd;
+					prcsDivChk(prcsDiv);
+					$('#prcsDiv').val(returnData.prcsDiv);
+					$('#prcsCn').val(returnData.prcsCn);
+				}
+			},
+			error:function(request , status, error){
+				alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+			}
+		});
+	}
+
+	
+	
 	function addPro() {
 		var addQuest = $(".addPro_wrap"); 
 		var questLen = addQuest.children("div").length;
@@ -175,7 +230,8 @@
 					<tr>
 						<th scope="row">교육부분</th>
 						<td>
-							<ve:select codeId="VEA001" name="prcsDiv" id="prcsDiv" css="class='sel_type1'" selectedValue="${info.prcsDiv}"/>
+							<input type="text" name="prcsDiv" id="prcsDiv" readonly="readonly" value="${prcsDivNm }"/>
+<%-- 							<ve:select codeId="VEA001" name="prcsDiv" id="prcsDiv" css="class='sel_type1'" selectedValue="${info.prcsDiv}"/> --%>
 						</td>
 					</tr>	
 					<tr>
@@ -186,16 +242,31 @@
 							<select name="prcsOrd" id="prcsOrd" class="sel_type1">
 
 								<c:forEach var="listPrcs" items="${listPrcs}" varStatus="status">
-									<option value='<c:out value="${listPrcs.prcsOrd}"/>'
+									<option value='<c:out value="${listPrcs.prcsOrd}"/>'<c:if test="${listPrcs.prcsOrd eq info.prcsOrd}"> selected</c:if>><c:out value="${listPrcs.prcsOrd}"/>_<c:out value="${listPrcs.prcsNm}"/></option>
-									<c:if test="${listPrcs.prcsOrd eq info.prcsOrd}"> selected</c:if>
-									><c:out value="${listPrcs.prcsOrd}"/>_<c:out value="${listPrcs.prcsNm}"/></option>
 								</c:forEach>
 														
 							</select>
 														
 						</td>
 					</tr>
-					
+					<tr>
+						<th scope="row">교육기간</th>
+						<td>
+								<div class="calendar_wrap">
+									<input type="text" class="calendar" title="시작일 선택" id="eduStrtPnttm" name="eduStrtPnttm" value="${info.eduStrtPnttm}">
+								</div>
+								<%-- ~
+								<div class="calendar_wrap">
+									<input type="text" class="calendar" title="종료일 선택" id="eduDdlnPnttm" name="eduDdlnPnttm" value="${info.eduDdlnPnttm}">
+								</div> --%>
+						</td>
+					</tr>	
+					<tr id="tr_eduPlace">
+						<th scope="row">교육장소</th>
+						<td class="addPro_wrap">
+							<input type="text" name="eduPlace" id="eduPlace" value="${info.eduPlace}" >
+						</td>
+					</tr>			
 					<tr>
 						<th scope="row">신청기간</th>
 						<td>
@@ -209,26 +280,6 @@
 															
 						</td>
 					</tr>
-					<tr>
-						<th scope="row">교육장소</th>
-						<td class="addPro_wrap">
-							<input type="text" name="eduPlace" id="eduPlace" value="${info.eduPlace}" >
-						</td>
-					</tr>
-					<tr>
-						<th scope="row">교육기간</th>
-						<td>
-								<div class="calendar_wrap">
-									<input type="text" class="calendar" title="시작일 선택" id="eduStrtPnttm" name="eduStrtPnttm" value="${info.eduStrtPnttm}">
-								</div>
-								~
-								<div class="calendar_wrap">
-									<input type="text" class="calendar" title="종료일 선택" id="eduDdlnPnttm" name="eduDdlnPnttm" value="${info.eduDdlnPnttm}">
-								</div>
-															
-						</td>
-					</tr>				
-
 					<tr>
 						<th scope="row">상세교육과정</th>
 						<td>							

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

@@ -46,83 +46,32 @@
             }
         });
 		
+        var prcsDiv = "<c:out value='${prcsDiv }' />";
+        prcsDivChk(prcsDiv)
 	});
 
 
-//세부과정 추가 버튼 클릭 시 세부과정 추가
-	function addPro() {
-		var addQuest = $(".addPro_wrap"); 
-		var questLen = addQuest.children("div").length;
-		questLen = Number(questLen+1);
-		var trHtml="";
 
-		trHtml += '<div class="tbody_one">';
+	/*
-		trHtml += '<span><span class="span_num3">'+ questLen +'</span>.</span>';
+	 * prcsDivChk
-		trHtml += '<div>';
+	 * 10:대면 20:비대면
-		trHtml += '<input type="text" name="detailPrcsNm" id="detailPrcsNm"> ';
+	 * 10:대면 20:비대면
-		trHtml += '<button type="button" class="table_del3" onclick="delPro(this)"><img src="${pageContext.request.contextPath}/visitEdu/adm/publish/image/content/btn_del.png"></button>';
+	 *  */
-		trHtml += '</div>';
+	function prcsDivChk(prcsDiv){
-		trHtml += '</div>';
+		if(prcsDiv==10){
-		
+			$('#tr_eduPlace').show();
-		addQuest.append(trHtml);
-	}
-
-	//삭제 버튼 클릭 시 현재 div 삭제 후 지문 숫자 재선언
-	function delPro(item) {
-		var bodyThis = $(item).closest('.tbody_one');
-		var tb = $(item).closest('.addPro_wrap').find('.tbody_one');
-		var len = $(item).closest('.addPro_wrap').children('.tbody_one').length;
-		var idx = bodyThis.index();
-
-		if(len == 1){
-			alert("세부과정은 최소1개가 존재해야합니다.");
-		 	return false;
 		}else{
-			bodyThis.remove();
+			$('#tr_eduPlace').hide();
-
-			for(var i=0;i<len;i++){
-				if(idx>i){
-					tb.eq(i).find('.span_num3').text(i+1);
-				}else{
-					tb.eq(i).find('.span_num3').text(i);
-				}
-			}
 		}
+		
 	}
 	
 	
-	function fncAddUser(){
-	 	var obj = $(".memList:first").clone(true);
-	 	obj.children('input').val('')
-	 	/*
-		var len = $(".memList").length;
-		$.each(obj.find("input"), function(idx, objInput){
-			objInput.name = objInput.name.replace(/\[.*\]/,'['+(len+1)+']');
-			console.log(objInput.name);
-			if(objInput.name.indexOf("memGrade") < 0){
-				objInput.value = '';
-			}
-		});
-		obj.find("button").attr("id", obj.find("button").attr("id").replace(/[0-9]/gi, len+2));
-		obj.find("tr:last > td").text("");
-		*/
-		$(".memList:last").after(obj);
-	}
-	
-	function fncDelUser(obj){
-		if($(".memList").length <= 1){
-			alert("담당자은 최소1개가 존재해야합니다.");
-		}else{
-			$(obj).closest("td").remove();
-		}
-	}
-
 	function fncSave(){
 
 		var data = new FormData(document.getElementById("createForm"));
 		if(confirm("저장하시겠습니까?")){
 			var url = "${pageContext.request.contextPath}/kccadr/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngRegAjax.do";
-			console.log(data);
 			$.ajax({
 				type:"POST",
 				url: url,
@@ -158,6 +107,9 @@
 			async: false,
 			success:function(returnData){
 				if(returnData.result == "success"){
+					// 대면인지 비대면인지
+					var prcsDiv = returnData.prcsDivCd;
+					prcsDivChk(prcsDiv);
 					$('#prcsDiv').val(returnData.prcsDiv);
 					$('#prcsCn').val(returnData.prcsCn);
 				}
@@ -214,7 +166,7 @@
 
 					<tbody>
 					<tr>
-						<th scope="row">교육부분코드</th>
+						<th scope="row">대면구분</th>
 						<td>
 							<input type="text" name="prcsDiv" id="prcsDiv" readonly="readonly" value="${prcsDivNm }"/>
 						</td>
@@ -237,16 +189,15 @@
 						<th scope="row">교육기간</th>
 						<td>
 								<div class="calendar_wrap">
-									<input type="text" class="calendar" title="시작일 선택" id="eduStrtPnttm" name="eduStrtPnttm" value="${vEEduAplctVO.strtPnttm}">
+									<input type="text" class="calendar" title="교육일 선택" id="eduStrtPnttm" name="eduStrtPnttm" />
 								</div>
-								~
+								<%-- ~
 								<div class="calendar_wrap">
-									<input type="text" class="calendar" title="종료일 선택" id="eduDdlnPnttm" name="eduDdlnPnttm" value="${vEEduAplctVO.endPnttm}">
+									<input type="text" class="calendar" title="종료일 선택" id="endPnttm" name="endPnttm" value="${vEEduAplctVO.endPnttm}">
-								</div>
+								</div> --%>
-															
 						</td>
 					</tr>
-					<tr>
+					<tr id="tr_eduPlace">
 						<th scope="row">교육장소</th>
 						<td class="addPro_wrap">
 							<input type="text" name="eduPlace" id="eduPlace" value="${vEEduAplctVO.eduPlace}" >
@@ -265,7 +216,6 @@
 															
 						</td>
 					</tr>				
-
 					<tr>
 						<th scope="row">상세교육과정</th>
 						<td>							

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

@@ -220,7 +220,7 @@
 						</colgroup>
 						<thead>
 						<tr>
-							<th>교육부문</th>
+							<th>대면구분</th>
 							<th>과정명</th>
 							<th>설명</th>
 							<th>등록일시</th>

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

@@ -172,7 +172,7 @@
 
 					<tbody>
 					<tr>
-						<th scope="row">교육부문</th>
+						<th scope="row">대면구분</th>
 						<td colspan="3" style="position: relative;">
 							<ve:select codeId="VEA001" name="prcsDiv" id="prcsDiv" css="class='sel_type1'" 
 									selectedValue="${info.prcsDiv }" defaultValue=''

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

@@ -172,7 +172,7 @@
 
 					<tbody>
 					<tr>
-						<th scope="row">교육부문</th>
+						<th scope="row">대면구분</th>
 						<td colspan="3" style="position: relative;">
 							<ve:select codeId="VEA001" name="prcsDiv" id="prcsDiv" css="class='sel_type1'" 
 									selectedValue="" defaultValue=''

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

@@ -101,7 +101,7 @@
 					<tr>
 						<th scope="row">사건번호</th>
 						<td>
-							<c:out value="${info.vntNmbr }" />
+							<c:out value="${info.vntYear }" />형제<c:out value="${info.vntNmbr }" />
 						</td>
 					</tr>
 					<tr>

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

@@ -300,7 +300,7 @@
 									<c:out value="${reqPnttm }" />
 								</td>							
 								<td>									
-									<c:out value="${list.vntNmbr }" />
+									<c:out value="${list.vntYear }" />형제<c:out value="${list.vntNmbr }" />
 								</td>
 								<td>									
 									<c:out value="${list.cmptntAthrt }" />

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

@@ -274,7 +274,8 @@
 					<tr>
 						<th scope="row">사건번호</th>
 						<td>
-							<input type="text" name="vntNmbr" value="<c:out value="${info.vntNmbr }" />" />
+							<input type="text" name="vntYear" style="width: 150px;margin-right: 10px;" value="<c:out value="${info.vntYear }" />"/>형제
+							<input type="text" name="vntNmbr" style="width: 150px;margin-left: 10px;" value="<c:out value="${info.vntNmbr }" />"/>
 						</td>
 					</tr>
 					<tr>

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

@@ -92,6 +92,13 @@
 		        return true;
 		    }
 
+		    // 사건번호 검사
+		    if($("input[name='vntYear']").val().trim() == ""){
+		        alert("사건번호를 입력해주세요.");
+		        $("input[name='vntYear']").focus();
+		        return true;
+		    }
+		    
 		    // 사건번호 검사
 		    if($("input[name='vntNmbr']").val().trim() == ""){
 		        alert("사건번호를 입력해주세요.");
@@ -134,11 +141,11 @@
 		    }
 
 		    // 의뢰상태 검사
-		    if($("#reqStateCd").val().trim() == ""){
+		    /* if($("#reqStateCd").val().trim() == ""){
 		        alert("의뢰상태를 입력해주세요.");
 		        $("input[name='reqStateCd']").focus();
 		        return true;
-		    }
+		    } */
 
 		    // 교육상태 검사
 /* 		    if($("input[name='eduStateCd']").val().trim() == ""){
@@ -225,7 +232,8 @@
 					<tr>
 						<th scope="row">사건번호</th>
 						<td>
-							<input type="text" name="vntNmbr" />
+							<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>
@@ -280,10 +288,12 @@
 					<tr>
 						<th scope="row">교육상태</th>
 						<td>
-							<ve:select codeId="VEA002" name="eduStateCd" id="eduStateCd" css="class='sel_type1'" 
+							교육대기
+							<input type="hidden" name="eduStateCd" id="eduStateCd" value="10"/>
+							<%-- <ve:select codeId="VEA002" name="eduStateCd" id="eduStateCd" css="class='sel_type1'" 
 							selectedText="" defaultValue=""
 							defaultText='선택'
-							/>
+							/> --%>
 						</td>
 						<th scope="row">검사명</th>
 						<td>