From ee8626ced2fd2b872477618cb4c73ca3d9d54d10 Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 23 Nov 2023 12:54:22 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EC=86=8C=EC=9C=A0=EC=98=88=20?= =?UTF-8?q?=EB=8B=AC=EB=A0=A5=20=EC=A0=81=EC=9A=A9=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/FndtnEnhanceTrnController.java | 41 +- .../instrInfo/web/InstrPrflController.java | 2 +- .../service/VEPrcsAplctPrdService.java | 2 + .../prcsInfo/service/VEPrcsDetailVO.java | 22 + .../service/impl/VEPrcsAplctPrdDAO.java | 4 + .../impl/VEPrcsAplctPrdServiceImpl.java | 5 + .../ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml | 19 + .../ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp | 6 +- .../jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp | 6 +- .../web/ve/aplct/sspnIdtmt/eduAplctList.jsp | 377 ++++++----- .../jsp/web/ve/aplct/sspnIdtmt/main.jsp | 3 + .../tngrVisitEdu/instrInfo/instrPrflSchdl.jsp | 584 +++++++++--------- 12 files changed, 631 insertions(+), 440 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 60f71b76..93b36c2c 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -16,6 +16,7 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import egovframework.rte.fdl.idgnr.EgovIdGnrService; @@ -598,9 +599,6 @@ public class FndtnEnhanceTrnController { LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 - // 페이징 없이 select를 하기 위한 - vEPrcsDetailVO.setRecordCountPerPage(10000); - vEPrcsDetailVO.setFirstIndex(0); List vEPrcsDetailVOList = vEPrcsAplctPrdService.selectPagingList4Fndth(vEPrcsDetailVO); @@ -610,7 +608,42 @@ public class FndtnEnhanceTrnController { return modelAndView; } - + + @RequestMapping("/web/ve/aplct/fndtnEnhanceTrn/selectSchduleManagerListAjax.do") + @ResponseBody +// public ModelAndView eduSelectAjax( + public List selectSchduleManagerListAjax( + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + +// ModelAndView modelAndView = new ModelAndView(); +// modelAndView.setViewName("jsonView"); + + //로그인 처리==================================== + //로그인 정보 가져오기 + +// String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model); +// if (!"".equals(s_oprtnLoginCheckNInfo)) { +// modelAndView.addObject("result", "loginFail"); +// return modelAndView; +// } + + //로그인 처리==================================== + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + + vEPrcsDetailVO.setsTodate(vEPrcsDetailVO.getsTodate().split("T")[0].replaceAll("-", "")); + List vEPrcsDetailVOList = vEPrcsAplctPrdService.selectSchduleManagerList(vEPrcsDetailVO); + +// modelAndView.addObject("data", vEPrcsDetailVOList); +// modelAndView.addObject("result", "success"); + + return vEPrcsDetailVOList; + + } /** * 교육소개 임시페이지 */ diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/web/InstrPrflController.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/web/InstrPrflController.java index 22a64fed..f1f267f8 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/web/InstrPrflController.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/web/InstrPrflController.java @@ -955,7 +955,7 @@ public class InstrPrflController { schduleManageVO.setSearchStartDt(schduleManageVO.getSearchStartDt().split("T")[0].replaceAll("-", "")); - + System.out.println("================="); return schduleManageService.selectSchManageStatusInstrList(schduleManageVO); } ////////////////////////////////////////////////////////////////////////////////////////////////////////////// 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 0d6e98f3..dc5c4efa 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 @@ -55,4 +55,6 @@ public interface VEPrcsAplctPrdService { void updateEtc(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 186b71ab..8d1946e3 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 @@ -154,6 +154,10 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { private String mberNm; + private String sTodate; + private String start; + private String send; + @@ -749,6 +753,24 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { public void setMberNm(String mberNm) { this.mberNm = mberNm; } + public String getsTodate() { + return sTodate; + } + public void setsTodate(String sTodate) { + this.sTodate = sTodate; + } + public String getStart() { + return start; + } + public void setStart(String start) { + this.start = start; + } + public String getSend() { + return send; + } + public void setSend(String send) { + this.send = send; + } } 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 b6e578cc..1bcbf26f 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 @@ -119,5 +119,9 @@ public class VEPrcsAplctPrdDAO extends EgovAbstractDAO { public void updateEtc(VEPrcsDetailVO vEPrcsDetailVO) { update("VEPrcsAplctPrdDAO.updateEtc", 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 dc2ce958..5e3f5ad3 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 @@ -127,4 +127,9 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService { vEPrcsAplctPrdDAO.updateEtc(vEPrcsDetailVO); } + @Override + public List selectSchduleManagerList(VEPrcsDetailVO vEPrcsDetailVO) { + return vEPrcsAplctPrdDAO.selectSchduleManagerList(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 b9f56b1d..20c2c07e 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 @@ -723,4 +723,23 @@ PRCS_APLCT_PRD_ORD = #prcsAplctPrdOrd# AND EDU_APLCT_ORD = #eduAplctOrd# + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp index 2b554295..af519fde 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp @@ -49,6 +49,7 @@ $(document).ready(function(){ // dayDiff 값을 추가합니다. newRow.append('' + dayDiff + ''); + console.log('currentMonth : ' ,currentMonth); // 교육일정 칼럼을 초기화합니다. for (var i = 1; i <= 12; i++) { // 다음 월 class @@ -61,6 +62,7 @@ $(document).ready(function(){ } else if (i === currentMonth) { cellClass = "edup_this"; } + if (i === parseInt(startDt.split('.')[1])) { newRow.append('' + parseInt(startDt.split('.')[2]) + ''); } else { @@ -458,7 +460,7 @@ $(document).ready(function(){
- +
총 6개의 검색결과가 있습니다.
    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp index 6bb86cb4..d9b4b8c0 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp @@ -206,9 +206,9 @@
    Q&A
    -
    - -
    + + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp index add3db68..aa75c8c3 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp @@ -11,71 +11,32 @@ 교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템 + + + + @@ -314,6 +491,7 @@ $(document).ready(function(){
+
@@ -464,86 +642,9 @@ $(document).ready(function(){
-
- - - - -
-
총 6개의 검색결과가 있습니다.
-
    -
  • 지난교육일정
    • -
  • 당월교육일정
    • -
  • 교육예정일정
    • -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
교육일정표
교육과정명
(상세 내용을 보시려면 과정을 클릭하세요)		일수교육일정(교육 시작일)
123456789101112
-
- +
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp index 8c4f6a02..42fb1bf2 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp @@ -200,6 +200,9 @@
Q&A
+
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflSchdl.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflSchdl.jsp index 5b7c52d7..91eb410b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflSchdl.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflSchdl.jsp @@ -1,293 +1,293 @@ -<%-- - - Class Name : instrPrflSchdl.jsp - Description : 청소년 강사 일정 달력 - Modification Information - - 수정일 수정자 수정내용 - ------- -------- --------------------------- - 2021.12.02 조용준 내용 - - author : 조용준 - since : 2021.12.02 - ---%> -<%@ page contentType="text/html; charset=utf-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> - - - - - - - - -일정현황 - - - - - - - - -
- -
- -
-

일정현황 - -

-
-
- -
-
- -
-
-
- - - - - -
-
- -
- - -
-
-
-
- -
- - +<%-- + + Class Name : instrPrflSchdl.jsp + Description : 청소년 강사 일정 달력 + Modification Information + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2021.12.02 조용준 내용 + + author : 조용준 + since : 2021.12.02 + +--%> +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + + + + + + + +일정현황 + + + + + + + + +
+ +
+ +
+

일정현황 + +

+
+
+ +
+
+ +
+
+
+ + + + + +
+
+ +
+ + +
+
+
+
+ +
+ + \ No newline at end of file