From 6ae2cfce9f70c33d60cd09ae92828f9513254412 Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 20 Nov 2023 15:33:25 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EA=B8=B0=EB=B0=98=EA=B0=95=ED=99=94?= =?UTF-8?q?=EC=97=B0=EC=88=98=20=EB=AC=B8=EC=9D=98=ED=95=98=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prcsInfo/service/VEPrcsDetailVO.java | 8 + .../prcsInfo/service/VEPrcsService.java | 6 + .../impl/VEPrcsAplctPrdServiceImpl.java | 4 +- .../prcsInfo/service/impl/VEPrcsDAO.java | 12 ++ .../service/impl/VEPrcsServiceImpl.java | 15 ++ .../web/FndthPrcsInfoMngController.java | 103 ++++++++- .../sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml | 1 + .../ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml | 6 +- .../sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml | 65 ++++++ .../fndthEnhanceTrn/fndthEduQnaMngDetail.jsp | 197 ++++++++++++++++++ .../fndthEnhanceTrn/fndthEduQnaMngList.jsp | 129 +++++------- .../ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp | 58 ++---- .../jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp | 8 +- .../jsp/web/ve/aplct/sspnIdtmt/main.jsp | 2 +- 14 files changed, 488 insertions(+), 126 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduQnaMngDetail.jsp 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 0f284399..e2aa47f0 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 @@ -149,6 +149,8 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { private String qnaAnswerCn; private String qnaAnswerer; + private String mberNm; + @@ -723,6 +725,12 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { public void setQnaAnswerer(String qnaAnswerer) { this.qnaAnswerer = qnaAnswerer; } + public String getMberNm() { + return mberNm; + } + public void setMberNm(String mberNm) { + this.mberNm = mberNm; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsService.java index ca47e14e..ed8979d9 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsService.java @@ -32,5 +32,11 @@ public interface VEPrcsService { void deleteInstr(VEPrcsDetailVO vEPrcsDetailVO); void updateImageAtchFileId(VEPrcsDetailVO vEPrcsDetailVO); + + List selectQnaPagingList(VEPrcsDetailVO vEPrcsDetailVO); + + VEPrcsDetailVO selectQnaDetail(VEPrcsDetailVO vEPrcsDetailVO); + + void qnaUpdate(VEPrcsDetailVO 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 29f8d8e6..70598b41 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 @@ -120,8 +120,8 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService { @Override public void updateEtc(VEPrcsDetailVO vEPrcsDetailVO) { System.out.println(vEPrcsDetailVO.getPrpsCn()); - System.out.println(vEPrcsDetailVO.getChrctCn()); - System.out.println(vEPrcsDetailVO.getPrcsAplctPrdOrd()); +// System.out.println(vEPrcsDetailVO.getChrctCn()); +// System.out.println(vEPrcsDetailVO.getPrcsAplctPrdOrd()); vEPrcsAplctPrdDAO.updateEtc(vEPrcsDetailVO); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsDAO.java index 3c553509..93bed127 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsDAO.java @@ -84,5 +84,17 @@ public class VEPrcsDAO extends EgovAbstractDAO { public void updateImageAtchFileId(VEPrcsDetailVO vEPrcsDetailVO) { update("VEPrcsDAO.updateImageAtchFileId", vEPrcsDetailVO); } + + public List selectQnaPagingList(VEPrcsDetailVO vEPrcsDetailVO) { + return (List) list("VEPrcsDAO.selectQnaPagingList", vEPrcsDetailVO); + } + + public VEPrcsDetailVO selectQnaDetail(VEPrcsDetailVO vEPrcsDetailVO) { + return (VEPrcsDetailVO) select("VEPrcsDAO.selectQnaDetail", vEPrcsDetailVO); + } + + public void qnaUpdate(VEPrcsDetailVO vEPrcsDetailVO) { + update("VEPrcsDAO.qnaUpdate", vEPrcsDetailVO); + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsServiceImpl.java index 7c6e7579..df4a90c7 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsServiceImpl.java @@ -69,5 +69,20 @@ public class VEPrcsServiceImpl implements VEPrcsService { public void updateImageAtchFileId(VEPrcsDetailVO vEPrcsDetailVO) { vEPrcsDAO.updateImageAtchFileId(vEPrcsDetailVO); } + + @Override + public List selectQnaPagingList(VEPrcsDetailVO vEPrcsDetailVO) { + return vEPrcsDAO.selectQnaPagingList(vEPrcsDetailVO); + } + + @Override + public VEPrcsDetailVO selectQnaDetail(VEPrcsDetailVO vEPrcsDetailVO) { + return vEPrcsDAO.selectQnaDetail(vEPrcsDetailVO); + } + + @Override + public void qnaUpdate(VEPrcsDetailVO vEPrcsDetailVO) { + vEPrcsDAO.qnaUpdate(vEPrcsDetailVO); + } } diff --git a/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsInfoMng/web/FndthPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsInfoMng/web/FndthPrcsInfoMngController.java index 822e4c6e..d82cf32e 100644 --- a/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsInfoMng/web/FndthPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsInfoMng/web/FndthPrcsInfoMngController.java @@ -234,12 +234,12 @@ public class FndthPrcsInfoMngController { //기반강화 조회 vEPrcsDetailVO.setLctrDivCd("50"); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 - if(StringUtil.isNotEmpty(vEPrcsDetailVO.getSearchKeyword())){ - String selectCondition = "AND a.PRCS_NM LIKE CONCAT ('%', '" +vEPrcsDetailVO.getSearchKeyword() + "', '%')"; - vEPrcsDetailVO.setSelectPagingListQuery(selectCondition); - } +// if(StringUtil.isNotEmpty(vEPrcsDetailVO.getSearchKeyword())){ +// String selectCondition = "AND a.PRCS_NM LIKE CONCAT ('%', '" +vEPrcsDetailVO.getSearchKeyword() + "', '%')"; +// vEPrcsDetailVO.setSelectPagingListQuery(selectCondition); +// } - List vEPrcsDetailVOList = vEPrcsService.selectPagingList(vEPrcsDetailVO); + List vEPrcsDetailVOList = vEPrcsService.selectQnaPagingList(vEPrcsDetailVO); //3.pageing step3 paginationInfo = this.setPagingStep3(vEPrcsDetailVOList, paginationInfo); @@ -247,6 +247,9 @@ public class FndthPrcsInfoMngController { model.addAttribute("paginationInfo", paginationInfo); + // 사용자 이름 디코딩 + vEPrcsDetailVOList.stream().forEach(t->t.setMberNm(egovCryptoUtil.decrypt(t.getMberNm()))); + //대상 리스트, 페이징 정보 전달 model.addAttribute("list", vEPrcsDetailVOList); @@ -348,10 +351,53 @@ public class FndthPrcsInfoMngController { VEPrcsCntntVO vePrcsCntntVO = new VEPrcsCntntVO(); vePrcsCntntVO.setPrcsOrd(vEPrcsDetailVO.getPrcsOrd()); List vEPrcsCntntList = vEPrcsOnlnCntntService.selectList(vePrcsCntntVO); + + model.addAttribute("vEPrcsCntntList", vEPrcsCntntList); return "/oprtn/fndthEnhanceTrn/fndthEduPrcsMngDetail"; } + + /** + * @methodName : fndthEduPrcsMngDetail + * @author : 이호영 + * @date : 2023.11.20 + * @description : + * @param vEPrcsDetailVO + * @param model + * @param redirectAttributes + * @param session + * @param request + * @return + * @throws Exception + */ + @RequestMapping("/kccadr/oprtn/fndthEnhanceTrn/fndthEduQnaMngDetail.do") + public String fndthEduQnaMngDetail( + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + + , ModelMap model + , RedirectAttributes redirectAttributes + , HttpSession session + , HttpServletRequest request + ) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + System.out.println("vEPrcsDetailVO.getPrcsAplctPrdQnaOrd() : "+ vEPrcsDetailVO.getPrcsAplctPrdQnaOrd()); + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + //로그인 처리==================================== + + //과정 조회 + VEPrcsDetailVO vEPrcsQnaDetail = vEPrcsService.selectQnaDetail(vEPrcsDetailVO); + vEPrcsQnaDetail.setMberNm(egovCryptoUtil.decrypt(vEPrcsQnaDetail.getMberNm())); + + model.addAttribute("info", vEPrcsQnaDetail); + //세부과정 목록 조회 + + return "/oprtn/fndthEnhanceTrn/fndthEduQnaMngDetail"; + } /** * 기반강화연수과정 수정화면 @@ -484,6 +530,53 @@ public class FndthPrcsInfoMngController { return modelAndView; } + /** + * @methodName : fndthEduQnaMngUpdateAjax + * @author : 이호영 + * @date : 2023.11.20 + * @description : + * @param vEPrcsDetailVO + * @param model + * @param request + * @return + * @throws Exception + */ + @RequestMapping("/kccadr/oprtn/fndthEnhanceTrn/fndthEduQnaMngUpdateAjax.do") + public ModelAndView fndthEduQnaMngUpdateAjax( + @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.setLastUpdusrId(loginVO.getUniqId()); //esntl_id + vEPrcsService.qnaUpdate(vEPrcsDetailVO); + + + //세부과정 지우고 다시 생성 + VEPrcsCntntVO vEPrcsCntntVO = new VEPrcsCntntVO(); + vEPrcsCntntVO.setPrcsOrd(vEPrcsDetailVO.getPrcsOrd()); + modelAndView.addObject("result", "success"); + return modelAndView; + } + @RequestMapping("/kccadr/oprtn/fndthEnhanceTrn/fndthEduPhotoPopupAjax.do") public ModelAndView fndthEduPhotoPopupAjax( 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 689a0653..c28f342e 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 @@ -1355,6 +1355,7 @@ VEA_PRCS_APLCT_PRD_QNA WHERE QNA_REGIST = #qnaRegist# + AND LCTR_DIV_CD = #lctrDivCd# 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 697df2ef..29323d68 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 @@ -143,17 +143,17 @@ - + + /* VEPrcsDAO.selectQnaPagingList */ + + SELECT + qn.PRCS_APLCT_PRD_QNA_ORD as prcsAplctPrdQnaOrd + , qn.LCTR_DIV_CD as lctrDivCd + , qn.QNA_REGIST as qnaRegist + , mb.MBER_NM AS mberNm + , qn.QNA_CN as qnaCn + , qn.QNA_ANSWER_CN as qnaAnswerCn + , qn.QNA_ANSWERER as qnaAnswerer + ,TO_CHAR(qn.FRST_REGIST_PNTTM,'YYYY-MM-DD') AS frstRegistPnttm + , qn.FRST_REGISTER_ID as frstRegisterId + ,TO_CHAR(qn.LAST_UPDT_PNTTM,'YYYY-MM-DD') AS lastUpdtPnttm + , qn.LAST_UPDUSR_ID as lastUpdusrId + FROM + VEA_PRCS_APLCT_PRD_QNA qn + LEFT JOIN LETTNGNRLMBER mb + ON qn.QNA_REGIST = mb.MBER_ID + WHERE + 1=1 + AND LCTR_DIV_CD = #lctrDivCd# + + + + + + + + + + /* VEPrcsDAO.qnaUpdate */ + + UPDATE VEA_PRCS_APLCT_PRD_QNA SET + QNA_ANSWER_CN = #qnaAnswerCn# + , LAST_UPDUSR_ID = #lastUpdusrId# + , LAST_UPDT_PNTTM = SYSDATE + WHERE PRCS_APLCT_PRD_QNA_ORD = #prcsAplctPrdQnaOrd# + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduQnaMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduQnaMngDetail.jsp new file mode 100644 index 00000000..753c086e --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduQnaMngDetail.jsp @@ -0,0 +1,197 @@ + +<%@ 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="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<% + /** + * @Class Name : fndthEduPrcsMngDetail.jsp + * @Description : 기반강화연수 상세화면 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.12.16 조용준 최초 생성 + * @author 조용주 + * @since 2021.12.16 + * @version 1.0 + * @see + * + */ +%> + + +교육과정관리 + + + + + +
+
+ + + +
+
+ + +
+

교육문의상세

+
    +
  • +
  • +

    실무자역량강화(기반강화연수관리)

    +
  • +
  • 교육문의상세
  • +
+
+ + +
+ +
+

교육문의상세

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
질문자ID + +
질문자 이름 + +
질문내용 + +
답변상태 + + + 미완료 + + + 완료 + + +
답변일시 + + + - + + + + + +
+
+ + +
+

답변

+
+
+ + + + + + + + + + +
+

내용

+
+
+ + +
+
+
+ + + +
+
+
+
+
+
+ +
+
+
+
+
+
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduQnaMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduQnaMngList.jsp index 96f0c4cd..4ed7c19b 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduQnaMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduQnaMngList.jsp @@ -13,13 +13,13 @@ <% /** - * @Class Name : fndthEduPrcsMngList.jsp + * @Class Name : fndthEduQnaMngList.jsp * @Description : 기반강화연수 과정관리 목록 * @Modification Information * @ - * @ 수정일 수정자 수정내용 - * @ ------- -------- --------------------------- - * @ 2021.12.14 조용준 최초 생성 + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2023.11.17 이호영 최초 생성 * @author 조용준 * @since 2021.12.14 * @version 1.0 @@ -45,25 +45,20 @@ var listForm = document.listForm ; listForm.pageIndex.value = pageNo ; listForm.searchKeyword.value = $('#searchKeyword').val(); - listForm.action = ""; + listForm.action = ""; listForm.submit(); } - function fncGoDetail(prcsOrd){ - var listForm = document.listForm ; - listForm.prcsOrd.value = prcsOrd ; - listForm.action = ""; - listForm.submit(); + function fncGoDetail(prcsAplctPrdQnaOrd){ + var form = document.detailForm ; + form.prcsAplctPrdQnaOrd.value = prcsAplctPrdQnaOrd ; + form.action = ""; + form.submit(); } - function fncCreate() { - var listForm = document.listForm ; - listForm.action = ""; - listForm.submit(); - } - + /* function fncDelete(prcsOrd){ document.listForm.prcsOrd.value = prcsOrd ; @@ -98,50 +93,17 @@ } event.stopImmediatePropagation(); - } + } */ - function fncSaveSort(prcsOrd, count){ - - var sortNo = $('#prcsSortNo'+count).val(); - - if(sortNo == ''){ - - alert("표시순서를 입력해 주세요."); - return false; - - } - - $('#prcsOrd').val(prcsOrd); - $('#prcsSortNo').val(sortNo); - var data = new FormData(document.getElementById("listForm")); - var url = ""; - $.ajax({ - type:"POST", - url: url, - data: data, - dataType:'json', - async: false, - processData: false, - contentType: false, - cache: false, - success:function(returnData){ - if(returnData.result == "success"){ - alert("저장되었습니다."); - document.listForm.prcsOrd.value = ""; //리스트 이동시 prcsOrd 초기화 - fncGoList(); - } - }, - error:function(request , status, error){ - alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); - } - }); - - } - 교육과정관리 + 교육문의 +
+ + +
" /> @@ -154,20 +116,20 @@
-

과정관리목록

+

교육문의목록

  • 실무자역량강화(기반강화연수관리)

  • -
  • 과정관리목록
  • +
  • 교육문의목록
-

교육 과정 관리

+

교육 문의 관리

@@ -212,45 +174,57 @@
- + - - - - - + + + + + + - - + - @@ -271,7 +245,6 @@
-
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 f713dfed..2b554295 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 @@ -74,10 +74,27 @@ $(document).ready(function(){ //-- /반복끝 }); + + // 이달의 과정 상태값 확인 + $(".best_con").each(function() { + var currentDate = new Date(); // 현재 날짜 가져오기 + var strtPnttmValue = $(this).find("#strtPnttm").val(); // 시작 시간 값 가져오기 + var endPnttmValue = $(this).find("#endPnttm").val(); // 종료 시간 값 가져오기 + + var strtDate = new Date(strtPnttmValue); // 시작 시간을 Date 객체로 변환 + var endDate = new Date(endPnttmValue); // 종료 시간을 Date 객체로 변환 + + + // 현재 날짜가 시작 시간과 종료 시간 사이에 있는지 확인 + if (currentDate >= strtDate && currentDate <= endDate) { + console.log("현재 날짜가 포함됩니다: " + $(this).text().trim()); + } else { + console.log("현재 날짜가 포함되지 않습니다: " + $(this).text().trim()); + $(this).find("button").attr('onclick', 'location.href="${pageContext.request.contextPath}/web/ve/aplct/fndtnEnhanceTrn/eduInfo.do"') + } + }); - - - // 상태값 확인 + // 리스트 상태값 확인 $(".ddlnCdStts").each(function() { var $thisCell = $(this); var $applyButton = $thisCell.closest('tr').find(".aplctBtn button"); @@ -290,8 +307,9 @@ $(document).ready(function(){
-
+ +
  • ~
  • @@ -299,36 +317,6 @@ $(document).ready(function(){
-
@@ -458,7 +446,7 @@ $(document).ready(function(){
- +
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 a898c1c5..2892cf92 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 @@ -58,7 +58,11 @@ function fn_qnaReg(){ - + if(!confirm("문의 등록을 하시겠습니까?")){ + $('#qnaCn').val(''); + $('.btn_popup_close').click(); + return false; + } var data = new FormData(document.getElementById("qnaForm")); @@ -104,7 +108,7 @@
-

대시보드

+

나의강의실

  • '"> 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 85fc9e80..c68a5a2a 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 @@ -51,7 +51,7 @@
    -

    대시보드

    +

    나의강의실

    • 신청중 강의

    • From 084f443f5ed6f6bcb7a63b528ca29905bc65c673 Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 20 Nov 2023 16:49:41 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EB=8C=80=EC=83=81=EC=9E=90=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D/=EC=88=98=EC=A0=95=20=EA=B4=80=ED=95=A0=EC=B2=AD=20or?= =?UTF-8?q?derby=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cmm/service/EgovCmmUseService.java | 160 +++++----- .../kcc/com/cmm/service/impl/CmmUseDAO.java | 169 ++++++----- .../service/impl/EgovCmmUseServiceImpl.java | 284 +++++++++--------- .../trgtMng/web/CndtnTrgtMngController.java | 22 ++ .../let/cmm/use/EgovCmmUse_SQL_Tibero.xml | 203 +++++++------ .../jsp/oprtn/cndtnSspnIdtmt/trgtMdfy.jsp | 16 +- .../jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp | 12 +- 7 files changed, 472 insertions(+), 394 deletions(-) diff --git a/src/main/java/kcc/com/cmm/service/EgovCmmUseService.java b/src/main/java/kcc/com/cmm/service/EgovCmmUseService.java index 2cfc4525..eab0888a 100644 --- a/src/main/java/kcc/com/cmm/service/EgovCmmUseService.java +++ b/src/main/java/kcc/com/cmm/service/EgovCmmUseService.java @@ -1,79 +1,81 @@ -package kcc.com.cmm.service; - -import java.util.List; -import java.util.Map; - -import kcc.com.cmm.ComDefaultCodeVO; - - - -/** - * - * 공통코드등 전체 업무에서 공용해서 사용해야 하는 서비스를 정의하기 위한 서비스 인터페이스 - * @author 공통서비스 개발팀 이삼섭 - * @since 2009.04.01 - * @version 1.0 - * @see - * - *
      - * << 개정이력(Modification Information) >>
      - *
      - *   수정일      수정자           수정내용
      - *  -------    --------    ---------------------------
      - *   2009.03.11  이삼섭          최초 생성
      - *
      - * 
      - */ -public interface EgovCmmUseService { - - /** - * 공통코드를 조회한다. - * - * @param vo - * @return List(코드) - * @throws Exception - */ - public List selectCmmCodeDetail(ComDefaultCodeVO vo) throws Exception; - - /** - * 공통코드를 조회한다.(by String codeId) - * - * @param String codeId - * @return List(코드) - * @throws Exception - */ - public List selectCmmCodeDetail(String codeId) throws Exception; - - /** - * ComDefaultCodeVO의 리스트를 받아서 여러개의 코드 리스트를 맵에 담아서 리턴한다. - * - * @param voList - * @return Map(코드) - * @throws Exception - */ - public Map> selectCmmCodeDetails(List voList) throws Exception; - - /** - * 조직정보를 코드형태로 리턴한다. - * - * @param 조회조건정보 vo - * @return 조직정보 List - * @throws Exception - */ - public List selectOgrnztIdDetail(ComDefaultCodeVO vo) throws Exception; - - /** - * 그룹정보를 코드형태로 리턴한다. - * - * @param 조회조건정보 vo - * @return 그룹정보 List - * @throws Exception - */ - public List selectGroupIdDetail(ComDefaultCodeVO vo) throws Exception; - - public CmmnDetailCode selectCmmCodeDetailValue(ComDefaultCodeVO vo) ; - - public String selectCmmCodeDetailCodeValue(ComDefaultCodeVO vo); - - public String selectCmmCodeDetailCodeValueOnlyName(ComDefaultCodeVO vo); -} +package kcc.com.cmm.service; + +import java.util.List; +import java.util.Map; + +import kcc.com.cmm.ComDefaultCodeVO; + + + +/** + * + * 공통코드등 전체 업무에서 공용해서 사용해야 하는 서비스를 정의하기 위한 서비스 인터페이스 + * @author 공통서비스 개발팀 이삼섭 + * @since 2009.04.01 + * @version 1.0 + * @see + * + *
      + * << 개정이력(Modification Information) >>
      + *
      + *   수정일      수정자           수정내용
      + *  -------    --------    ---------------------------
      + *   2009.03.11  이삼섭          최초 생성
      + *
      + * 
      + */ +public interface EgovCmmUseService { + + /** + * 공통코드를 조회한다. + * + * @param vo + * @return List(코드) + * @throws Exception + */ + public List selectCmmCodeDetail(ComDefaultCodeVO vo) throws Exception; + + /** + * 공통코드를 조회한다.(by String codeId) + * + * @param String codeId + * @return List(코드) + * @throws Exception + */ + public List selectCmmCodeDetail(String codeId) throws Exception; + + /** + * ComDefaultCodeVO의 리스트를 받아서 여러개의 코드 리스트를 맵에 담아서 리턴한다. + * + * @param voList + * @return Map(코드) + * @throws Exception + */ + public Map> selectCmmCodeDetails(List voList) throws Exception; + + /** + * 조직정보를 코드형태로 리턴한다. + * + * @param 조회조건정보 vo + * @return 조직정보 List + * @throws Exception + */ + public List selectOgrnztIdDetail(ComDefaultCodeVO vo) throws Exception; + + /** + * 그룹정보를 코드형태로 리턴한다. + * + * @param 조회조건정보 vo + * @return 그룹정보 List + * @throws Exception + */ + public List selectGroupIdDetail(ComDefaultCodeVO vo) throws Exception; + + public CmmnDetailCode selectCmmCodeDetailValue(ComDefaultCodeVO vo) ; + + public String selectCmmCodeDetailCodeValue(ComDefaultCodeVO vo); + + public String selectCmmCodeDetailCodeValueOnlyName(ComDefaultCodeVO vo); + + public List selectCmmCodeDetailOrderByCode(ComDefaultCodeVO codeParam); +} diff --git a/src/main/java/kcc/com/cmm/service/impl/CmmUseDAO.java b/src/main/java/kcc/com/cmm/service/impl/CmmUseDAO.java index 067c3c4c..d258a9e6 100644 --- a/src/main/java/kcc/com/cmm/service/impl/CmmUseDAO.java +++ b/src/main/java/kcc/com/cmm/service/impl/CmmUseDAO.java @@ -1,78 +1,91 @@ -package kcc.com.cmm.service.impl; - -import java.util.List; - -import org.springframework.stereotype.Repository; - -import kcc.com.cmm.ComDefaultCodeVO; -import kcc.com.cmm.service.CmmnDetailCode; - -/** - * @Class Name : CmmUseDAO.java - * @Description : 공통코드등 전체 업무에서 공용해서 사용해야 하는 서비스를 정의하기위한 데이터 접근 클래스 - * @Modification Information - * - * 수정일 수정자 수정내용 - * ------- ------- ------------------- - * 2009. 3. 11. 이삼섭 - * - * @author 공통 서비스 개발팀 이삼섭 - * @since 2009. 3. 11. - * @version - * @see - * - */ -@Repository("cmmUseDAO") -public class CmmUseDAO extends EgovComAbstractDAO { - - /** - * 주어진 조건에 따른 공통코드를 불러온다. - * - * @param vo - * @return - * @throws Exception - */ - @SuppressWarnings("unchecked") - public List selectCmmCodeDetail(ComDefaultCodeVO vo) throws Exception { - return (List) list("CmmUseDAO.selectCmmCodeDetail", vo); - } - - /** - * 공통코드로 사용할 조직정보를 를 불러온다. - * - * @param vo - * @return - * @throws Exception - */ - @SuppressWarnings("unchecked") - public List selectOgrnztIdDetail(ComDefaultCodeVO vo) throws Exception { - return (List) list("CmmUseDAO.selectOgrnztIdDetail", vo); - } - - /** - * 공통코드로 사용할그룹정보를 를 불러온다. - * - * @param vo - * @return - * @throws Exception - */ - @SuppressWarnings("unchecked") - public List selectGroupIdDetail(ComDefaultCodeVO vo) throws Exception { - return (List) list("CmmUseDAO.selectGroupIdDetail", vo); - } - - /** - * 주어진 조건에 따른 공통코드를 불러온다. - * - * @param vo - * @return - * @throws Exception - */ - public CmmnDetailCode selectCmmCodeDetailValue(ComDefaultCodeVO vo) { - return (CmmnDetailCode) select("CmmUseDAO.selectCmmCodeDetailValue", vo); - } - - public CmmnDetailCode selectCmmCodeDetailValueOnlyName(ComDefaultCodeVO vo) { - return (CmmnDetailCode) select("CmmUseDAO.selectCmmCodeDetailValueOnlyName", vo); - } -} +package kcc.com.cmm.service.impl; + +import java.util.List; + +import org.springframework.stereotype.Repository; + +import kcc.com.cmm.ComDefaultCodeVO; +import kcc.com.cmm.service.CmmnDetailCode; + +/** + * @Class Name : CmmUseDAO.java + * @Description : 공통코드등 전체 업무에서 공용해서 사용해야 하는 서비스를 정의하기위한 데이터 접근 클래스 + * @Modification Information + * + * 수정일 수정자 수정내용 + * ------- ------- ------------------- + * 2009. 3. 11. 이삼섭 + * + * @author 공통 서비스 개발팀 이삼섭 + * @since 2009. 3. 11. + * @version + * @see + * + */ +@Repository("cmmUseDAO") +public class CmmUseDAO extends EgovComAbstractDAO { + + /** + * 주어진 조건에 따른 공통코드를 불러온다. + * + * @param vo + * @return + * @throws Exception + */ + @SuppressWarnings("unchecked") + public List selectCmmCodeDetail(ComDefaultCodeVO vo) throws Exception { + return (List) list("CmmUseDAO.selectCmmCodeDetail", vo); + } + + /** + * 공통코드로 사용할 조직정보를 를 불러온다. + * + * @param vo + * @return + * @throws Exception + */ + @SuppressWarnings("unchecked") + public List selectOgrnztIdDetail(ComDefaultCodeVO vo) throws Exception { + return (List) list("CmmUseDAO.selectOgrnztIdDetail", vo); + } + + /** + * 공통코드로 사용할그룹정보를 를 불러온다. + * + * @param vo + * @return + * @throws Exception + */ + @SuppressWarnings("unchecked") + public List selectGroupIdDetail(ComDefaultCodeVO vo) throws Exception { + return (List) list("CmmUseDAO.selectGroupIdDetail", vo); + } + + /** + * 주어진 조건에 따른 공통코드를 불러온다. + * + * @param vo + * @return + * @throws Exception + */ + public CmmnDetailCode selectCmmCodeDetailValue(ComDefaultCodeVO vo) { + return (CmmnDetailCode) select("CmmUseDAO.selectCmmCodeDetailValue", vo); + } + + public CmmnDetailCode selectCmmCodeDetailValueOnlyName(ComDefaultCodeVO vo) { + return (CmmnDetailCode) select("CmmUseDAO.selectCmmCodeDetailValueOnlyName", vo); + } + + /** + * @methodName : selectCmmCodeDetailOrderByCode + * @author : 이호영 + * @date : 2023.11.20 + * @description : code로 order by + * @param codeParam + * @return + */ + @SuppressWarnings("unchecked") + public List selectCmmCodeDetailOrderByCode(ComDefaultCodeVO codeParam) { + return (List) list("CmmUseDAO.selectCmmCodeDetailOrderByCode", codeParam); + } +} diff --git a/src/main/java/kcc/com/cmm/service/impl/EgovCmmUseServiceImpl.java b/src/main/java/kcc/com/cmm/service/impl/EgovCmmUseServiceImpl.java index b18bdc52..3b6ed35f 100644 --- a/src/main/java/kcc/com/cmm/service/impl/EgovCmmUseServiceImpl.java +++ b/src/main/java/kcc/com/cmm/service/impl/EgovCmmUseServiceImpl.java @@ -1,139 +1,145 @@ -package kcc.com.cmm.service.impl; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; -import kcc.com.cmm.ComDefaultCodeVO; -import kcc.com.cmm.service.CmmnDetailCode; -import kcc.com.cmm.service.EgovCmmUseService; - -/** - * @Class Name : EgovCmmUseServiceImpl.java - * @Description : 공통코드등 전체 업무에서 공용해서 사용해야 하는 서비스를 정의하기위한 서비스 구현 클래스 - * @Modification Information - * - * 수정일 수정자 수정내용 - * ------- ------- ------------------- - * 2009. 3. 11. 이삼섭 - * - * @author 공통 서비스 개발팀 이삼섭 - * @since 2009. 3. 11. - * @version - * @see - * - */ -@Service("EgovCmmUseService") -public class EgovCmmUseServiceImpl extends EgovAbstractServiceImpl implements EgovCmmUseService { - - @Resource(name = "cmmUseDAO") - private CmmUseDAO cmmUseDAO; - - /** - * 공통코드를 조회한다. - * - * @param vo - * @return - * @throws Exception - */ - @Override - public List selectCmmCodeDetail(ComDefaultCodeVO vo) throws Exception { - return cmmUseDAO.selectCmmCodeDetail(vo); - } - - /** - * 공통코드를 조회한다.(by String codeId) - * - * @param String codeId - * @return - * @throws Exception - */ - @Override - public List selectCmmCodeDetail(String codeId) throws Exception { - ComDefaultCodeVO comDefaultCodeVO = new ComDefaultCodeVO(); - comDefaultCodeVO.setCodeId(codeId); - return cmmUseDAO.selectCmmCodeDetail(comDefaultCodeVO); - } - - /** - * ComDefaultCodeVO의 리스트를 받아서 여러개의 코드 리스트를 맵에 담아서 리턴한다. - * - * @param voList - * @return - * @throws Exception - */ - @Override - @SuppressWarnings("rawtypes") - public Map> selectCmmCodeDetails(List voList) throws Exception { - ComDefaultCodeVO vo; - Map> map = new HashMap>(); - - Iterator iter = voList.iterator(); - while (iter.hasNext()) { - vo = (ComDefaultCodeVO) iter.next(); - map.put(vo.getCodeId(), cmmUseDAO.selectCmmCodeDetail(vo)); - } - - return map; - } - - /** - * 조직정보를 코드형태로 리턴한다. - * - * @param 조회조건정보 vo - * @return 조직정보 List - * @throws Exception - */ - @Override - public List selectOgrnztIdDetail(ComDefaultCodeVO vo) throws Exception { - return cmmUseDAO.selectOgrnztIdDetail(vo); - } - - /** - * 그룹정보를 코드형태로 리턴한다. - * - * @param 조회조건정보 vo - * @return 그룹정보 List - * @throws Exception - */ - @Override - public List selectGroupIdDetail(ComDefaultCodeVO vo) throws Exception { - return cmmUseDAO.selectGroupIdDetail(vo); - } - - @Override - public CmmnDetailCode selectCmmCodeDetailValue(ComDefaultCodeVO vo) { - return cmmUseDAO.selectCmmCodeDetailValue(vo); - } - - @Override - public String selectCmmCodeDetailCodeValue(ComDefaultCodeVO vo) { - String resultCodeNm = ""; - if(StringUtils.isNotBlank(vo.getCodeId()) && StringUtils.isNotBlank(vo.getCode())){ - CmmnDetailCode code = cmmUseDAO.selectCmmCodeDetailValue(vo); - if(code != null){ - resultCodeNm = code.getCodeNm(); - } - } - return resultCodeNm; - } - - @Override - public String selectCmmCodeDetailCodeValueOnlyName(ComDefaultCodeVO vo) { - String resultCodeNm = ""; - if(StringUtils.isNotBlank(vo.getCodeId()) && StringUtils.isNotBlank(vo.getCode())){ - CmmnDetailCode code = cmmUseDAO.selectCmmCodeDetailValueOnlyName(vo); - if(code != null){ - resultCodeNm = code.getCodeNm(); - } - } - return resultCodeNm; - } -} +package kcc.com.cmm.service.impl; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import javax.annotation.Resource; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; +import kcc.com.cmm.ComDefaultCodeVO; +import kcc.com.cmm.service.CmmnDetailCode; +import kcc.com.cmm.service.EgovCmmUseService; + +/** + * @Class Name : EgovCmmUseServiceImpl.java + * @Description : 공통코드등 전체 업무에서 공용해서 사용해야 하는 서비스를 정의하기위한 서비스 구현 클래스 + * @Modification Information + * + * 수정일 수정자 수정내용 + * ------- ------- ------------------- + * 2009. 3. 11. 이삼섭 + * + * @author 공통 서비스 개발팀 이삼섭 + * @since 2009. 3. 11. + * @version + * @see + * + */ +@Service("EgovCmmUseService") +public class EgovCmmUseServiceImpl extends EgovAbstractServiceImpl implements EgovCmmUseService { + + @Resource(name = "cmmUseDAO") + private CmmUseDAO cmmUseDAO; + + /** + * 공통코드를 조회한다. + * + * @param vo + * @return + * @throws Exception + */ + @Override + public List selectCmmCodeDetail(ComDefaultCodeVO vo) throws Exception { + return cmmUseDAO.selectCmmCodeDetail(vo); + } + + /** + * 공통코드를 조회한다.(by String codeId) + * + * @param String codeId + * @return + * @throws Exception + */ + @Override + public List selectCmmCodeDetail(String codeId) throws Exception { + ComDefaultCodeVO comDefaultCodeVO = new ComDefaultCodeVO(); + comDefaultCodeVO.setCodeId(codeId); + return cmmUseDAO.selectCmmCodeDetail(comDefaultCodeVO); + } + + /** + * ComDefaultCodeVO의 리스트를 받아서 여러개의 코드 리스트를 맵에 담아서 리턴한다. + * + * @param voList + * @return + * @throws Exception + */ + @Override + @SuppressWarnings("rawtypes") + public Map> selectCmmCodeDetails(List voList) throws Exception { + ComDefaultCodeVO vo; + Map> map = new HashMap>(); + + Iterator iter = voList.iterator(); + while (iter.hasNext()) { + vo = (ComDefaultCodeVO) iter.next(); + map.put(vo.getCodeId(), cmmUseDAO.selectCmmCodeDetail(vo)); + } + + return map; + } + + /** + * 조직정보를 코드형태로 리턴한다. + * + * @param 조회조건정보 vo + * @return 조직정보 List + * @throws Exception + */ + @Override + public List selectOgrnztIdDetail(ComDefaultCodeVO vo) throws Exception { + return cmmUseDAO.selectOgrnztIdDetail(vo); + } + + /** + * 그룹정보를 코드형태로 리턴한다. + * + * @param 조회조건정보 vo + * @return 그룹정보 List + * @throws Exception + */ + @Override + public List selectGroupIdDetail(ComDefaultCodeVO vo) throws Exception { + return cmmUseDAO.selectGroupIdDetail(vo); + } + + @Override + public CmmnDetailCode selectCmmCodeDetailValue(ComDefaultCodeVO vo) { + return cmmUseDAO.selectCmmCodeDetailValue(vo); + } + + @Override + public String selectCmmCodeDetailCodeValue(ComDefaultCodeVO vo) { + String resultCodeNm = ""; + if(StringUtils.isNotBlank(vo.getCodeId()) && StringUtils.isNotBlank(vo.getCode())){ + CmmnDetailCode code = cmmUseDAO.selectCmmCodeDetailValue(vo); + if(code != null){ + resultCodeNm = code.getCodeNm(); + } + } + return resultCodeNm; + } + + @Override + public String selectCmmCodeDetailCodeValueOnlyName(ComDefaultCodeVO vo) { + String resultCodeNm = ""; + if(StringUtils.isNotBlank(vo.getCodeId()) && StringUtils.isNotBlank(vo.getCode())){ + CmmnDetailCode code = cmmUseDAO.selectCmmCodeDetailValueOnlyName(vo); + if(code != null){ + resultCodeNm = code.getCodeNm(); + } + } + return resultCodeNm; + } + + @Override + public List selectCmmCodeDetailOrderByCode(ComDefaultCodeVO codeParam) { + // TODO Auto-generated method stub + return cmmUseDAO.selectCmmCodeDetailOrderByCode(codeParam); + } +} diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java index e16f3180..0c12205d 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java @@ -22,7 +22,10 @@ import org.springframework.web.servlet.ModelAndView; import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; +import kcc.com.cmm.ComDefaultCodeVO; import kcc.com.cmm.LoginVO; +import kcc.com.cmm.service.CmmnDetailCode; +import kcc.com.cmm.service.EgovCmmUseService; import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.FileVO; import kcc.com.cmm.util.DateUtil; @@ -105,6 +108,8 @@ public class CndtnTrgtMngController { @Resource(name = "EgovFileMngService") private EgovFileMngService fileService; + @Resource(name = "EgovCmmUseService") + private EgovCmmUseService egovCmmUseService; /* @@ -386,6 +391,13 @@ public class CndtnTrgtMngController { String userWork = this.getUserWork(request); model.addAttribute("userWork", userWork); + + + ComDefaultCodeVO codeParam = new ComDefaultCodeVO(); + codeParam.setCodeId("VEA008"); + List CmmnDetailCodeList = egovCmmUseService.selectCmmCodeDetailOrderByCode(codeParam); + model.addAttribute("CmmnDetailCodeList", CmmnDetailCodeList); + return "oprtn/cndtnSspnIdtmt/trgtReg"; } @@ -722,6 +734,16 @@ public class CndtnTrgtMngController { model.addAttribute("info", cndtnTrgtInfoVO); + // 관할청 공통코드 + ComDefaultCodeVO codeParam = new ComDefaultCodeVO(); + codeParam.setCodeId("VEA008"); + List CmmnDetailCodeList = egovCmmUseService.selectCmmCodeDetailOrderByCode(codeParam); + model.addAttribute("CmmnDetailCodeList", CmmnDetailCodeList); + + String userWork = this.getUserWork(request); + model.addAttribute("userWork", userWork); + + //파일 정보 가져오기 FileVO fileVO = new FileVO(); fileVO.setAtchFileId(cndtnTrgtInfoVO.getAtchFileId()); diff --git a/src/main/resources/egovframework/sqlmap/let/cmm/use/EgovCmmUse_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/cmm/use/EgovCmmUse_SQL_Tibero.xml index 1757a85f..47c1033e 100644 --- a/src/main/resources/egovframework/sqlmap/let/cmm/use/EgovCmmUse_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/cmm/use/EgovCmmUse_SQL_Tibero.xml @@ -1,96 +1,109 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMdfy.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMdfy.jsp index 8c199bf8..12b1b798 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMdfy.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMdfy.jsp @@ -332,8 +332,20 @@
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp index 29c264b4..7d631969 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp @@ -279,10 +279,20 @@ diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp index d912d3c9..a3e5fef2 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp @@ -28,7 +28,11 @@ */ %> + + + +
교육부문과정명설명등록일시사용여부 질문자ID질문자이름질문내용답변상태질문일시답변일시
- + ');" style="cursor:pointer;"> - + ');" style="cursor:pointer;"> + ');" style="cursor:pointer;"> - + ');" style="cursor:pointer;"> + - + + + 미완료 + + + 완료 + + + + - - 사용 - - - 미사용 - + + + - + + + + +
관할청 - - + + + + + + + + +
- + --%> + + + + From 589df904a7c7ceab13cb7776e863f413dc0b573b Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 21 Nov 2023 10:52:55 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EA=B8=B0?= =?UTF-8?q?=EB=B0=98=EA=B0=95=ED=99=94=20select2(=EB=8B=A4=EC=A4=91?= =?UTF-8?q?=EC=84=A0=ED=83=9D)=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trgtMng/service/CndtnTrgtMngVO.java | 13 +- .../trgtMng/web/CndtnTrgtMngController.java | 74 ++- .../ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml | 6 + .../jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp | 17 +- .../jsp/oprtn/cndtnSspnIdtmt/trgtMdfy.jsp | 16 +- .../jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp | 70 ++- .../jsp/oprtn/cndtnSspnIdtmt/trgtMngMdfy.jsp | 12 +- .../jsp/oprtn/cndtnSspnIdtmt/trgtMngReg.jsp | 458 ------------------ 8 files changed, 135 insertions(+), 531 deletions(-) delete mode 100644 src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngReg.jsp diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java index a7e6dfd4..1e98b1cd 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java @@ -1,6 +1,8 @@ package kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service; import java.io.Serializable; +import java.util.Arrays; +import java.util.List; import kcc.com.cmm.ComDefaultVO; @@ -42,6 +44,7 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable { private String atchFileId;// 첨부파일 ID + private List searchSelStatusList; @@ -197,8 +200,16 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable { public void setAtchFileId(String atchFileId) { this.atchFileId = atchFileId; } + public List getSearchSelStatusList() { + return searchSelStatusList; + } + public void setSearchSelStatusList(List searchSelStatusList) { + this.searchSelStatusList = searchSelStatusList; + } - + public void setSearchSelStatusToList(String searchSelStatus) { + this.searchSelStatusList = Arrays.asList(searchSelStatus.split(",")); + } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java index 0c12205d..df0f6ef6 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java @@ -169,8 +169,6 @@ public class CndtnTrgtMngController { //로그인 처리==================================== - - String userWork = this.getUserWork(request); cndtnTrgtInfoMngVO.setSearchCondition(userWork); @@ -214,6 +212,9 @@ public class CndtnTrgtMngController { //대상 리스트, 페이징 정보 전달 model.addAttribute("list", cndtnTrgtInfoMngVOList); + + + return "oprtn/cndtnSspnIdtmt/trgtList"; } @@ -257,7 +258,7 @@ public class CndtnTrgtMngController { if (!"".equals(s_oprtnLoginCheckNInfo)) return s_oprtnLoginCheckNInfo; //로그인 처리==================================== - + //1.pageing step1 PaginationInfo paginationInfo = this.setCndtnPagingStep1(cndtnTrgtInfoMngVO); @@ -268,19 +269,23 @@ public class CndtnTrgtMngController { cndtnTrgtInfoMngVO = this.setCndtnPagingStep2(cndtnTrgtInfoMngVO, paginationInfo); //검색 조회 + String selectCondition = ""; if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeyword())){ - - - String selectCondition = ""; String searchStatus = cndtnTrgtInfoMngVO.getSearchStatus(); - - selectCondition = "AND a."+searchStatus+" LIKE CONCAT ('%', '" +cndtnTrgtInfoMngVO.getSearchKeyword() + "', '%')"; +// selectCondition = "AND a."+searchStatus+" LIKE CONCAT ('%', '" +cndtnTrgtInfoMngVO.getSearchKeyword() + "', '%')"; + selectCondition = "AND a."+searchStatus+" LIKE '%" +cndtnTrgtInfoMngVO.getSearchKeyword() + "%'"; cndtnTrgtInfoMngVO.setSearchQuery(selectCondition); - } - -// List cndtnTrgtInfoMngVOList = cndtnTrgtInfoMngService.selectPagingList(cndtnTrgtInfoMngVO); + + System.out.println("cndtnTrgtInfoMngVO.getSearchSelStatus() : "+ cndtnTrgtInfoMngVO.getSearchSelStatus()); + + if(StringUtils.isNotEmpty(cndtnTrgtInfoMngVO.getSearchSelStatus())) + { + cndtnTrgtInfoMngVO.setSearchSelStatusToList(cndtnTrgtInfoMngVO.getSearchSelStatus()); + } + List cndtnTrgtInfoMngVOList = null; + try { cndtnTrgtInfoMngVOList = cndtnTrgtInfoMngService.selectPagingList(cndtnTrgtInfoMngVO); @@ -297,6 +302,11 @@ public class CndtnTrgtMngController { //대상 리스트, 페이징 정보 전달 model.addAttribute("list", cndtnTrgtInfoMngVOList); + + ComDefaultCodeVO codeParam = new ComDefaultCodeVO(); + codeParam.setCodeId("VEA008"); + List CmmnDetailCodeList = egovCmmUseService.selectCmmCodeDetailOrderByCode(codeParam); + model.addAttribute("CmmnDetailCodeList", CmmnDetailCodeList); return "oprtn/cndtnSspnIdtmt/trgtMngList"; } @@ -629,6 +639,9 @@ public class CndtnTrgtMngController { CndtnTrgtMngVO cndtnTrgtInfoVO = cndtnTrgtInfoMngService.selectDetail(cndtnTrgtInfoMngVO); model.addAttribute("info", cndtnTrgtInfoVO); + String userWork = this.getUserWork(request); + model.addAttribute("userWork", userWork); + //파일 정보 가져오기 FileVO fileVO = new FileVO(); @@ -639,38 +652,6 @@ public class CndtnTrgtMngController { return "oprtn/cndtnSspnIdtmt/trgtDetail"; } - /** - * 대상자목록 - */ - @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/trgtMngDetail.do") - public String trgtMngDetail( - @ModelAttribute("cndtnTrgtInfoMngVO") CndtnTrgtMngVO cndtnTrgtInfoMngVO - , ModelMap model - , HttpServletRequest request - ) throws Exception { - - //로그인 처리==================================== - //로그인 정보 가져오기 - - LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 - SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 - - //로그인 처리==================================== - - //과정 조회 - CndtnTrgtMngVO cndtnTrgtInfoVO = cndtnTrgtInfoMngService.selectDetail(cndtnTrgtInfoMngVO); - model.addAttribute("info", cndtnTrgtInfoVO); - - - //파일 정보 가져오기 - FileVO fileVO = new FileVO(); - fileVO.setAtchFileId(cndtnTrgtInfoVO.getAtchFileId()); - List result = fileService.selectFileInfs(fileVO); - model.addAttribute("fileList", result); - model.addAttribute("fileListCnt", result.size()); - - return "oprtn/cndtnSspnIdtmt/trgtMngDetail"; - } /** * 조건부기소유예과정 수료자 상세화면 */ @@ -782,6 +763,13 @@ public class CndtnTrgtMngController { model.addAttribute("fileList", result); model.addAttribute("fileListCnt", result.size()); + + // 관할청 공통코드 + ComDefaultCodeVO codeParam = new ComDefaultCodeVO(); + codeParam.setCodeId("VEA008"); + List CmmnDetailCodeList = egovCmmUseService.selectCmmCodeDetailOrderByCode(codeParam); + model.addAttribute("CmmnDetailCodeList", CmmnDetailCodeList); + return "oprtn/cndtnSspnIdtmt/trgtMngMdfy"; } diff --git a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml index 1097ccd7..1b6a78f4 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml @@ -201,6 +201,12 @@ AND TO_CHAR(A.FRST_REGIST_PNTTM, 'YYYYMMDD') REPLACE(#searchSmbtEndDt#, '.' , '') + + AND a.cmptnt_athrt IN + + #searchSelStatusList[]# + + ORDER BY a.frst_regist_pnttm desc OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp index 05e9b650..9b4ef269 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp @@ -42,6 +42,11 @@ detailForm.action = ""; detailForm.submit(); } + function fncMngMdfy(){ + var detailForm = document.detailForm ; + detailForm.action = ""; + detailForm.submit(); + } @@ -193,7 +198,17 @@
- + + + + + + + + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMdfy.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMdfy.jsp index 12b1b798..8c199bf8 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMdfy.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMdfy.jsp @@ -332,20 +332,8 @@
관할청 - - - - - - - - - + +