Merge branch 'hylee' into advc

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

@@ -2,6 +2,8 @@ package kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service;
 
 import java.util.List;
 
+import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO;
+
 
 public interface CndtnTrgtMngService {
 
@@ -17,6 +19,8 @@ public interface CndtnTrgtMngService {
 
 	int findCntreqNmber(String reqNmbrTemp);
 
+	void updateTrgtDuplAjax(CndtnTrgtMngVO cndtnTrgtInfoMngVO);
+
 	
 	
 	

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

@@ -46,6 +46,7 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable {
 
 
 	private List<String> searchSelStatusList;
+	private List<String> sspnIdtmtTrgtOrdList;
 	
 	
 	
@@ -217,6 +218,12 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable {
 	public void setDBirth(String dBirth) {
 		DBirth = dBirth;
 	}
+	public List<String> getSspnIdtmtTrgtOrdList() {
+		return sspnIdtmtTrgtOrdList;
+	}
+	public void setSspnIdtmtTrgtOrdList(List<String> sspnIdtmtTrgtOrdList) {
+		this.sspnIdtmtTrgtOrdList = sspnIdtmtTrgtOrdList;
+	}
 	
 	
 	

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

@@ -125,5 +125,9 @@ public class CndtnTrgtMngDAO extends EgovAbstractDAO {
 		return (int) select("cndtnTrgtInfoMngDAO.findCntreqNmber", reqNmbrTemp);
 	}
 
+	public void updateTrgtDuplAjax(CndtnTrgtMngVO cndtnTrgtMngVO) {
+		update("cndtnTrgtInfoMngDAO.updateTrgtDuplAjax", cndtnTrgtMngVO);
+	}
+
 	
 }

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

@@ -57,6 +57,12 @@ public class CndtnTrgtMngServiceImpl implements CndtnTrgtMngService {
 	public int findCntreqNmber(String reqNmbrTemp) {
 		return cndtnTrgtInfoMngDAO.findCntreqNmber(reqNmbrTemp);
 	}
+
+	@Override
+	public void updateTrgtDuplAjax(CndtnTrgtMngVO cndtnTrgtInfoMngVO) {
+		cndtnTrgtInfoMngDAO.updateTrgtDuplAjax(cndtnTrgtInfoMngVO);
+		
+	}
   /*  
     //C
 	public void insert(VEPrcsDetailVO vEPrcsDetailVO) throws Exception {

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

@@ -704,6 +704,44 @@ public class CndtnTrgtMngController {
 		return "oprtn/cndtnSspnIdtmt/trgtCmpltDetail";
 	}
 
+	
+	@RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/updateTrgtDuplAjax.do")
+	public ModelAndView updateEduAplctAprvlCd(
+			@ModelAttribute("vEPrcsDetailVO") CndtnTrgtMngVO cndtnTrgtInfoMngVO
+			, ModelMap model 
+			, HttpServletRequest request 
+			) throws Exception {
+		
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("jsonView");
+		//로그인 처리====================================
+		//로그인 정보 가져오기
+		String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model);
+		if (!"".equals(s_oprtnLoginCheckNInfo))	{
+			modelAndView.addObject("result", "loginFail");
+			return modelAndView;		
+		}
+		//로그인 처리==================================== 
+		
+		LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기
+		
+		try {
+			// 교육 신청 테이블에 신청자 상태값 update 
+//			vEAPrcsAplctPrdInstrAsgnmService.udpateAprvlCdEduAplct(vEPrcsDetailVO);
+			cndtnTrgtInfoMngService.updateTrgtDuplAjax(cndtnTrgtInfoMngVO);
+			
+			modelAndView.addObject("result", "success");
+
+		} catch (Exception ex) {
+			ex.printStackTrace();
+			modelAndView.addObject("result", "");
+		}
+		
+		
+		return modelAndView;
+		
+	}
+	
     /**
      * 조건부기소유예과정 수정화면
      */

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

@@ -140,6 +140,20 @@
 			sspn_idtmt_trgt_ord = #sspnIdtmtTrgtOrd#
 	</update>
 
+	<update id="cndtnTrgtInfoMngDAO.updateTrgtDuplAjax" parameterClass="CndtnPrcsInfoMngVO">
+		/* cndtnTrgtInfoMngDAO.updateTrgtDuplAjax */
+		
+		UPDATE 
+			<include refid="CndtnTrgtInfoMngDAO.table_name"/> 
+		SET	
+			edu_state_cd					= #eduStateCd#
+			, prcs_aplct_prd_ord_cmplt		= #sspnIdtmtTrgtOrd#
+		WHERE SSPN_IDTMT_TRGT_ORD IN
+		<iterate property="sspnIdtmtTrgtOrdList" open="(" close=")" conjunction=",">
+			#sspnIdtmtTrgtOrdList[]#
+		</iterate>
+	</update>
+		
 	<select id="cndtnTrgtInfoMngDAO.findCntreqNmber" resultClass="int" parameterClass="String">
 		SELECT
 			count(*)

src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml

@@ -6036,6 +6036,7 @@ VALUES
 			vea_aplct_detail_info
 		SET
 			aplct_state_cd = #aplctStateCd#
+			, aplct_pnttm = SYSDATE
 			, last_updusr_id = #lastUpdusrId#
 			, last_updt_pnttm = SYSDATE
 		WHERE

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

@@ -75,6 +75,7 @@
 			  prcs_aplct_prd_ord
 			, edu_aplct_ord
 			, aplct_state_cd
+			, aplct_pnttm
 			, frst_regist_pnttm
 			, frst_register_id
 		)
@@ -84,6 +85,7 @@
 			, #eduAplctOrd#
 			, #aplctStateCd#
 			, SYSDATE
+			, SYSDATE
 			, #frstRegisterId#
 		)
 	</insert>
@@ -106,6 +108,7 @@
 	
 		UPDATE vea_aplct_detail_info SET 
 			aplct_state_cd = #aplctStateCd#
+			, aplct_pnttm = SYSDATE
 		WHERE 
 			edu_aplct_ord = #eduAplctOrd#
 			AND prcs_aplct_prd_ord = #prcsAplctPrdOrd#
@@ -133,6 +136,7 @@
 		
 	    UPDATE VEA_APLCT_DETAIL_INFO
 	    SET aplct_state_cd = #aplctStateCd#
+			,aplct_pnttm = SYSDATE
 	    	,last_updusr_id = #lastUpdusrId#
 	    	,last_updt_pnttm = sysdate
 	    WHERE edu_aplct_ord IN 

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

@@ -45,6 +45,58 @@
 		form.submit();
 	}
 
+
+	// 체크박스O
+	function fnUpdate(){
+		
+	       var sspnIdtmtTrgtOrdList = [];
+	        
+	        // "chk" 이름을 가진 체크박스가 체크된 항목들을 순회
+	        $("input[name='chk']:checked").each(function() {
+	            var sspnIdtmtTrgtOrd = $(this).val();
+	            sspnIdtmtTrgtOrdList.push(sspnIdtmtTrgtOrd);
+	        });
+	        
+	        // 선택된 항목이 없으면 경고 메시지를 표시하고 함수를 종료
+	        if (sspnIdtmtTrgtOrdList.length === 0) {
+	            alert("선택된 항목이 없습니다. 선택 후 다시 시도하세요.");
+	            return false;
+	        }
+	        
+	        var dataToSend = {
+	                "sspnIdtmtTrgtOrdList": sspnIdtmtTrgtOrdList
+	                , "eduStateCd" : "20"
+	                , "sspnIdtmtTrgtOrd" : $('#sspnIdtmtTrgtOrd').val()
+	            };
+	        
+
+// 			var url = "<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/updateEduAplctAprvlCdAjax.do'/>";
+			var url = "<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/updateTrgtDuplAjax.do'/>";
+			
+			
+			// AJAX 호출을 통해 서버에 데이터 전송
+			$.ajax({
+				type:"POST",
+				url: url,
+				data: $.param(dataToSend, true), // 직렬화 , 컨트롤러에서 @ModelAttribute로 받을 수 있음
+//	 			contentType : 'application/json',
+				dataType:'json',
+				success:function(returnData){
+					if(returnData.result == "success"){
+						alert("변경 처리 되었습니다.");	
+						window.location.reload();
+					}else{
+						alert("변경 중 오류가 발생하였습니다.");
+					}						
+				},
+				error: function(jqXHR, textStatus, errorThrown) {
+				    console.error("AJAX Error:", textStatus, errorThrown);
+				    console.error("Response:", jqXHR.responseText);
+				}
+			});
+	}
+
+	
 </script>
 
 </head>
@@ -54,7 +106,7 @@
 	<input type="hidden" name="trgtNm" value=""/>
 	<input type="hidden" name="dBirth" value=""/>
 </form:form>
-<input type="hidden" name="sspnIdtmtTrgtOrd" value="<c:out value='${info.sspnIdtmtTrgtOrd}'/>"/>
+<input type="hidden" name="sspnIdtmtTrgtOrd" id="sspnIdtmtTrgtOrd" value="<c:out value='${info.sspnIdtmtTrgtOrd}'/>"/>
 <!-- cont -->
 <div class="cont_wrap">
 	<div class="box">
@@ -216,10 +268,17 @@
 					</div>
 				</div>
 			</div>
+			
+				<div class="btn_wrap btn_layout01" style="margin: 0px 0px 30px 10px;">
+					<div class="btn_left">
+						<button type="button" class="btn_type04" onclick="fnUpdate(); return false;">중복자 이수 처리</button>
+					</div>
+				</div>
 				<!-- list -->
 			<div class="tb_type01">
 				<table>
 					<colgroup>
+						<col style="width: 2px">
 						<col style="width: 10%">
 						<col style="width: 10%">
 						<col style="width: 2px">
@@ -234,6 +293,7 @@
 					</colgroup>
 					<thead>
 					<tr>
+						<th></th>
 						<th>의뢰일</th>
 						<th>사건번호</th>
 						<th>관할청</th>
@@ -249,10 +309,17 @@
 					</thead>
 					<tbody>
 					<c:forEach var="list" items="${list}" varStatus="status">
-						<tr class="listCount" onclick="fncGoDetail('<c:out value="${list.sspnIdtmtTrgtOrd}"/>');" style="cursor:pointer;">
+<%-- 						<tr class="listCount" onclick="fncGoDetail('<c:out value="${list.sspnIdtmtTrgtOrd}"/>');" style="cursor:pointer;"> --%>
+						<tr>
 <%-- 								<td onclick="fncGoDetail('<c:out value="${list.sspnIdtmtTrgtOrd}"/>');" style="cursor:pointer;"> --%>
 <%-- 									<c:out value='${list.prcsNm}'/>									 --%>
 <!-- 								</td> -->
+							<td>
+								<c:if test="${list.eduStateCd ne 20}">
+									<input name="chk" 
+									value="${list.sspnIdtmtTrgtOrd}" title="Check" type="checkbox"/>
+								</c:if>
+							</td>							
 							<td>
 								<c:set var="reqPnttm" value="${fn:substring(list.reqPnttm, 0, 10)}" />
 <%-- 									<fmt:formatDate value="${list.reqPnttm }" pattern="yyyy-MM-dd" />									 --%>
@@ -293,7 +360,7 @@
 						</tr>
 					</c:forEach>
 					<c:if test="${empty list}">
-						<tr><td colspan="11"><spring:message code="common.nodata.msg" /></td></tr>
+						<tr><td colspan="12"><spring:message code="common.nodata.msg" /></td></tr>
 					</c:if>
 					</tbody>
 				</table>