From 91d2bec2b999c5df5c6892e1744b6e488bfaef7f Mon Sep 17 00:00:00 2001 From: myname Date: Thu, 14 Mar 2024 11:22:49 +0900 Subject: [PATCH] =?UTF-8?q?2024-03-14=2011:22=20=EA=B8=B0=EC=86=8C=20?= =?UTF-8?q?=EC=9C=A0=EC=98=88=20=EC=88=98=EC=A0=95=20=EC=82=AC=ED=95=AD=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/VEPrcsAplctPrdService.java | 12 ++++- .../prcsInfo/service/VEPrcsDetailVO.java | 28 ++++++++++ .../service/impl/VEPrcsAplctPrdDAO.java | 8 +++ .../impl/VEPrcsAplctPrdServiceImpl.java | 16 ++++++ .../web/CndtnPrcsInfoMngController.java | 8 +++ .../ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml | 54 ++++++++++++++++++- .../cndtnSspnIdtmt/cndtnEduPrcsMngReg.jsp | 7 ++- .../aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp | 2 + 8 files changed, 132 insertions(+), 3 deletions(-) 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 c3526c4c..e46fcb3c 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 @@ -54,7 +54,14 @@ public interface VEPrcsAplctPrdService { Map findAllDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO); VEPrcsDetailVO selectDetailByOrd(VEPrcsDetailVO vEPrcsDetailVO) throws Exception; - + + //신청정보-기소유예/기반강화 + VEPrcsDetailVO selectAplctInfo(VEPrcsDetailVO vEPrcsDetailVO) throws Exception; + + //사용자 취소 신청 처리 + int updateStatusChange4User(VEPrcsDetailVO vEPrcsDetailVO) throws Exception; + + void updateOneColumn(VEPrcsDetailVO vEPrcsDetailVO) throws Exception; VEPrcsDetailVO findByCnclInfo(VEPrcsDetailVO vEPrcsDetailVO); @@ -64,6 +71,9 @@ public interface VEPrcsAplctPrdService { VEPrcsDetailVO selectEtc(String prcsAplctPrdOrd); void updateEtc(VEPrcsDetailVO vEPrcsDetailVO); + + //vea_aplct_detail_info 테이블의 sspn_idtmt_trgt_ord 값을 update 한다. + void updateSspnIdtmtTrgt(VEPrcsDetailVO vEPrcsDetailVO); List selectSchduleManagerList(VEPrcsDetailVO vEPrcsDetailVO); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java index 1bf5f375..415c9932 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java @@ -221,6 +221,22 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { */ private String color; + /* + private String ddlnCd; //교육과정상태 - VEA004 + private String aprvlCd; //교육신청상태 - VE0003 + private String aplctStateCd; //신청진행상태 - VEA003 + + private String reqStateCd; //의뢰상태 - VEA005 + private String eduStateCd; //교육상태 - VEA002 + private String eduAplctOrd; //교육신청순번 + private String prcsAplctPrdOrd; //교육과정순번 + private String sspnIdtmtTrgtOrd; //기소대상자순번 + */ + private String reqStateCd; //의뢰상태 - VEA005 + + private String reqNo; //요청번호 - excel 참고 + + public String getEduPrcsOrd() { return eduPrcsOrd; } @@ -1061,6 +1077,18 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { public void setColor(String color) { this.color = color; } + public String getReqStateCd() { + return reqStateCd; + } + public void setReqStateCd(String reqStateCd) { + this.reqStateCd = reqStateCd; + } + public String getReqNo() { + return reqNo; + } + public void setReqNo(String reqNo) { + this.reqNo = reqNo; + } } 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 6136fd8e..d617ce6b 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 @@ -125,6 +125,10 @@ public class VEPrcsAplctPrdDAO extends EgovAbstractDAO { return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetailByOrd", vEPrcsDetailVO); } + public VEPrcsDetailVO selectAplctInfo(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { + return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectAplctInfo", vEPrcsDetailVO); + } + public VEPrcsDetailVO findByCnclInfo(VEPrcsDetailVO paramVO) { return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.findByCnclInfo", paramVO); } @@ -140,6 +144,10 @@ public class VEPrcsAplctPrdDAO extends EgovAbstractDAO { public void updateEtc(VEPrcsDetailVO vEPrcsDetailVO) { update("VEPrcsAplctPrdDAO.updateEtc", vEPrcsDetailVO); } + + public void updateSspnIdtmtTrgt(VEPrcsDetailVO vEPrcsDetailVO) { + update("VEPrcsAplctPrdDAO.updateSspnIdtmtTrgt", vEPrcsDetailVO); + } public List selectSchduleManagerList(VEPrcsDetailVO vEPrcsDetailVO) { return (List) list("VEPrcsAplctPrdDAO.selectSchduleManagerList", 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 61dfa8bc..d54208b0 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 @@ -126,6 +126,10 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService { return vEPrcsAplctPrdDAO.selectDetailByOrd(vEPrcsDetailVO); } + public VEPrcsDetailVO selectAplctInfo(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { + return vEPrcsAplctPrdDAO.selectAplctInfo(vEPrcsDetailVO); + } + public void updateOneColumn(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { vEPrcsAplctPrdDAO.update(vEPrcsDetailVO); } @@ -149,6 +153,11 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService { vEPrcsAplctPrdDAO.updateEtc(vEPrcsDetailVO); } + @Override + public void updateSspnIdtmtTrgt(VEPrcsDetailVO vEPrcsDetailVO) { + vEPrcsAplctPrdDAO.updateSspnIdtmtTrgt(vEPrcsDetailVO); + } + @Override public List selectSchduleManagerList(VEPrcsDetailVO vEPrcsDetailVO) { return vEPrcsAplctPrdDAO.selectSchduleManagerList(vEPrcsDetailVO); @@ -163,4 +172,11 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService { public int memoUpdate(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { return vEPrcsAplctPrdDAO.memoUpdate(vEPrcsDetailVO); } + + @Override + public int updateStatusChange4User(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { + return 1; + //return vEPrcsAplctPrdDAO.updateStatusChange4User(vEPrcsDetailVO); + } + } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java index a24f5cff..86e5f590 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java @@ -1982,6 +1982,14 @@ public class CndtnPrcsInfoMngController { //로그인 처리==================================== + + //사전처리 작업 시작==================================== + //vea_aplct_detail_info 테이블에 대상자 순번 값을 넣어서 신청자가 어떤 대상자인지 매핑시킨다. + vEPrcsAplctPrdService.updateSspnIdtmtTrgt(vEPrcsDetailVO); + //사전처리 작업 끝==================================== + + + //1.pageing step1 PaginationInfo paginationInfo = this.setPagingStep1(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 eb0ec32f..e92e723e 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 @@ -166,7 +166,32 @@ WHERE PRCS_APLCT_PRD_ORD = #prcsAplctPrdOrd# - + + + /* VEPrcsAplctPrdDAO.updateSspnIdtmtTrgt */ + + UPDATE /*+ bypass_ujvc */ + ( + SELECT a0.SSPN_IDTMT_TRGT_ORD + , b0.SSPN_IDTMT_TRGT_ORD AS NEW_SSPN_IDTMT_TRGT_ORD + + FROM vea_aplct_detail_info a0 + ,( + SELECT b.USER_ID, b.EDU_APLCT_ORD , c.SSPN_IDTMT_TRGT_ORD + FROM vea_aplct_detail_info a + , ve_edu_aplct b + , vea_sspn_idmt_trgt c + WHERE a.sspn_idtmt_trgt_ord IS NULL + AND a.EDU_APLCT_ORD =b.EDU_APLCT_ORD + AND b.EDU_APLCT_ORD =c.EDU_APLCT_ORD + )b0 + WHERE a0.EDU_APLCT_ORD =b0.EDU_APLCT_ORD + AND b0.SSPN_IDTMT_TRGT_ORD IS NOT NULL + )aa0 + SET aa0.SSPN_IDTMT_TRGT_ORD = aa0.NEW_SSPN_IDTMT_TRGT_ORD + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp index d45f464f..32f203f7 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp @@ -516,11 +516,13 @@ $(document).ready(function(){ ve_edu_aplct aprvl_cd - 교육신청에 대한 상태 10 요청 + 100 찜하기 120 선정완료 140 선정취소 20 승인 230 대기 30 반려 + 35 취소요청 40 취소 60 교육확정 70 수정요청