From 6348486d009cdf313eacb7f1aedcfdef5ac3a92d Mon Sep 17 00:00:00 2001 From: myname Date: Fri, 23 Feb 2024 18:00:25 +0900 Subject: [PATCH] =?UTF-8?q?2024-02-23=2018:00=20=EC=B2=AD=EC=86=8C?= =?UTF-8?q?=EB=85=84=20=EC=B0=BE=EA=B5=90=20=EB=93=B1=EB=A1=9D=EC=8B=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EC=82=AC=ED=95=AD=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/FndtnEnhanceTrnController.java | 8 +- .../sspnIdtmt/web/SspnIdtmtController.java | 7 + .../eduInfo/service/VEEduMIXService.java | 5 + .../eduInfo/service/impl/VEEduMIXDAO.java | 10 + .../service/impl/VEEduMIXServiceImpl.java | 8 + .../service/VEPrcsAplctPrdService.java | 4 +- .../service/impl/VEPrcsAplctPrdDAO.java | 6 +- .../impl/VEPrcsAplctPrdServiceImpl.java | 4 +- .../web/CndtnPrcsInfoMngController.java | 2 +- .../web/FndthPrcsAplctPrdMngController.java | 2 +- .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 303 +++++++++++++++++- .../ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml | 110 ++++++- .../ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp | 36 ++- .../tngrVisitEdu/eduAplct/eduAplctReg.jsp | 4 +- 14 files changed, 493 insertions(+), 16 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java index e35712f5..37b0da51 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -322,10 +322,15 @@ public class FndtnEnhanceTrnController { } vEPrcsDetailVO.setUseYn("Y"); //공개 여부만 조회 - List vEPrcsDetailVOList = vEPrcsAplctPrdService.selectPagingList4Fndth(vEPrcsDetailVO); + if(loginVO != null) { + vEPrcsDetailVO.setUserId(loginVO.getUniqId()); + } + + List vEPrcsDetailVOList = vEPrcsAplctPrdService.selectPagingList4Fndth4User(vEPrcsDetailVO); // 231031 비로그인으로 강의 목록 조회 가능하게 요청 // 리스트 row마다 신청 확인하기 + /* if(loginVO != null) { vEPrcsDetailVOList.stream().forEach(t->{ VEEduAplctVO vEEduAplctReqVO = new VEEduAplctVO(); @@ -345,6 +350,7 @@ public class FndtnEnhanceTrnController { }); } + */ //대상 리스트, 페이징 정보 전달 model.addAttribute("list", vEPrcsDetailVOList); 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 aedb1529..1f220566 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java @@ -309,9 +309,15 @@ public class SspnIdtmtController { } vEPrcsDetailVO.setUseYn("Y"); //공개 여부만 조회 + + if(loginVO != null) { + vEPrcsDetailVO.setUserId(loginVO.getUniqId()); + } + List vEPrcsDetailVOList = vEPrcsAplctPrdService.selectPagingList4Fndth(vEPrcsDetailVO); // 리스트 row마다 신청 확인하기 + /* vEPrcsDetailVOList.stream().forEach(t->{ VEEduAplctVO vEEduAplctReqVO = new VEEduAplctVO(); vEEduAplctReqVO.setUserId(loginVO.getUniqId()); @@ -326,6 +332,7 @@ public class SspnIdtmtController { t.setAprvlCd(vEEduAplctVO.getAprvlCd()); } }); + */ //대상 리스트, 페이징 정보 전달 model.addAttribute("list", vEPrcsDetailVOList); 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 9334e45d..2531d475 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 @@ -14,6 +14,9 @@ public interface VEEduMIXService { //L List selectList(VEEduAplctVO paramVO) throws Exception; + //확정된 대상자만 + List selectList4Cmplt(VEEduAplctVO paramVO) throws Exception; + //Page List - 대상별(차시단위) List selectPagingList(VEEduAplctVO paramVO) throws Exception; @@ -99,6 +102,8 @@ public interface VEEduMIXService { List selectTrgtList(VEEduAplctVO paramVO); + List selectTrgtList4Cmplt(VEEduAplctVO paramVO); + //저작권 체험교실 이력 과정 목록 List selectExprnHstryPagingList(VEEduAplctVO paramVO) throws Exception; diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java index e2251bdc..985579d5 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java @@ -31,6 +31,12 @@ public class VEEduMIXDAO extends EgovAbstractDAO { return tlist; } + public List selectList4Cmplt(VEEduAplctVO paramVO) throws Exception { + @SuppressWarnings("unchecked") + List tlist = (List) list("VEEduMIXDAO.selectList4Cmplt", paramVO); + return tlist; + } + /** * L - Page * @param addrVO @@ -240,6 +246,10 @@ public class VEEduMIXDAO extends EgovAbstractDAO { return (List) list("VEEduMIXDAO.selectTrgtList", paramVO); } + public List selectTrgtList4Cmplt(VEEduAplctVO paramVO) { + return (List) list("VEEduMIXDAO.selectTrgtList4Cmplt", paramVO); + } + public void updateEduStateCd(VEEduAplctVO paramVO) { update("VEEduMIXDAO.updateEduStateCd", paramVO); } 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 cf1e3783..ab03d3cd 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 @@ -36,6 +36,10 @@ public class VEEduMIXServiceImpl implements VEEduMIXService { return vEEduMIXDAO.selectList(paramVO); } + public List selectList4Cmplt(VEEduAplctVO paramVO) throws Exception{ + return vEEduMIXDAO.selectList4Cmplt(paramVO); + } + //paging List public List selectPagingList(VEEduAplctVO paramVO) throws Exception{ return vEEduMIXDAO.selectPagingList(paramVO); @@ -212,6 +216,10 @@ public class VEEduMIXServiceImpl implements VEEduMIXService { return vEEduMIXDAO.selectTrgtList(paramVO); } + public List selectTrgtList4Cmplt(VEEduAplctVO paramVO) { + return vEEduMIXDAO.selectTrgtList4Cmplt(paramVO); + } + @Override public void updateEduStateCd(VEEduAplctVO paramVO) { vEEduMIXDAO.updateEduStateCd(paramVO); 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 d5e3bce9..c3526c4c 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 @@ -3,7 +3,6 @@ package kcc.ve.instr.tngrVisitEdu.prcsInfo.service; import java.util.List; import java.util.Map; -import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; public interface VEPrcsAplctPrdService { @@ -32,6 +31,9 @@ public interface VEPrcsAplctPrdService { //기반강화, 기소유예 List selectPagingList4Fndth(VEPrcsDetailVO paramVO) throws Exception; + + //기반강화, 기소유예 - 사용자용 + List selectPagingList4Fndth4User(VEPrcsDetailVO paramVO) throws Exception; //R VEPrcsDetailVO selectDetailNewOne(VEPrcsDetailVO paramVO) throws Exception; 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 fffbb647..6136fd8e 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 @@ -6,7 +6,6 @@ import java.util.Map; import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; -import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; @@ -80,6 +79,11 @@ public class VEPrcsAplctPrdDAO extends EgovAbstractDAO { return tlist; } + public List selectPagingList4Fndth4User(VEPrcsDetailVO paramVO) throws Exception { + List tlist = (List) list("VEPrcsAplctPrdDAO.selectPagingList4Fndth4User", paramVO); + return tlist; + } + public List selectCfnPagingList4Fndth(VEPrcsDetailVO paramVO) throws Exception { List tlist = (List) list("VEPrcsAplctPrdDAO.selectCfnPagingList4Fndth", paramVO); return tlist; 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 d1c7b080..61dfa8bc 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 @@ -9,7 +9,6 @@ import javax.annotation.Resource; import org.springframework.stereotype.Service; import egovframework.rte.fdl.idgnr.EgovIdGnrService; -import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsAplctPrdService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; @@ -72,6 +71,9 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService { return vEPrcsAplctPrdDAO.selectPagingList4Fndth(paramVO); } + public List selectPagingList4Fndth4User(VEPrcsDetailVO paramVO) throws Exception{ + return vEPrcsAplctPrdDAO.selectPagingList4Fndth4User(paramVO); + } public List selectCfnPagingList4Fndth(VEPrcsDetailVO paramVO) throws Exception{ return vEPrcsAplctPrdDAO.selectCfnPagingList4Fndth(paramVO); 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 1c6bbf79..1a39c4e8 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java @@ -988,7 +988,7 @@ public class CndtnPrcsInfoMngController { paramVO.setSiteId("60"); //설문정보를 위해서 설문지의 대상값을 넣는다. VE0011 10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소 - List vEPrcsDetailVOList = vEEduMIXService.selectTrgtList(paramVO); + List vEPrcsDetailVOList = vEEduMIXService.selectTrgtList4Cmplt(paramVO); vEPrcsDetailVOList = egovCryptoUtil.decryptVeEduAplctList(vEPrcsDetailVOList); diff --git a/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java b/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java index 88ff4ac0..cfd844fc 100644 --- a/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java +++ b/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java @@ -386,7 +386,7 @@ public class FndthPrcsAplctPrdMngController { paramVO.setSiteId("50"); //설문정보를 위해서 설문지의 대상값을 넣는다. VE0011 10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소 - List vEPrcsDetailVOList = vEEduMIXService.selectList(paramVO); + List vEPrcsDetailVOList = vEEduMIXService.selectList4Cmplt(paramVO); vEPrcsDetailVOList = egovCryptoUtil.decryptVeEduAplctList(vEPrcsDetailVOList); System.out.println("===="); diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml index c7b447f2..32eb50fb 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml @@ -266,6 +266,150 @@ + + + + + + + + +