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

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

@@ -1030,6 +1030,70 @@ public class CndtnPrcsInfoMngController {
 
         
 
+        return modelAndView;
+
+    }	
+	
+	/** 
+	 * @methodName	: updateAplctStateCdAjax 
+	 * @author		: 이호영
+	 * @date		: 2024.01.11 
+	 * @description	: 연기상태 udpate
+	 * @param vEEduAplctVO
+	 * @param model
+	 * @param request
+	 * @return
+	 * @throws Exception 
+	 */
+	@RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/updateAplctStateCdOnlyAjax.do")
+	public ModelAndView updateAplctStateCdOnlyAjax(
+			@ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO
+			, ModelMap model
+			, HttpServletRequest request
+			) throws Exception {
+		
+		ModelAndView modelAndView = new ModelAndView("jsonView");
+		
+		try {
+			//로그인 처리====================================
+			//로그인 정보 가져오기
+			
+			String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model);
+			if (!"".equals(s_oprtnLoginCheckNInfo))	{
+				modelAndView.addObject("result", "loginFail");
+				return modelAndView;		
+			}
+			
+			//로그인 처리==================================== 
+			LoginVO loginVO = checkLoginUtil.getAuthLoginVO();				//권한에 따른 로그인 정보 가져오기
+			SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request);	//SSO 로그인 정보 가져오기
+			
+			// 기소유예 대상자 상태값 udpate
+			vEEduMIXService.updateEduStateCd(vEEduAplctVO);
+			
+			
+			// 알림 영역
+			// 알림 영역
+			// 알림 영역
+			List<String> eduAplctOrdList = new ArrayList<String>();
+			eduAplctOrdList.add(vEEduAplctVO.getEduAplctOrd());
+			vEEduAplctVO.setEduAplctOrdList(eduAplctOrdList);
+			notifyManageService.insertNotifyAprvlCd5060CmpltForUser(
+					loginVO
+					, vEEduAplctVO.getPrcsAplctPrdOrd()
+					, vEEduAplctVO.getLctrDivCd()
+					, vEEduAplctVO.getEduAplctOrdList()
+					, vEEduAplctVO.getAplctStateCd()
+					);
+			
+			modelAndView.addObject("result", "success");
+		} catch (Exception e) {
+			modelAndView.addObject("result", "");
+		}
+		
+		
+		
+		
 		return modelAndView;
 		
 	}	

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

@@ -337,6 +337,7 @@
 		SELECT			
 			qe.QESTNR_ID AS qestnrId , /* 설문했으면 ID가 있음 */
 			vadi.APLCT_STATE_CD AS aplctStateCd,  /* 이수 상태 */
+			vsit.edu_state_cd AS eduStateCd,
 			le.MBER_NM AS userNm,
 			<include refid="VEEduMIXDAO.select_column_name"/>,
 			vsit.trgt_nm AS trgtNm,

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

@@ -135,6 +135,41 @@
 			
 	}
 	
+	function fn_statusOnlyChg(eduStateCd, sspnIdtmtTrgtOrd){
+
+		document.statusChgForm.eduStateCd.value = eduStateCd ;
+		document.statusChgForm.sspnIdtmtTrgtOrd.value = sspnIdtmtTrgtOrd ;
+		
+		console.log(document.statusChgForm.aplctStateCd.value);
+		console.log(document.statusChgForm.sspnIdtmtTrgtOrd.value );
+		
+		var data = new FormData(document.getElementById("statusChgForm"));
+			if(confirm("상태변경을 하시겠습니까?")){
+				var url = "<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/updateAplctStateCdOnlyAjax.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);
+					}
+				});
+			}
+			event.stopImmediatePropagation();
+	}
+	
 
 
 	// 강사 배치
@@ -599,12 +634,20 @@
 											<c:out value="${list.phone}"/>
 										</td>
 										<td>
-											<!--10 미이수, 20 이수  -->
+											<c:choose>
+												<c:when test="${list.eduStateCd eq 50 }">
+													<ve:code codeId="VEA002" code="${list.eduStateCd}"/>
+												</c:when>
+												<c:otherwise>	
+		<!-- 											10 미이수, 20 이수  -->
 													<ve:code codeId="VEA003" code="${list.aplctStateCd}"/>
+												</c:otherwise>
+											</c:choose>
 										</td>
 										<td>
 											<button type="button" class="btn_type04" onclick="fn_statusChg('20', '<c:out value="${list.eduAplctOrd }" />', '<c:out value="${list.sspnIdtmtTrgtOrd }"/>')">이수</button>
 											<button type="button" class="btn_type05" onclick="fn_statusChg('10', '<c:out value="${list.eduAplctOrd }" />', '<c:out value="${list.sspnIdtmtTrgtOrd }"/>')">미이수</button>
+											<button type="button" class="btn_type03" onclick="fn_statusOnlyChg('50', '<c:out value="${list.sspnIdtmtTrgtOrd }"/>')">연기</button>
 										</td>
 										<td>
 <%-- 											<c:choose> --%>