From 789658198c16eb6a11ef63da7a1a6fa0236197b6 Mon Sep 17 00:00:00 2001 From: JIWOO Date: Thu, 23 Oct 2025 15:15:04 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=B7=A8?= =?UTF-8?q?=EC=86=8C=EC=9A=94=EC=B2=AD=EC=B2=98=EB=A6=AC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sspnIdtmt/web/SspnIdtmtController.java | 30 +++++++++++++------ src/main/java/kcc/ve/cmm/VeConstants.java | 8 +++++ .../eduInfo/service/VEEduMIXService.java | 2 ++ .../service/impl/VEEduMIXServiceImpl.java | 6 ++++ .../web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp | 2 +- .../jsp/web/ve/aplct/sspnIdtmt/main.jsp | 2 +- .../ve/aplct/sspnIdtmt/popup/eduCancelPop.jsp | 1 + 7 files changed, 40 insertions(+), 11 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java index f10e1228..c23bff7e 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java +++ b/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); - vEEduAplctVO.setAprvlCd("35"); - vEEduAplctVO.setLastUpdusrId(loginVO.getUniqId()); + /* + 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); - //취소요청 정보 저장 - vEEduAplctService.update(vEEduAplctVO); }catch(Exception ex) { diff --git a/src/main/java/kcc/ve/cmm/VeConstants.java b/src/main/java/kcc/ve/cmm/VeConstants.java index 5ebec9a6..3bab0f72 100644 --- a/src/main/java/kcc/ve/cmm/VeConstants.java +++ b/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"; //연기 + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java index 8ee092ad..872f3a3b 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java @@ -128,4 +128,6 @@ public interface VEEduMIXService { List selectTngrRsltRprtList(VEEduAplctVO paramVO) throws Exception; List selectExprnRsltFileDownList(VEEduAplctVO paramVO) throws Exception; + + void updateCnclStatus(VEEduAplctVO vEEduAplctVO); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java index abd474e1..f634f524 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java @@ -277,4 +277,10 @@ public class VEEduMIXServiceImpl implements VEEduMIXService { public List selectExprnRsltFileDownList(VEEduAplctVO paramVO) throws Exception{ return vEEduMIXDAO.selectExprnRsltFileDownList(paramVO); } + + @Override + public void updateCnclStatus(VEEduAplctVO paramVO) { + vEEduMIXDAO.updateCnclStatus(paramVO); + + } } diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp index 9db0a0bf..3db5fbf2 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp @@ -609,7 +609,7 @@ -<%-- --%> + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp index 2d9d4231..ba66759c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp @@ -254,7 +254,7 @@ - + - diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduCancelPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduCancelPop.jsp index 13950005..290da886 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduCancelPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduCancelPop.jsp @@ -141,6 +141,7 @@ " /> " /> + " /> " /> From 59b66a3bda2278491cf1b426ff7faee7b0c6131c Mon Sep 17 00:00:00 2001 From: JIWOO Date: Fri, 24 Oct 2025 10:45:55 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90=20=EA=B5=90=EC=9C=A1=20=EC=8B=A0=EC=B2=AD=20?= =?UTF-8?q?=EC=8B=9C=20=EC=A4=91=EB=B3=B5=20=EC=8B=A0=EC=B2=AD=20=EC=B2=B4?= =?UTF-8?q?=ED=81=AC=20=EC=8B=9C=20=EB=B0=98=EB=A0=A4=EB=8A=94=20=EC=A0=9C?= =?UTF-8?q?=EC=99=B8=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Postgresql.xml | 1 + .../egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Postgresql.xml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Postgresql.xml index a0fd6ab4..01872086 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Postgresql.xml @@ -849,6 +849,7 @@ AND b.sex = #sex# and c.edu_strt_pnttm >= TO_CHAR(NOW(),'YYYY.MM.DD') + and a.aprvl_cd in ('10','20','60') diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Postgresql.xml index a45dedf9..b526f3eb 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Postgresql.xml @@ -603,7 +603,7 @@ /* 신청 후 반려 */ , user_id = NULL , edu_aplct_ord = NULL - , edu_state_cd = '10' + , prcs_aplct_prd_ord_cmplt = NULL @@ -642,11 +642,11 @@ - + WHERE edu_aplct_ord = #eduAplctOrd# From b2c67fafcbfde9c31f3984532490bd68840dc298 Mon Sep 17 00:00:00 2001 From: JIWOO Date: Fri, 24 Oct 2025 10:56:55 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90=20=EB=A9=94=EC=9D=B8,=20=EC=8B=A0=EC=B2=AD?= =?UTF-8?q?=20=EA=B4=80=EB=A0=A8=20=EC=88=98=EC=A0=95=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/web/ve/aplct/cmdTrgt/eduAplctDetail.jsp | 2 +- .../webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/main.jsp | 11 ++++++++--- .../jsp/web/ve/aplct/cmdTrgt/popup/eduAplctPop.jsp | 4 ++-- .../jsp/web/ve/aplct/prevent/eduAplctDetail.jsp | 2 +- .../webapp/WEB-INF/jsp/web/ve/aplct/prevent/main.jsp | 11 ++++++++--- .../jsp/web/ve/aplct/prevent/popup/eduAplctPop.jsp | 4 ++-- 6 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/eduAplctDetail.jsp index 41ce9b92..19ee4615 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/eduAplctDetail.jsp @@ -609,7 +609,7 @@ -<%-- --%> + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/main.jsp index fd56bd33..b0694394 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/main.jsp @@ -216,7 +216,12 @@ - + + + - + + + <%-- @@ -229,8 +234,8 @@ -<%-- --%> - + + --%> diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduAplctPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduAplctPop.jsp index ac4fe5d0..c858b445 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduAplctPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduAplctPop.jsp @@ -12,7 +12,6 @@ 교육신청 목록 > 기소유예 찾아가는 저작권 교육 > 한국지식재산보호원 저작권 교육 시스템 -