From dcd285011d23f95d44b5d4e2500cfc401274a58e Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 31 Oct 2023 16:57:00 +0900 Subject: [PATCH] =?UTF-8?q?2023-10-31=2016:56=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eduInfo/service/VEEduMIXService.java | 5 +- .../eduInfo/service/impl/VEEduMIXDAO.java | 6 + .../service/impl/VEEduMIXServiceImpl.java | 5 + .../web/EduAplctMngTngrController.java | 105 ++- .../ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml | 2 + .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 753 ++++++++++++++++++ .../oprtn/tngrVisitEdu/eduAplctMailDetail.jsp | 23 +- .../oprtn/tngrVisitEdu/eduAplctMngList.jsp | 20 +- .../tngrVisitEdu/eduAplctMngTrgtList.jsp | 590 ++++++++++++++ .../popup/eduAplctMailPreviewDetail.jsp | 193 +++++ .../asgnmInfo/instrAsgnmDetail.jsp | 8 + .../endInfo/instrEduEndDetail.jsp | 10 + 12 files changed, 1710 insertions(+), 10 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngTrgtList.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMailPreviewDetail.jsp 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 a51ab05c..d79033e6 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,9 +14,12 @@ public interface VEEduMIXService { //L List selectList(VEEduAplctVO paramVO) throws Exception; - //Page List + //Page List - 대상별(차시단위) List selectPagingList(VEEduAplctVO paramVO) throws Exception; + //신청별(신청단위) + List selectPagingApplyList(VEEduAplctVO paramVO) throws Exception; + /* 2023-0607 월별교육과정 통계와 데이터가 맞지 않아 쿼리 수정함 */ List selectPagingList_20230607(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 dc95f5d5..6235b9e8 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 @@ -43,6 +43,12 @@ public class VEEduMIXDAO extends EgovAbstractDAO { return tlist; } + public List selectPagingApplyList(VEEduAplctVO paramVO) throws Exception { + @SuppressWarnings("unchecked") + List tlist = (List) list("VEEduMIXDAO.selectPagingApplyList", paramVO); + return tlist; + } + public List selectPagingList_20230607(VEEduAplctVO paramVO) throws Exception { @SuppressWarnings("unchecked") List tlist = (List) list("VEEduMIXDAO.selectPagingList_20230607", 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 093b56f8..e5f29ddf 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 @@ -41,6 +41,11 @@ public class VEEduMIXServiceImpl implements VEEduMIXService { return vEEduMIXDAO.selectPagingList(paramVO); } + public List selectPagingApplyList(VEEduAplctVO paramVO) throws Exception{ + return vEEduMIXDAO.selectPagingApplyList(paramVO); + } + + //paging List public List selectPagingList_20230607(VEEduAplctVO paramVO) throws Exception{ return vEEduMIXDAO.selectPagingList_20230607(paramVO); diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java index d06f79dd..a73775df 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java @@ -198,7 +198,7 @@ public class EduAplctMngTngrController { * 2023-04-28 우영두 * * */ - List vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO); + List vEEduAplctVOList = vEEduMIXService.selectPagingApplyList(vEEduAplctVO); vEEduAplctVOList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduAplctVOList); vEEduAplctVO.setSearchChrgNm(egovCryptoUtil.decrypt(vEEduAplctVO.getSearchChrgNm())); //3.pageing step3 @@ -209,6 +209,79 @@ public class EduAplctMngTngrController { return "oprtn/tngrVisitEdu/eduAplctMngList"; } + /** + * 교육신청관리 목록 화면(대상별) + */ + @RequestMapping("eduAplctMngTrgtList.do") + public String eduAplctMngTrgtList( @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , HttpSession session, ModelMap model ) throws Exception { + + LoginVO user = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + + //기준년도가 없으면 최종 신청년도가 속한 회차의 년도를 기본값으로 가져온다. // 없으면 올해가 기본 + /* + { + if ("".equals(vEEduAplctVO.getStngYr()) || vEEduAplctVO.getStngYr()==null) { + VEAStngVO vEAStngVO = new VEAStngVO(); + String s_stngYr = vEAStngMixService.selectEduGetStngYrToStr(vEAStngVO); + vEEduAplctVO.setStngYr(s_stngYr); + } + } + */ + + + //년도 + if(StringUtils.isBlank(vEEduAplctVO.getSearchYear())){ + //vEEduAplctVO.setSearchYear(String.valueOf(LocalDate.now().getYear())); + } + + //월 + if(StringUtils.isBlank(vEEduAplctVO.getSearchMonth())){ + vEEduAplctVO.setSearchMonth(String.valueOf(LocalDate.now().getMonthValue())); + } + if(!"".equals(vEEduAplctVO.getSearchChrgNm())) { + vEEduAplctVO.setSearchChrgNm(egovCryptoUtil.encrypt(vEEduAplctVO.getSearchChrgNm())); + } + + // 요청, 반려건 + //vEEduAplctVO.setSearchNotStatusArr(new String[]{"60"}); + // 청소년 + vEEduAplctVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_10); + //1.pageing step1 + PaginationInfo paginationInfo = this.setPagingStep1(vEEduAplctVO); + + //정렬 + if("".equals(vEEduAplctVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + vEEduAplctVO.setOrderByQuery("A.SBMT_PNTTM DESC"); + }else{ + vEEduAplctVO.setOrderByQuery(vEEduAplctVO.getSearchSortCnd() + " " +vEEduAplctVO.getSearchSortOrd()); + } + + System.out.println("vEEduAplctVO.getOrderByQuery() :: "+ vEEduAplctVO.getOrderByQuery()); + + //2. pageing step2 + vEEduAplctVO = this.setPagingStep2Sub(vEEduAplctVO, paginationInfo); + vEEduAplctVO.setNotiUserId(user.getUniqId()); + vEEduAplctVO.setMenuNo(session.getAttribute("menuNo").toString()); + + + /* + * 리스트 검색에서 교육일자 시작/종료일 입력 없이 검색시 + * 기존 searchEndDt where 조건에 1=2로 되어있어서 리스트 검색이 안되던 것을 + * 저작위 요청사항으로 1=1로 변경하여 날짜 입력이 안되어도 검색이 되도록 수정함 + * 2023-04-28 우영두 + * + * */ + List vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO); + vEEduAplctVOList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduAplctVOList); + vEEduAplctVO.setSearchChrgNm(egovCryptoUtil.decrypt(vEEduAplctVO.getSearchChrgNm())); + //3.pageing step3 + paginationInfo = this.setPagingStep3(vEEduAplctVOList, paginationInfo); + model.addAttribute("paginationInfo", paginationInfo); + //대상 리스트, 페이징 정보 전달 + model.addAttribute("list", vEEduAplctVOList); + return "oprtn/tngrVisitEdu/eduAplctMngTrgtList"; + } + /** * 교육신청관리 목록 화면 */ @@ -834,6 +907,36 @@ public class EduAplctMngTngrController { return "oprtn/tngrVisitEdu/eduAplctMailDetail"; } + /** + * 청소년 교육확정 메일본문 미리보기 페이지 + */ + @RequestMapping("popup/eduAplctMailPreviewDetail.do") + public String eduAplctMailPreviewDetail( @ModelAttribute("cntManageVO") CntManageVO cntManageVO + , ModelMap model + , HttpServletRequest request ) throws Exception { + + try { + //샘플소스 + cntManageVO.setCntId("CNT_000000000000"); + cntManageVO.setCntDtId("CNTDT_0000000000"); + + cntManageVO = egovCntManageService.selectCntDtDetail(cntManageVO); + model.addAttribute("cntManageVO", cntManageVO); + + //본문적용소스 + cntManageVO.setCntId("CNT_000000000001"); + cntManageVO.setCntDtId("CNTDT_0000000001"); + + cntManageVO = egovCntManageService.selectCntDtDetail(cntManageVO); + model.addAttribute("cntManageVO2", cntManageVO); + }catch(Exception ex) { + ex.printStackTrace(); + } + + + return "oprtn/tngrVisitEdu/popup/eduAplctMailPreviewDetail"; + } + /** * 청소년 교육확정 메일본문 수정 */ diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml index 316215c5..4a387e2e 100644 --- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml @@ -768,6 +768,7 @@ , b.end_oprtn_dt AS endOprtnDt , b.instt_nm AS insttNm , b.hope_sbjct AS hopeSbjct + , b.EDU_PLACE AS eduPlace , a.memo_cn AS memoCn , ((SUBSTR(a.end_tm, 1,2) - SUBSTR(a.strt_tm, 1,2)) * 60) + (SUBSTR(a.end_tm, 3,4) - SUBSTR(a.strt_tm, 3,4)) AS eduTM @@ -917,6 +918,7 @@ , b.chrg_nm AS chrgNm , b.phone AS phone , b.email AS email + , b.edu_place AS eduPlace , b.end_oprtn_dt AS endOprtnDt , b.instt_div_cd AS insttDivCd , b.schol_div_cd AS scholDivCd 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 affbb049..fbcec0a0 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 @@ -328,6 +328,10 @@ , CC.EDU_HOPE_DT AS eduHopeDt , CC.EDU_CHASI_ORD AS eduChasiOrd , CC.lrn_tm AS lrnTm + + , CC.strt_tm AS strtTm + , CC.end_tm AS endTm + , D.USER_NM AS userNm , E.CHRG_MJR AS chrgMjr , E.D_BIRTH AS dBirth @@ -510,6 +514,8 @@ EDU_APLCT_ORD ,EDU_CHASI_ORD ,SUM(lrn_tm) AS lrn_tm + ,MIN(strt_tm) AS strt_tm + ,MIN(end_tm) AS end_tm ,MIN( REPLACE( /* @@ -930,6 +936,753 @@ + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngList.jsp index 08202155..fc54cb4a 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngList.jsp @@ -305,6 +305,7 @@ + @@ -375,7 +376,7 @@ - + @@ -391,6 +392,7 @@ + @@ -403,8 +405,9 @@ 교육일자 신청일자 지역 - 학교(기관)명 + 학교(기관)명 신청시간 + 소요시간 학교구분 담당자 신청상태 @@ -436,7 +439,7 @@ - + @@ -463,6 +466,15 @@ + + + + + ~ + + + + @@ -556,7 +568,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngTrgtList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngTrgtList.jsp new file mode 100644 index 00000000..ee2d8d2c --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngTrgtList.jsp @@ -0,0 +1,590 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + + + + + + + +신청관리 + + + + + " /> + " /> + + + " /> +
+
+ +
+

교육신청 목록

+
    +
    • +
  • +

    청소년 찾아가는 저작권 교육

    +
    • +
  • 교육신청목록
    • +
+
+ + +
+ +
+ +
+
+

구분

+
+
+ + + + +
+
+
+
+

학교(기관)명

+
+
+ +
+
+
+
+

신청자명

+
+
+ + + +
+
+
+
+

교육일자

+
+
+
+ +
+ ~ +
+ +
+
+
+
+
+

신청일자

+
+
+
+ +
+ ~ +
+ +
+
+ 관리자 수정 건만 보기checked> +
+
+
+
+ + + +
+

총 건수 : 건

+
+ + + +
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호교육일자신청일자지역학교(기관)명신청시간소요시간학교구분담당자신청상태확정일자관리자 수정 여부
+ + + + + + + + + + + + - + + + + + + + + + + + (온) + + + + + + + + + + + + ~ + + + + + + + + + + + + + + + + + + + + 대기 + + + 교육신청 + + + 교육승인 + + + 교육반려 + + + 교육취소 + + + 선정완료 + + + 수정요청(대기) + + + 수정완료(대기) + + + 교육확정 + + + - + + + + +

${list.aprvlPnttm}

+ + 		+ + + 예 + + + 아니오 + + +
+
+ +
+
+ +
+
+
+
+ + +
+
+ +
+ +
+ +
+
+
+ + . + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMailPreviewDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMailPreviewDetail.jsp new file mode 100644 index 00000000..cb848c42 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMailPreviewDetail.jsp @@ -0,0 +1,193 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" + pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + + +<% pageContext.setAttribute("replaceChar", "\n"); %> + +<% + /** + * @Class Name : eduAplctMailPreviewDetail.jsp + * @Description : 메일 미리보기 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2022.04.05 안주영 최초 생성 + * @author 안주영 + * @since 2022.04.05 + * @version 1.0 + * @see + * + */ +%> + + +청소년 메일본문 상세 + + + + + + +
+
+ +
+

사용본문 미리보기(저장된 내용만 반영됩니다.)

+
+ +
+
+ + + + + + + + +
+ +
+
+ + +
+
+ +
+
+ +
+
+ +
+
+
+
+
+ + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp index fa66b6e5..d9e9b946 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp @@ -440,6 +440,14 @@ + + +

교육장소

+ + + ${info.eduPlace} + +

교육대상

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail.jsp index 6c62eee7..c615dd44 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail.jsp @@ -169,6 +169,14 @@ $( document ).ready(function() { + + +

교육장소

+ + + ${info.eduPlace} + +

교육대상

@@ -497,12 +505,14 @@ $( document ).ready(function() { +