이지우 - 취소요청처리 수정 중

src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java

@@ -800,7 +800,8 @@ public class SspnIdtmtController {
 		 */
 		@RequestMapping("/web/ve/aplct/sspnIdtmt/popup/eduCancelPopupAjax.do")	
 	    public ModelAndView filePopupAjax(
-	    		@ModelAttribute("vEEduRprtVO") VEEduRprtVO vEEduRprtVO
+	    		@ModelAttribute("vEEduRprtVO") VEEduRprtVO vEEduRprtVO,
+	    		@ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO
 	    		, ModelMap model
 	    		//, RedirectAttributes redirectAttributes    
 	    		, HttpServletRequest request
@@ -868,16 +869,27 @@ public class SspnIdtmtController {
 	    		System.out.println(vEEduRprtVO.getAprvlCn());
 	    		System.out.println(s_atchFileId);
 	    		
-	    		VEEduAplctVO vEEduAplctVO	=	new	VEEduAplctVO();
+				/*
-	    		vEEduAplctVO.setEduAplctOrd(vEEduRprtVO.getEduAplctOrd());
+				 * VEEduAplctVO vEEduAplctVO = new VEEduAplctVO();
+				 * vEEduAplctVO.setEduAplctOrd(vEEduRprtVO.getEduAplctOrd());
+				 * 
+				 * vEEduAplctVO.setAplctCn(vEEduRprtVO.getAprvlCn());
+				 * vEEduAplctVO.setRsltAtchFileId(s_atchFileId);
+				 * vEEduAplctVO.setAprvlCd("35");
+				 * vEEduAplctVO.setLastUpdusrId(loginVO.getUniqId());
+				 * vEEduAplctService.update(vEEduAplctVO);
+				 */
 	    		
-	    		vEEduAplctVO.setAplctCn(vEEduRprtVO.getAprvlCn());
+	    		/*
-	    		vEEduAplctVO.setRsltAtchFileId(s_atchFileId);
+	    		251023
-	    		vEEduAplctVO.setAprvlCd("35");	    		
+	    		ve_edu_aplct는 확정 상태 유지.
-	    		vEEduAplctVO.setLastUpdusrId(loginVO.getUniqId());
+	    		vea_aplct_detail_info에서 취소 관련 처리
+	    		*/
+	    		vEEduAplctVO.setAplctStateCd(VeConstants.EDU_CD_CANCLE_REQ); //취소요청 코드 35
+	    		vEEduAplctVO.setCnclAtchFileId(s_atchFileId);
+	    		vEEduAplctVO.setCnclCn(vEEduAplctVO.getAprvlCn()); //취소사유 - 기존에는 aprvlCn 사용
+	    		vEEduMIXService.updateCnclStatus(vEEduAplctVO);
 	    		
-	    		//취소요청 정보 저장
-	    		vEEduAplctService.update(vEEduAplctVO);
 	    		
 	        
 	    	}catch(Exception ex) {

src/main/java/kcc/ve/cmm/VeConstants.java

@@ -253,6 +253,14 @@ public class VeConstants {
     public static final String DDLN_CD_APP_ING = "40";
     public static final String DDLN_CD_APP_END = "50";
     
+    /*
+     * VEA003 - edu_state_cd(vea_sspn_idmt_trgt), aplct_state_cd(vea_aplct_detail_info)
+     */
+    public static final String EDU_CD_NOTCOMPLETE= "10";	//미이수
+    public static final String EDU_CD_COMPLETE = "20";		//이수
+    public static final String EDU_CD_CANCLE_REQ  = "35";	//취소요청
+    public static final String EDU_CD_DELAY = "60";			//연기
+    
     
 
 }

src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java

@@ -128,4 +128,6 @@ public interface VEEduMIXService {
 	List<VEEduAplctVO> selectTngrRsltRprtList(VEEduAplctVO paramVO) throws Exception;
 	
 	List<VEEduAplctVO> selectExprnRsltFileDownList(VEEduAplctVO paramVO) throws Exception;
+	
+	void updateCnclStatus(VEEduAplctVO vEEduAplctVO);
 }

src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java

@@ -277,4 +277,10 @@ public class VEEduMIXServiceImpl implements VEEduMIXService {
 	public List<VEEduAplctVO> selectExprnRsltFileDownList(VEEduAplctVO paramVO) throws Exception{
 		return vEEduMIXDAO.selectExprnRsltFileDownList(paramVO);
 	}
+	
+	@Override
+	public void updateCnclStatus(VEEduAplctVO paramVO) {
+		vEEduMIXDAO.updateCnclStatus(paramVO);
+		
+	}	
 }

src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp

@@ -609,7 +609,7 @@
 			</c:if>
 			
 			<c:if test="${prcsAplctVO.aprvlCd eq '60' and prcsAplctVO.ddlnCd eq '20'}">
-<%-- 				<button type="button" class="btnType05" onclick="fncCancelStatusChange('${infoAplctOrd.eduAplctOrd}', '${infoAplctOrd.prcsOrd}', '6-1')">취소요청</button> --%>
+				<button type="button" class="btnType05" onclick="fncCancelStatusChange('${infoAplctOrd.eduAplctOrd}', '${infoAplctOrd.prcsOrd}', '6-1')">취소요청</button>
 			</c:if>
 		
 		</div>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp

@@ -254,7 +254,7 @@
 						</td>
 						<td>
 							<kc:code codeId="VE0003" code="${list.aprvlCd}"/>
-							<c:if test="${list.aprvlCd eq '60'}">
+							<c:if test="${list.aprvlCd eq '60' and not empty list.aplctStateCd}">
 								- <kc:code codeId="VEA003" code="${list.aplctStateCd}"/>
 							</c:if>
 							

src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduCancelPop.jsp

@@ -141,6 +141,7 @@
 <form:form id="createForm" name="createForm" method="post" commandName="vEEduRprtVO" onsubmit="return false;">
 	<input type="hidden" name="eduAplctOrd" value="<c:out value="${vEInstrAsgnmVO.eduAplctOrd}" />" />
 	<input type="hidden" name="eduChasiOrd" value="<c:out value="${vEInstrAsgnmVO.eduChasiOrd}" />" />
+	<input type="hidden" name="prcsAplctPrdOrd" value="<c:out value="${vEInstrAsgnmVO.prcsAplctPrdOrd}" />" />
 	<input type="hidden" id="userId" name="userId" value="<c:out value="${vEInstrAsgnmVO.userId}" />" />
 	<input type="hidden" name="sbmtYn" id="sbmtYn" value="" />
 	<input type="hidden" name="limitcount" id="limitcount" value="1" /><!-- 최대 업로드 파일갯수 -->