From 48c7c204501e71c5ea829aab9c7f0479660734b2 Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 24 Oct 2023 10:18:17 +0900 Subject: [PATCH] =?UTF-8?q?2023-10-24=2010:18=20=EC=B2=AD=EC=86=8C?= =?UTF-8?q?=EB=85=84=20=EA=B0=95=EC=82=AC=20=EA=B0=95=EC=9D=98=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EC=83=81=EC=8B=9C=20=EB=B3=B4=EA=B8=B0=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eduEnd/web/EduEndTngrController.java | 2 +- .../web/lctrTngrInfoStngController.java | 72 ++- .../qri/EgovQustnrRespondInfo_SQL_Tibero.xml | 30 +- .../oprtn/tngrVisitEdu/eduAplctMngDetail.jsp | 9 +- .../jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp | 16 +- .../jsp/oprtn/tngrVisitEdu/eduAplctReg.jsp | 8 +- .../tngrVisitEdu/eduAplct/eduAplctMdfy.jsp | 5 + .../tngrVisitEdu/eduEnd/eduEndDetail.jsp | 3 + .../instrInfo/instrDashboard.jsp | 16 +- .../tngrVisitEdu/instrInfo/instrDashboard.jsp | 29 +- .../tngrVisitEdu/lctrInfo/lctrStngDetail.jsp | 509 ++++++++++++++++++ 11 files changed, 666 insertions(+), 33 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/lctrInfo/lctrStngDetail.jsp diff --git a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java index b457f388..36cc948e 100644 --- a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java +++ b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java @@ -585,7 +585,7 @@ public class EduEndTngrController { qustnrRespondManageVO.setQestnrRespondent(qustnrRespondInfoVO.getQestnrRespondent()); qustnrRespondManageVO.setFrstRegisterId(loginVO.getId()); qustnrRespondManageVO.setLastUpdusrId(loginVO.getId()); - //qustnrRespondManageVO.setQestnrTmplatId(qestnrTmplatId); + qustnrRespondManageVO.setQestnrTmplatId(qustnrRespondInfoVO.getQestnrTmplatId()); egovQustnrRespondManageService.insertQustnrRespondManage(qustnrRespondManageVO); // 설문 문항 결과 등록 diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/web/lctrTngrInfoStngController.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/web/lctrTngrInfoStngController.java index a7dbbd1b..ffbce446 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/web/lctrTngrInfoStngController.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/web/lctrTngrInfoStngController.java @@ -112,7 +112,7 @@ public class lctrTngrInfoStngController { /** - * 1.성인대상 강사 강의설정 등록화면 + * 1.청소년대상 강사 강의설정 등록화면 */ @RequestMapping("lctrStngReg.do") public String instrPrflReg( @@ -539,4 +539,74 @@ public class lctrTngrInfoStngController { return modelAndView; } + /** + * 1.청소년대상 강사 강의설정 보기 화면 + */ + @RequestMapping("lctrStngDetail.do") + public String instrPrflDetail( + @ModelAttribute("vELctrDetailVO") VELctrDetailVO vELctrDetailVO + ,@ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + if (loginVO == null || ssoLoginVO == null) { + return checkLoginUtil.getUserLoginPage(model); //로그인 정보가 없으면 로그인 페이지로 이동한다. + } + //로그인 처리==================================== + + //청소년대상 강사 정보 가져오기 + vELctrDetailVO.setInstrDiv(vEInstrDetailVO.getInstrDiv()); //강사구분 10-청소년 20-성인대상 + vELctrDetailVO.setUserId(vEInstrDetailVO.getUserId()); + vELctrDetailVO.setUserId(loginVO.getUniqId()); + + model.addAttribute("info", vELctrDetailVO); + + //강의지역 조회 + //depth1 + VERsdncVO vERsdncVO = new VERsdncVO(); + System.out.println("List rsdncStep1VOList = vERsdncMIXService.selectRsdncStep1List(vERsdncVO);"); + List rsdncStep1VOList = vERsdncMIXService.selectRsdncStep1List(vERsdncVO); + model.addAttribute("rsdncStep1VOList", rsdncStep1VOList); + + //depth2 + System.out.println("List rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2List(vERsdncVO);"); + System.out.println("List rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2ListNewAdmin(vERsdncVO);=2"); + vERsdncVO.setUserId(vELctrDetailVO.getUserId()); + //List rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2List(vERsdncVO); + + System.out.println("vERsdncVO.getUserId()"); + System.out.println(vERsdncVO.getUserId()); + + if ("".equals(vERsdncVO.getUserId()) || vERsdncVO.getUserId()==null) { + vERsdncVO.setUserId(vELctrDetailVO.getUserId()); + } + + List rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2ListNewAdmin(vERsdncVO); + model.addAttribute("rsdncStep2VOList", rsdncStep2VOList); + + //강의설정테이블 + vELctrDetailVO.setUseYn("Y"); + VELctrDetailVO lctrStngInfo = vELctrMIXService.selectDetail(vELctrDetailVO); + + if (lctrStngInfo!=null) { + //강의 설정 + model.addAttribute("lctrStngInfo", lctrStngInfo); + + //강의지역 조회 + vELctrDetailVO.setRecordCountPerPage(1000); + vELctrDetailVO.setFirstIndex(0); + List vELctrAreaList = vELctrAreaService.selectPagingList(vELctrDetailVO); + model.addAttribute("vELctrAreaList", vELctrAreaList); + } + + + return "/web/ve/instr/tngrVisitEdu/lctrInfo/lctrStngDetail"; + } } diff --git a/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Tibero.xml index a800f8d2..9457f878 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Tibero.xml @@ -87,7 +87,7 @@ MBER_ID EMPLYR_ID, MBER_NM EMPLYR_NM, SEXDSTN_CODE, - DATE_FORMAT(NOW(),'%Y%m%d') BRTH + TO_CHAR(SYSDATE,'YYYYMMDD') BRTH FROM LETTNGNRLMBER WHERE 1=1 AND ESNTL_ID = #uniqId# @@ -100,8 +100,8 @@ A.QUSTNR_SJ qestnrSj, A.QUSTNR_PURPS qestnrPurps, A.QUSTNR_WRITNG_GUIDANCE_CN qestnrWritngGuidanceCn, - DATE_FORMAT(A.QUSTNR_BGNDE, '%Y-%m-%d') QESTNR_BEGIN_DE, - DATE_FORMAT(A.QUSTNR_ENDDE, '%Y-%m-%d') QESTNR_END_DE, + TO_CHAR(A.QUSTNR_BGNDE, 'YYYY-MM-DD') QESTNR_BEGIN_DE, + TO_CHAR(A.QUSTNR_ENDDE, 'YYYY-MM-DD') QESTNR_END_DE, A.FRST_REGIST_PNTTM, A.FRST_REGISTER_ID, A.LAST_UPDT_PNTTM, @@ -116,9 +116,9 @@ + + + + + + --%> + + + + + + + + + + +
+

청소년 강사 강의설정

+
+ + +
+
+
+ +
+

찾아가는 저작권 교육

+ ‘찾아가는 저작권 교육’은 저작권 교육이 필요한 전국 초ㆍ중ㆍ고등학교, 청소년ㆍ아동복지ㆍ노인ㆍ장애인 기관 및 단체 등에 직접 방문하여 + 무료로 강의를 지원하는 맞춤형 교육 서비스입니다. +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + +<%-- --%> +<%-- --%> + + + + + + + +<%-- --%> +<%-- 제출기간 : ~ --%> +<%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
성인 강사 강의설정 (th 명)을 입력하는 표
+

필수입력 항목*

+

강의요일

+
+ +
+ + checked value="Y"> + + + + checked value="Y"> + + + + checked value="Y"> + + + + checked value="Y"> + + + + checked value="Y"> + + +
+ + + +
+

필수입력 항목*

+

강의지역

+
+
+
+
·지역 선택
+
+
    +
  • + +
  • + + +
  • + + +
      + + +
    • + + checked + + + > +
    • + +
      +
      +
    +
  • +
    +
+
+
+
+
·총 0개 지역
+
+
    +
+
+
+
+
+

필수입력 항목*

+

Zoom 가능여부

+
+
+ + checked> + + + + checked> + + +
+
+

필수입력 항목*

+

도서지역 가능 여부

+
+ checked> + + checked> + +
+

필수입력 항목*

+

연강 가능 여부

+
+ checked> + + checked> + +
+
+ +
+
+
+
+ + + + + +<%-- --%> + + +<%-- --%> + + + +
+
+ +
+
+ + + +