From 4e04f839de31ec1326c23b5ed95d79fc13bba696 Mon Sep 17 00:00:00 2001 From: myname Date: Fri, 23 Feb 2024 16:27:13 +0900 Subject: [PATCH] =?UTF-8?q?2024-02-23=2016:26=20=EC=84=9C=EB=A5=98=20?= =?UTF-8?q?=EC=A0=9C=EC=B6=9C=20=EB=AC=B8=EC=84=9C=20=EA=B5=90=EC=9C=A1?= =?UTF-8?q?=EC=9D=BC=20=EC=9D=B4=ED=9B=84=20=EC=95=88=EB=B3=B4=EC=9D=B4?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ve/aplct/comweb/CommonWebController.java | 29 +++++++------ .../eduAplct/web/EduAplctTngrController.java | 2 +- .../eduEnd/web/EduEndTngrController.java | 2 +- .../eduInfo/service/VEEduAplctService.java | 3 ++ .../eduInfo/service/impl/VEEduAplctDAO.java | 4 ++ .../service/impl/VEEduAplctServiceImpl.java | 4 ++ .../sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml | 43 +++++++++++++++++++ .../oprtn/tngrVisitEdu/eduCnfrmMngList.jsp | 1 + 8 files changed, 73 insertions(+), 15 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java index f43673a7..84ae87d5 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java @@ -985,19 +985,6 @@ public class CommonWebController { vEEduChasiInstrAsgnmService.updateAsgnmY(vEInstrAsgnmVO); vEEduChasiInstrAsgnmService.updateAsgnmN(vEInstrAsgnmVO); - try { - iTNotiUtil.insertNotifyNew( - "20", - loginVO.getUniqId(), - VeConstants.NOTI_STATUS_100, - p_step01_list.get(i).getEduAplctOrd(), - p_step01_list.get(i).getEduChasiOrd(), - "2", - "2" - ); - }catch(Exception ex) { - ex.printStackTrace(); - } //성인교육의 경우 배정 확정 된 강사의 ID와 메일 조회 후 안내 SMS, 메일 전송 if("20".equals(veEduAplctVO.getLctrDivCd())) { @@ -1020,6 +1007,22 @@ public class CommonWebController { vEEduChasiVO.setStrtTm(vEEduChasiVO.getStrtTm().substring(0,2) + ":" + vEEduChasiVO.getStrtTm().substring(2)); vEEduChasiVO.setEndTm(vEEduChasiVO.getEndTm().substring(0,2) + ":" + vEEduChasiVO.getEndTm().substring(2)); vEEduChasiVOList.add(vEEduChasiVO); + + + //교육확정알림 + try { + iTNotiUtil.insertNotifyNew( + "20", + loginVO.getUniqId(), + VeConstants.NOTI_STATUS_100, + p_step01_list.get(i).getEduAplctOrd(), + p_step01_list.get(i).getEduChasiOrd(), + "2", + "2" + ); + }catch(Exception ex) { + ex.printStackTrace(); + } } } diff --git a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/web/EduAplctTngrController.java b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/web/EduAplctTngrController.java index ae2cb5df..e33d004f 100644 --- a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/web/EduAplctTngrController.java +++ b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/web/EduAplctTngrController.java @@ -852,7 +852,7 @@ public class EduAplctTngrController { //서류 요청 목록 VEEduAplctVO veEduDocReqVO = new VEEduAplctVO(); veEduDocReqVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); - List vEEduDocReqList = vEEduAplctService.selectDocReqList(veEduDocReqVO); + List vEEduDocReqList = vEEduAplctService.selectDocReqList4User(veEduDocReqVO); //복호화 vEEduDocReqList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduDocReqList); model.addAttribute("docReqList", vEEduDocReqList); diff --git a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java index 68136b61..191f9afd 100644 --- a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java +++ b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java @@ -542,7 +542,7 @@ public class EduEndTngrController { //서류 요청 목록 VEEduAplctVO veEduDocReqVO = new VEEduAplctVO(); veEduDocReqVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); - List vEEduDocReqList = vEEduAplctService.selectDocReqList(veEduDocReqVO); + List vEEduDocReqList = vEEduAplctService.selectDocReqList4User(veEduDocReqVO); //복호화 vEEduDocReqList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduDocReqList); model.addAttribute("docReqList", vEEduDocReqList); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctService.java index 36a8ba8e..a4b64391 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctService.java @@ -56,6 +56,9 @@ public interface VEEduAplctService { //서류요청 목록 조회 List selectDocReqList(VEEduAplctVO paramVO) throws Exception; + + //서류요청 목록 조회 - 사용자 페이지용 희망일 이후에는 보여지지 않는다. + List selectDocReqList4User(VEEduAplctVO paramVO) throws Exception; //요청서류 제출 void updateSbmtAtchFileId(VEEduAplctVO paramVO) throws Exception; diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctDAO.java index 044e3bc1..b063a16d 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctDAO.java @@ -157,6 +157,10 @@ public class VEEduAplctDAO extends EgovAbstractDAO { return (List) list("VEEduAplctDAO.selectDocReqList", paramVO); } + public List selectDocReqList4User(VEEduAplctVO paramVO) throws Exception { + return (List) list("VEEduAplctDAO.selectDocReqList4User", paramVO); + } + public void updateSbmtAtchFileId(VEEduAplctVO paramVO) throws Exception { insert("VEEduAplctDAO.updateSbmtAtchFileId", paramVO); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java index 50eb3816..e1b99cd4 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java @@ -183,6 +183,10 @@ public class VEEduAplctServiceImpl implements VEEduAplctService { return vEEduAplctDAO.selectDocReqList(paramVO); } + public List selectDocReqList4User(VEEduAplctVO paramVO) throws Exception{ + return vEEduAplctDAO.selectDocReqList4User(paramVO); + } + public void updateSbmtAtchFileId(VEEduAplctVO paramVO) throws Exception { vEEduAplctDAO.updateSbmtAtchFileId(paramVO); } diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml index 13c78467..ce9b3560 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml @@ -1467,6 +1467,49 @@ + + /* VEEduAplctDAO.updateSbmtAtchFileId */ UPDATE VE_EDU_DOC_REQ diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp index f504cd72..8ef08e49 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp @@ -678,6 +678,7 @@ data: { "eduAplctOrd" : varEduAplctOrd , "asgnmAprvlCd" : "30", + "lctrDivCd" : "10" //"instrDiv" : "10" , },