From 32063540ab7a4c26d2482c12d159cc64aa4be86d Mon Sep 17 00:00:00 2001 From: JIWOO Date: Wed, 29 Oct 2025 18:31:09 +0900 Subject: [PATCH] =?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=ED=98=84=ED=99=A9=20?= =?UTF-8?q?=EC=88=98=EC=A0=95,=20=EA=B5=90=EC=9C=A1=20=EC=8B=A0=EC=B2=AD?= =?UTF-8?q?=20=ED=8E=98=EC=9D=B4=EC=A7=80=EC=97=90=EC=84=9C=20=EC=8B=A0?= =?UTF-8?q?=EC=B2=AD=EB=A7=88=EA=B0=90,=EA=B5=90=EC=9C=A1=ED=99=95?= =?UTF-8?q?=EC=A0=95=20=EC=83=81=ED=83=9C=20=EC=B2=B4=ED=81=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prevent/service/impl/PreventServiceImpl.java | 9 ++++++++- .../kcc/ve/aplct/prevent/web/PreventController.java | 13 +------------ .../ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml | 2 +- .../webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp | 2 +- .../jsp/web/ve/aplct/cmdTrgt/eduAplctDetail.jsp | 6 ++++-- .../jsp/web/ve/aplct/prevent/eduAplctDetail.jsp | 7 +++++-- .../jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp | 6 ++++-- 7 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/prevent/service/impl/PreventServiceImpl.java b/src/main/java/kcc/ve/aplct/prevent/service/impl/PreventServiceImpl.java index 238d4016..39e23309 100644 --- a/src/main/java/kcc/ve/aplct/prevent/service/impl/PreventServiceImpl.java +++ b/src/main/java/kcc/ve/aplct/prevent/service/impl/PreventServiceImpl.java @@ -155,7 +155,7 @@ public class PreventServiceImpl implements PreventService { } */ - + /* // step1.신청 가능한 대상이 있는지 찾는다.-대상자 존재 여부만 확인 List cndtnTrgtMngVOList = cmdTrgtMngDAO.checkSspnIdtmtStep1(cmdTrgtMngVO); @@ -212,6 +212,13 @@ public class PreventServiceImpl implements PreventService { } } + */ + + /* 예방교육의 경우 대상자 목록, 대상자 체크가 불필요 */ + result = "success"; + msg = ""; + next = "Y"; + smsYn = "Y"; //핸드폰으로 인증번호 발송 if ("Y".equals(smsYn) && !"Y".equals(cmdTrgtMngVO.getChkYn())) { diff --git a/src/main/java/kcc/ve/aplct/prevent/web/PreventController.java b/src/main/java/kcc/ve/aplct/prevent/web/PreventController.java index 5e4d6b2c..bf49a0b2 100644 --- a/src/main/java/kcc/ve/aplct/prevent/web/PreventController.java +++ b/src/main/java/kcc/ve/aplct/prevent/web/PreventController.java @@ -1045,19 +1045,8 @@ public class PreventController { cndtnTrgtInfoMngVO = egovCryptoUtil.encryptCmdTrgtMngVOInfo(cndtnTrgtInfoMngVO); //return modelAndView; - - //예방교육의 경우 대상자 조회 목적이 아닌 핸드폰 인증 목적으로만 사용 - String msg = ""; - String id = ""; - String result = "success"; - String next = "Y"; - modelAndView.addObject("msg", msg); - modelAndView.addObject("id", id); - modelAndView.addObject("result", result); - modelAndView.addObject("next", next); //fail & Y = 관리자 문의 버튼 노출 - //return preventService.checkSspnIdtmt(cndtnTrgtInfoMngVO); - return modelAndView; + return preventService.checkSspnIdtmt(cndtnTrgtInfoMngVO); } diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml index efbfadb9..3068ae42 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml @@ -1934,7 +1934,7 @@ ORDER BY vpap.edu_strt_pnttm desc - LIMIT #recordCountPerPage# OFFSET #firstIndex# + diff --git a/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp b/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp index aff16253..25d558fa 100644 --- a/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp @@ -218,7 +218,7 @@
교육 신청 목록
- + <%-- --%>
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 a3d41e13..0e76756a 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 @@ -36,6 +36,8 @@ regForm.prcsAplctPrdOrd.value = $(this).data('info'); }); + //교육 상태(10:신청마감 or 20:교육확정) + var prcsDdlnCd = "${info.ddlnCd}"; }); function ddlnCdSttsChk(){ @@ -45,8 +47,8 @@ var regStatus = true; // 텍스트가 비어있는지 확인 - if ($ddlnCdStts.text().trim() === "" - || $ddlnCdStts.text().trim() === "반려") { + if (($ddlnCdStts.text().trim() === "" + || $ddlnCdStts.text().trim() === "반려") && (prcsDdlnCd !== '20'&& prcsDdlnCd !== '10')) { var dateText = $ddlnCdStts.closest('table').find("td:eq(3)").text().trim(); var strtPnttm = new Date(dateText.split("~")[0].trim().replace(/\./g, '-')); diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/eduAplctDetail.jsp index f76542d3..5c4f72d8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/eduAplctDetail.jsp @@ -36,6 +36,9 @@ regForm.prcsAplctPrdOrd.value = $(this).data('info'); }); + //교육 상태(10:신청마감 or 20:교육확정) + var prcsDdlnCd = "${info.ddlnCd}"; + }); function ddlnCdSttsChk(){ @@ -45,8 +48,8 @@ var regStatus = true; // 텍스트가 비어있는지 확인 - if ($ddlnCdStts.text().trim() === "" - || $ddlnCdStts.text().trim() === "반려") { + if (($ddlnCdStts.text().trim() === "" + || $ddlnCdStts.text().trim() === "반려") && (prcsDdlnCd !== '20'&& prcsDdlnCd !== '10')) { var dateText = $ddlnCdStts.closest('table').find("td:eq(3)").text().trim(); var strtPnttm = new Date(dateText.split("~")[0].trim().replace(/\./g, '-')); 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 3087f1af..174fc3e0 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 @@ -36,6 +36,8 @@ regForm.prcsAplctPrdOrd.value = $(this).data('info'); }); + //교육 상태(10:신청마감 or 20:교육확정) + var prcsDdlnCd = "${info.ddlnCd}"; }); function ddlnCdSttsChk(){ @@ -45,8 +47,8 @@ var regStatus = true; // 텍스트가 비어있는지 확인 - if ($ddlnCdStts.text().trim() === "" - || $ddlnCdStts.text().trim() === "반려") { + if (($ddlnCdStts.text().trim() === "" + || $ddlnCdStts.text().trim() === "반려") && (prcsDdlnCd !== '20'&& prcsDdlnCd !== '10')) { var dateText = $ddlnCdStts.closest('table').find("td:eq(3)").text().trim(); var strtPnttm = new Date(dateText.split("~")[0].trim().replace(/\./g, '-'));