tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jiwoo'

Browse Source
This commit is contained in:
JIWOO 2025-10-30 12:34:31 +09:00
commit b4a20fcf77
7 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/kcc/ve/aplct/cmdTrgt/web/CmdTrgtController.java
View File

@ -817,7 +817,8 @@ public class CmdTrgtController {
*/
@RequestMapping("/web/ve/aplct/cmdTrgt/popup/eduCancelPopupAjax.do")
public ModelAndView filePopupAjax(
@ModelAttribute("vEEduRprtVO") VEEduRprtVO vEEduRprtVO
@ModelAttribute("vEEduRprtVO") VEEduRprtVO vEEduRprtVO,
@ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO
, ModelMap model
//, RedirectAttributes redirectAttributes
, HttpServletRequest request
@ -879,7 +880,7 @@ public class CmdTrgtController {
//step2.파일 처리====================================
try {
/*
System.out.println("vEEduRprtVO.getAprvlCn()");
System.out.println(vEEduRprtVO.getEduAplctOrd());
System.out.println(vEEduRprtVO.getAprvlCn());
@ -895,7 +896,16 @@ public class CmdTrgtController {
//취소요청 정보 저장
vEEduAplctService.update(vEEduAplctVO);
*/
/*
251023
ve_edu_aplct는 확정 상태 유지.
vea_aplct_detail_info에서 취소 관련 처리
*/
vEEduAplctVO.setAplctStateCd(VeConstants.EDU_CD_CANCLE_REQ); //취소요청 코드 35
vEEduAplctVO.setCnclAtchFileId(s_atchFileId);
vEEduAplctVO.setCnclCn(vEEduAplctVO.getAprvlCn()); //취소사유 - 기존에는 aprvlCn 사용
vEEduMIXService.updateCnclStatus(vEEduAplctVO);
}catch(Exception ex) {
System.out.println("Exception vEEduRsltRprtService.insert");

15
src/main/java/kcc/ve/aplct/prevent/web/PreventController.java
View File

@ -817,7 +817,8 @@ public class PreventController {
*/
@RequestMapping("/web/ve/aplct/prevent/popup/eduCancelPopupAjax.do")
public ModelAndView filePopupAjax(
@ModelAttribute("vEEduRprtVO") VEEduRprtVO vEEduRprtVO
@ModelAttribute("vEEduRprtVO") VEEduRprtVO vEEduRprtVO,
@ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO
, ModelMap model
//, RedirectAttributes redirectAttributes
, HttpServletRequest request
@ -879,7 +880,7 @@ public class PreventController {
//step2.파일 처리====================================
try {
/*
System.out.println("vEEduRprtVO.getAprvlCn()");
System.out.println(vEEduRprtVO.getEduAplctOrd());
System.out.println(vEEduRprtVO.getAprvlCn());
@ -895,7 +896,17 @@ public class PreventController {
//취소요청 정보 저장
vEEduAplctService.update(vEEduAplctVO);
*/
/*
251023
ve_edu_aplct는 확정 상태 유지.
vea_aplct_detail_info에서 취소 관련 처리
*/
vEEduAplctVO.setAplctStateCd(VeConstants.EDU_CD_CANCLE_REQ); //취소요청 코드 35
vEEduAplctVO.setCnclAtchFileId(s_atchFileId);
vEEduAplctVO.setCnclCn(vEEduAplctVO.getAprvlCn()); //취소사유 - 기존에는 aprvlCn 사용
vEEduMIXService.updateCnclStatus(vEEduAplctVO);
}catch(Exception ex) {
System.out.println("Exception vEEduRsltRprtService.insert");

2
src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp
View File

@ -826,7 +826,7 @@
<c:out value="${list.phone}"/>
</td>
<td>
<ve:code codeId="VEA003" code="${list.eduStateCd}"/>
<ve:code codeId="VEA003" code="${list.aplctStateCd}"/>
<%-- <c:choose> --%>
<%-- <c:when test="${list.aplctStateCd eq 10 or list.aplctStateCd eq 60}"> --%>
<%-- <ve:code codeId="VEA003" code="${list.aplctStateCd}"/> --%>

2
src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp
View File

@ -826,7 +826,7 @@
<c:out value="${list.phone}"/>
</td>
<td>
<ve:code codeId="VEA003" code="${list.eduStateCd}"/>
<ve:code codeId="VEA003" code="${list.aplctStateCd}"/>
<%-- <c:choose> --%>
<%-- <c:when test="${list.aplctStateCd eq 10 or list.aplctStateCd eq 60}"> --%>
<%-- <ve:code codeId="VEA003" code="${list.aplctStateCd}"/> --%>

2
src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp
View File

@ -271,7 +271,7 @@
<td>
<c:choose>
<c:when test="${list.aprvlCd eq 60 and list.qestRsltExists and list.aplctStateCd ne 10 and list.aplctStateCd ne 30}">
<c:when test="${list.aprvlCd eq 60 and list.qestRsltExists and list.aplctStateCd eq 20}">
<!-- 설문노출대상(승인처리를 받았음(20) && 교육기간이 지났음 list.qestRsltExists=true && 미이수가 아닌것(10) ) -->
<c:choose>
<c:when test="${list.aplctStateCd eq 20 and list.qestnrId10Cnt gt 0}">

2
src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduCancelPop.jsp
View File

@ -118,7 +118,7 @@
$.ajax({
type: "POST",
enctype: 'multipart/form-data',
url: "${pageContext.request.contextPath}/web/ve/aplct/sspnIdtmt/popup/eduCancelPopupAjax.do",
url: "${pageContext.request.contextPath}/web/ve/aplct/cmdTrgt/popup/eduCancelPopupAjax.do",
data: data,
dataType:'json',
async: false,

2
src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/popup/eduCancelPop.jsp
View File

@ -118,7 +118,7 @@
$.ajax({
type: "POST",
enctype: 'multipart/form-data',
url: "${pageContext.request.contextPath}/web/ve/aplct/sspnIdtmt/popup/eduCancelPopupAjax.do",
url: "${pageContext.request.contextPath}/web/ve/aplct/prevent/popup/eduCancelPopupAjax.do",
data: data,
dataType:'json',
async: false,