From 04cddf3fb7696a0060c09f345242e75b857fc923 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Thu, 30 Nov 2023 14:27:48 +0900 Subject: [PATCH 1/3] =?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=EC=84=B1=EC=9D=B8=EA=B5=90=EC=9C=A1=20?= =?UTF-8?q?=EC=8B=A0=EC=B2=AD=20=EC=8B=9C=20=EA=B5=90=EC=9C=A1=EC=B0=A8?= =?UTF-8?q?=EC=8B=9C=20=EC=8B=9C=EA=B0=84=20=EC=B2=B4=ED=81=AC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp index 0e09393c..4b483f35 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp @@ -317,12 +317,22 @@ $('input[name=strtTm]:eq('+idx+')').focus(); return flag = false; } + if($(this).find('input[name=strtTm]').val().indexOf('선택') != -1){ + alert('교육시작 시간을 입력해주세요.'); + $('input[name=strtTm]:eq('+idx+')').focus(); + return flag = false; + } if($(this).find('input[name=endTm]').val() == ''){ alert('교육종료 시간을 입력해주세요.'); $('input[name=endTm]:eq('+idx+')').focus(); return flag = false; } - + if($(this).find('input[name=endTm]').val().indexOf('선택') != -1){ + alert('교육종료 시간을 입력해주세요.'); + $('input[name=endTm]:eq('+idx+')').focus(); + return flag = false; + } + if($(this).find('select[name=divCd]').val() == ''){ alert('구분을 선택해주세요.'); $('select[name=divCd]:eq('+idx+')').focus(); From 38c3f48da9b690f498f8f02a92d451e5c59e9669 Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 30 Nov 2023 14:31:14 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=8B=A4=EB=AC=B4=EC=97=AD=EB=9F=89?= =?UTF-8?q?=EA=B0=95=ED=99=94=20=EB=82=98=EC=9D=98=EA=B0=95=EC=9D=98?= =?UTF-8?q?=EC=8B=A4=20=EC=83=81=EB=8B=A8=20=EC=B9=B4=EC=9A=B4=ED=8A=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sspnIdtmt/web/SspnIdtmtController.java | 2 +- .../service/VEPrcsAplctPrdService.java | 2 + .../service/impl/VEPrcsAplctPrdDAO.java | 4 ++ .../impl/VEPrcsAplctPrdServiceImpl.java | 5 +++ .../ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml | 39 +++++++++++++++++-- .../fndtnEnhanceTrn/fndtnEduAplctList.jsp | 17 ++++++-- .../aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp | 2 +- 7 files changed, 62 insertions(+), 9 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 80674900..81e98134 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java @@ -223,7 +223,7 @@ public class SspnIdtmtController { }); - Map countMap = vEPrcsAplctPrdService.findAllDashboardCnt(vEPrcsDetailVO); + Map countMap = vEPrcsAplctPrdService.findAllSspnldtmtDashboardCnt(vEPrcsDetailVO); // 리스트 row마다 신청 확인하기 //대상 리스트, 페이징 정보 전달 model.addAttribute("list", vEPrcsDetailVOList); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java index dc5c4efa..1fcd95d4 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java @@ -57,4 +57,6 @@ public interface VEPrcsAplctPrdService { List selectSchduleManagerList(VEPrcsDetailVO vEPrcsDetailVO); + Map findAllSspnldtmtDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO); + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java index 1bcbf26f..06a6789e 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java @@ -99,6 +99,10 @@ public class VEPrcsAplctPrdDAO extends EgovAbstractDAO { public Map findAllDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO) { return (Map) select("VEPrcsAplctPrdDAO.findAllDashboardCnt", vEPrcsDetailVO); } + + public Map findAllSspnldtmtDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO) { + return (Map) select("VEPrcsAplctPrdDAO.findAllSspnldtmtDashboardCnt", vEPrcsDetailVO); + } public VEPrcsDetailVO selectDetailByOrd(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetailByOrd", vEPrcsDetailVO); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java index 5e3f5ad3..fccef726 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java @@ -99,6 +99,11 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService { public Map findAllDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO) { return vEPrcsAplctPrdDAO.findAllDashboardCnt(vEPrcsDetailVO); } + + @Override + public Map findAllSspnldtmtDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO) { + return vEPrcsAplctPrdDAO.findAllSspnldtmtDashboardCnt(vEPrcsDetailVO); + } public VEPrcsDetailVO selectDetailByOrd(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { return vEPrcsAplctPrdDAO.selectDetailByOrd(vEPrcsDetailVO); diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml index 433c2c89..5a1c1efc 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml @@ -627,6 +627,7 @@ @@ -676,8 +678,39 @@ */ SELECT SUM(CASE WHEN a.aprvl_cd = '10' THEN 1 ELSE 0 END) AS count_aprvl_cd_10 - , SUM(CASE WHEN a.aprvl_cd = '20' - AND TO_DATE(c.edu_ddln_pnttm, 'YYYY.MM.DD') > CURRENT_DATE THEN 1 ELSE 0 END) AS count_aprvl_cd_20 + , SUM(CASE + WHEN a.aprvl_cd = '20' + AND TO_DATE(c.edu_ddln_pnttm, 'YYYY.MM.DD') >= CURRENT_DATE + AND TO_DATE(c.edu_strt_pnttm, 'YYYY.MM.DD') <= CURRENT_DATE + THEN 1 + ELSE 0 + END) AS count_aprvl_cd_20 + , SUM(CASE WHEN a.aprvl_cd = '20' AND b.aplct_state_cd = '20' THEN 1 ELSE 0 END) AS count_end_cd + FROM + ve_edu_aplct a + LEFT JOIN vea_aplct_detail_info b + ON a.edu_aplct_ord = b.edu_aplct_ord + LEFT JOIN ve_prcs_aplct_prd c + ON c.prcs_aplct_prd_ord = b.prcs_aplct_prd_ord + WHERE + a.lctr_div_cd = #lctrDivCd# + AND a.user_id = #userId# + + +