From 4f0c953b1288f89b0f63f4504ff273f05a120f14 Mon Sep 17 00:00:00 2001 From: myname Date: Fri, 24 Nov 2023 15:23:34 +0900 Subject: [PATCH] =?UTF-8?q?2023-11-24=2015:23=20=EC=B2=B4=ED=97=98?= =?UTF-8?q?=EA=B5=90=EC=8B=A4=20=EA=B3=BC=EA=B1=B0=20=EC=8B=A0=EC=B2=AD=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=ED=99=95=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/utl/fcc/service/EgovCryptoUtil.java | 1 + .../eduInfo/service/VEEduAplctVO.java | 15 +++ .../eduInfo/service/VEEduMIXService.java | 4 + .../eduInfo/service/impl/VEEduMIXDAO.java | 6 + .../service/impl/VEEduMIXServiceImpl.java | 4 + .../web/OprtnAplctMngController.java | 10 ++ .../sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml | 2 +- .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 32 +++++ .../cpyrgExprnClsrm/oprtnAplctMngDetail.jsp | 124 ++++++++++++++++++ 9 files changed, 197 insertions(+), 1 deletion(-) diff --git a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java index b778e374..88541df7 100644 --- a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java +++ b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java @@ -587,6 +587,7 @@ public class EgovCryptoUtil { public List decryptVeEduAplctList(List vEPrcsDetailVOList) { for(VEEduAplctVO vo : vEPrcsDetailVOList) { + vo.setChrgNm(this.decrypt(vo.getChrgNm())); vo.setUserNm(this.decrypt(vo.getUserNm())); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java index 492aeb98..10174782 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java @@ -151,6 +151,9 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { private String targetId; + private String awardsHist; //수상이력 + private String extraPayYn; //추가비용지불 + public int getChasi() { return chasi; @@ -1756,6 +1759,18 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { public void setTargetId(String targetId) { this.targetId = targetId; } + public String getAwardsHist() { + return awardsHist; + } + public void setAwardsHist(String awardsHist) { + this.awardsHist = awardsHist; + } + public String getExtraPayYn() { + return extraPayYn; + } + public void setExtraPayYn(String extraPayYn) { + this.extraPayYn = extraPayYn; + } } 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 95ed51e6..ca84ad83 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 @@ -65,6 +65,7 @@ public interface VEEduMIXService { void updateRsltRprtFileIdNull(VEEduAplctVO vEEduAplctVO) throws Exception; void updateRsltRprtFileId(VEEduAplctVO vEEduAplctVO) throws Exception; + //저작권 체험교실 목록 List selectExprnPagingList(VEEduAplctVO paramVO) throws Exception; @@ -76,4 +77,7 @@ public interface VEEduMIXService { void updateEduStateCd(VEEduAplctVO vEEduAplctVO); List selectTrgtList(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 d2e9d54e..09c185e5 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 @@ -197,5 +197,11 @@ public class VEEduMIXDAO extends EgovAbstractDAO { public void updateCnclStatus(VEEduAplctVO vEEduAplctVO) { update("VEEduMIXDAO.updateCnclStatus", vEEduAplctVO); } + + public List selectExprnHstryPagingList(VEEduAplctVO paramVO) throws Exception { + @SuppressWarnings("unchecked") + List tlist = (List) list("VEEduMIXDAO.selectExprnHstryPagingList", paramVO); + return tlist; + } } 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 2b0b0d7b..644e98bc 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 @@ -177,4 +177,8 @@ public class VEEduMIXServiceImpl implements VEEduMIXService { vEEduMIXDAO.updateEduStateCd(paramVO); } + + public List selectExprnHstryPagingList(VEEduAplctVO paramVO) throws Exception{ + return vEEduMIXDAO.selectExprnHstryPagingList(paramVO); + } } diff --git a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java index eff8a55f..8b631743 100644 --- a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java +++ b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java @@ -241,6 +241,7 @@ public class OprtnAplctMngController { model.addAttribute("info", vEEduAplctVO); + //접수종료일 조회 - 교육신청과정기간 종료일 VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO(); vEPrcsDetailVO.setPrcsAplctPrdOrd(vEEduAplctVO.getPrcsOrd()); @@ -248,6 +249,15 @@ public class OprtnAplctMngController { if(vEPrcsDetailVO != null) { model.addAttribute("endPnttm", vEPrcsDetailVO.getEndPnttm()); } + + + //과거 체험교실 운영 정보 + List vEEduAplctVOList = vEEduMIXService.selectExprnHstryPagingList(vEEduAplctVO); + vEEduAplctVOList = egovCryptoUtil.decryptVeEduAplctList(vEEduAplctVOList); + + model.addAttribute("list", vEEduAplctVOList); + + //20220223 우영두 추가 //강의내역 NOTI 입력 VEAsgnmNotiVO vEAsgnmNotiVO = new VEAsgnmNotiVO(); 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 a87c24f6..61e276f2 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 @@ -415,7 +415,7 @@ SELECT , CHRG_MJR AS chrgMjr, - D_BIRTH AS dBirth, + B.D_BIRTH AS dBirth, CHRG_SEX_CD AS chrgSexCd, CMPLT_YEAR AS cmpltYear, CMPLT_NUM AS cmpltNum, 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 2aaf30bc..8e0b36fd 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 @@ -5692,4 +5692,36 @@ VALUES OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp index 16a7579b..02317a57 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp @@ -8,6 +8,7 @@ <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> <%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> + @@ -402,6 +403,129 @@ + + +
+

과거 운영 정보

+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --%> + + + 불성실 + + + 성실 + + + --%> + + 지급 + + + 미지급 + + + + + + + + + + + +
번호학교명담당자운영상태승인일시수상불성실지급비고
+ + + + + + + + 운영신청 + + + 수정요청 + + + 수정완료 + + + 운영확정 + + + 운영미확정 + + + - + + + + <%-- - 선정 미선정 + <%-- - 선정 미선정
+
+ +