Merge branch 'hylee' into advc

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

@@ -21,6 +21,8 @@ public interface CndtnTrgtMngService {
 
 	void updateTrgtDuplAjax(CndtnTrgtMngVO cndtnTrgtInfoMngVO);
 
+	void updateDel(CndtnTrgtMngVO cndtnTrgtInfoMngVO);
+
 	
 	
 	

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

@@ -129,5 +129,9 @@ public class CndtnTrgtMngDAO extends EgovAbstractDAO {
 		update("cndtnTrgtInfoMngDAO.updateTrgtDuplAjax", cndtnTrgtMngVO);
 	}
 
+	public void updateDel(CndtnTrgtMngVO cndtnTrgtInfoMngVO) {
+		update("cndtnTrgtInfoMngDAO.updateDel", cndtnTrgtInfoMngVO);
+	}
+
 	
 }

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

@@ -63,65 +63,10 @@ public class CndtnTrgtMngServiceImpl implements CndtnTrgtMngService {
 		cndtnTrgtInfoMngDAO.updateTrgtDuplAjax(cndtnTrgtInfoMngVO);
 		
 	}
-  /*  
-    //C
-	public void insert(VEPrcsDetailVO vEPrcsDetailVO) throws Exception {
-		
-
-    	String prcsAplctPrdOrd = prcsAplctPrdGnrService.getNextStringId(); // 고유ID 
-    	vEPrcsDetailVO.setPrcsAplctPrdOrd(prcsAplctPrdOrd);
-    	vEPrcsDetailVO.setLctrDivCd("50");	//강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부
-    	//vEPrcsDetailVO.setUseYn("Y");
-		
-		vEPrcsAplctPrdDAO.insert(vEPrcsDetailVO);
-	}
-
-	//R
-	public VEPrcsDetailVO selectDetail(VEPrcsDetailVO paramVO) throws Exception {
-		return vEPrcsAplctPrdDAO.selectDetail(paramVO);
-	}
-	
-	//U
-	public int update(VEPrcsDetailVO paramVO) throws Exception{
-		vEPrcsAplctPrdDAO.update(paramVO);
-		return  vEPrcsDAO.update(paramVO);
-	}
-		
-	//D
-	public int delete(VEPrcsDetailVO paramVO) throws Exception{
-		return  vEPrcsAplctPrdDAO.delete(paramVO);
-	}	
-
-	//List
-	public List<VEPrcsDetailVO> selectList(VEPrcsDetailVO paramVO) throws Exception{
-		return vEPrcsAplctPrdDAO.selectList(paramVO);
-	}
-	
-	public List<VEPrcsDetailVO> selectList4Fndth(VEPrcsDetailVO paramVO) throws Exception{
-		return vEPrcsAplctPrdDAO.selectList4Fndth(paramVO);
-	}
-
-	//paging List
-	public List<VEPrcsDetailVO> selectPagingList(VEPrcsDetailVO paramVO) throws Exception{
-		return vEPrcsAplctPrdDAO.selectPagingList(paramVO);
-	}
-	
-	public List<VEPrcsDetailVO> selectPagingList4Fndth(VEPrcsDetailVO paramVO) throws Exception{
-		return vEPrcsAplctPrdDAO.selectPagingList4Fndth(paramVO);
-	}	
-	
-	//R
-	public VEPrcsDetailVO selectDetailNewOne(VEPrcsDetailVO paramVO) throws Exception {
-		return vEPrcsAplctPrdDAO.selectDetailNewOne(paramVO);
-	}
-	
-	public VEPrcsDetailVO selectDetailNewOne4Fndth(VEPrcsDetailVO paramVO) throws Exception {
-		return vEPrcsAplctPrdDAO.selectDetailNewOne4Fndth(paramVO);
-	}
 
 	@Override
-	public List<VEInstrDetailVO> selectinstrAsgnmPopupPagingList(VEPrcsDetailVO vEPrcsDetailVO) {
+	public void updateDel(CndtnTrgtMngVO cndtnTrgtInfoMngVO) {
-		return vEPrcsAplctPrdDAO.selectinstrAsgnmPopupPagingList(vEPrcsDetailVO);
+		cndtnTrgtInfoMngDAO.updateDel(cndtnTrgtInfoMngVO);
-	}*/
+	}
 
 }

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

@@ -664,6 +664,32 @@ public class CndtnTrgtMngController {
 
 		return "oprtn/cndtnSspnIdtmt/trgtDetail";
 	}
+
+	/**
+	 * 조건부기소유예과정 등록
+	 */
+	@RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/delUpdateAjax.do")
+	public ModelAndView delUpdateAjax(
+			@ModelAttribute("cndtnTrgtInfoMngVO") CndtnTrgtMngVO cndtnTrgtInfoMngVO
+			, ModelMap model
+			, HttpServletRequest request
+			) throws Exception {
+		
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("jsonView");
+		
+		//로그인 처리====================================
+		//로그인 정보 가져오기
+		cndtnTrgtInfoMngService.updateDel(cndtnTrgtInfoMngVO);
+		
+		
+		
+		modelAndView.addObject("result", "success");
+		
+		return modelAndView;
+		
+	}
+	
 	/**
 	 * 조건부기소유예과정 수료자 상세화면
 	 */
@@ -689,13 +715,12 @@ public class CndtnTrgtMngController {
 		
 
 		List<CndtnTrgtMngVO> cndtnTrgtInfoMngVOList = new ArrayList<CndtnTrgtMngVO>();
-		System.out.println(StringUtils.isEmpty(cndtnTrgtInfoMngVO.getTrgtNm()) || StringUtils.isEmpty(cndtnTrgtInfoMngVO.getDBirth()));
-		System.out.println("StringUtils.isEmpty(cndtnTrgtInfoMngVO.getTrgtNm()) : "+ StringUtils.isEmpty(cndtnTrgtInfoMngVO.getTrgtNm()));
-		System.out.println("StringUtils.isEmpty(cndtnTrgtInfoMngVO.getdBirth()) : "+ StringUtils.isEmpty(cndtnTrgtInfoMngVO.getDBirth()));
 		if(StringUtils.isNotEmpty(cndtnTrgtInfoMngVO.getTrgtNm()) || StringUtils.isNotEmpty(cndtnTrgtInfoMngVO.getDBirth()))
 		{
 			cndtnTrgtInfoMngVO.setFirstIndex(0);
 			cndtnTrgtInfoMngVO.setRecordCountPerPage(100000);
+//			String selectCondition = "AND PRCS_APLCT_PRD_ORD_CMPLT is not null ";
+//			cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
 			cndtnTrgtInfoMngVOList = cndtnTrgtInfoMngService.selectPagingList(cndtnTrgtInfoMngVO);
 		}
     	model.addAttribute("list", cndtnTrgtInfoMngVOList);

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

@@ -64,6 +64,7 @@
 			, 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        
 	</sql>
 	
 	
@@ -147,12 +148,25 @@
 			<include refid="CndtnTrgtInfoMngDAO.table_name"/> 
 		SET	
 			edu_state_cd					= #eduStateCd#
-			, prcs_aplct_prd_ord_cmplt		= #sspnIdtmtTrgtOrd#
+			, prcs_aplct_prd_ord_cmplt		= #prcsAplctPrdOrdCmplt#
 		WHERE SSPN_IDTMT_TRGT_ORD IN
 		<iterate property="sspnIdtmtTrgtOrdList" open="(" close=")" conjunction=",">
 			#sspnIdtmtTrgtOrdList[]#
 		</iterate>
 	</update>
+
+	<update id="cndtnTrgtInfoMngDAO.updateDel" parameterClass="CndtnPrcsInfoMngVO">
+		/* cndtnTrgtInfoMngDAO.updateDel */
+		
+		UPDATE 
+			<include refid="CndtnTrgtInfoMngDAO.table_name"/> 
+		SET	
+			edu_state_cd					= #eduStateCd#
+			, prcs_aplct_prd_ord_cmplt		= null
+		WHERE 
+			SSPN_IDTMT_TRGT_ORD = #sspnIdtmtTrgtOrd#
+			
+	</update>
 		
 	<select id="cndtnTrgtInfoMngDAO.findCntreqNmber" resultClass="int" parameterClass="String">
 		SELECT

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

@@ -66,14 +66,16 @@
 	        var dataToSend = {
 	                "sspnIdtmtTrgtOrdList": sspnIdtmtTrgtOrdList
 	                , "eduStateCd" : "20"
-	                , "sspnIdtmtTrgtOrd" : $('#sspnIdtmtTrgtOrd').val()
+	                , "prcsAplctPrdOrdCmplt" : $('#prcsAplctPrdOrdCmplt').val()
 	            };
 	        
 
 // 			var url = "<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/updateEduAplctAprvlCdAjax.do'/>";
 			var url = "<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/updateTrgtDuplAjax.do'/>";
 			
-			
+			if(!confirm("이수처리 진행하시겠습니까?")){
+				return false;
+			}  
 			// AJAX 호출을 통해 서버에 데이터 전송
 			$.ajax({
 				type:"POST",
@@ -96,17 +98,55 @@
 			});
 	}
 
-	
+
+	function fncDel(sspnIdtmtTrgtOrd){
+
+		var listForm = document.delForm ;
+		delForm.sspnIdtmtTrgtOrd.value=sspnIdtmtTrgtOrd;
+		var data = new FormData(document.getElementById("delForm"));
+
+		
+		if(confirm("이수 처리를 삭제하시겠습니까?")){
+			var url = "<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/delUpdateAjax.do'/>";
+			$.ajax({
+				type:"POST",
+				url: url,
+				data: data,
+				dataType:'json',
+				async: false,
+				processData: false,
+				contentType: false,
+				cache: false,
+				success:function(returnData){
+						if(returnData.result == "success"){
+						alert("수정되었습니다.");
+						window.location.reload();
+					}
+				},
+				error:function(request , status, error){
+					alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+				}
+			});
+		}
+		
+	}
+
 </script>
 
 </head>
 <body>
+<form id="delForm" name="delForm">
+	<input type="hidden" name="sspnIdtmtTrgtOrd" value=""/>
+	<input type="hidden" name="eduStateCd" value="10"/>
+
+</form>
 <form:form id="listForm" name="listForm" commandName="vEPrcsDetailVO" method="post">
 	<input type="hidden" name="sspnIdtmtTrgtOrd" value="<c:out value='${info.sspnIdtmtTrgtOrd}'/>"/>
 	<input type="hidden" name="trgtNm" value=""/>
 	<input type="hidden" name="dBirth" value=""/>
 </form:form>
 <input type="hidden" name="sspnIdtmtTrgtOrd" id="sspnIdtmtTrgtOrd" value="<c:out value='${info.sspnIdtmtTrgtOrd}'/>"/>
+<input type="hidden" name="prcsAplctPrdOrdCmplt" id="prcsAplctPrdOrdCmplt" value="<c:out value='${info.prcsAplctPrdOrdCmplt}'/>"/>
 <!-- cont -->
 <div class="cont_wrap">
 	<div class="box">
@@ -315,10 +355,15 @@
 <%-- 									<c:out value='${list.prcsNm}'/>									 --%>
 <!-- 								</td> -->
 							<td>
-								<c:if test="${list.eduStateCd ne 20}">
+								<c:choose>
+								<c:when test="${list.eduStateCd ne 20}">
 									<input name="chk" 
 									value="${list.sspnIdtmtTrgtOrd}" title="Check" type="checkbox"/>
-								</c:if>
+								</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)}" />