diff --git a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java index 2ae09cf6..1f51129c 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java @@ -841,6 +841,7 @@ public class CommonWebController { System.out.println("===대상차시 가져오기==="); + System.out.println(s_query); VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); vEEduAplctVO.setSelectPagingListQuery(s_query); @@ -857,8 +858,9 @@ public class CommonWebController { } } - - //modelAndView.addObject("rsCnt", rs); + System.out.println("p"); + System.out.println(p); + modelAndView.addObject("cnt", p); //처리된 수량 modelAndView.addObject("result", "success"); return modelAndView; } diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduCnfrmMng/web/NewEduCnfrmMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduCnfrmMng/web/NewEduCnfrmMngTngrController.java index b52afaaa..9bea8ed3 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduCnfrmMng/web/NewEduCnfrmMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduCnfrmMng/web/NewEduCnfrmMngTngrController.java @@ -377,6 +377,129 @@ public class NewEduCnfrmMngTngrController { return modelAndView; } + /** + * 강사 배정(전체)NEW + * fncSpcfcInstrAsgnmInfo + */ + @RequestMapping("popup/instrMassAsgnm20240112Popup.do") + public String instrMassAsgnm20240112Popup( + ModelMap model + , HttpServletRequest request + ) throws Exception { + + + //Step1.자동배정 차시 대상가져오기 + //List vEEduAplctVOList = null; + { + String s_searchStartDt = request.getParameter("searchStartDt"); + String s_searchEndDt = request.getParameter("searchEndDt"); + String s_searchScholNm = request.getParameter("searchScholNm"); + + + + /* + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + vEEduAplctVO.setInstrDiv("10"); //청소년 + vEEduAplctVO.setLctrDivCd("10"); //청소년강의 + vEEduAplctVO.setAprvlCd("60"); //확정코드 + vEEduAplctVO.setSearchStartDt(s_searchStartDt); + vEEduAplctVO.setSearchEndDt(s_searchEndDt); + + if(!"".equals(vEEduAplctVO.getSearchInstrNm())) { + vEEduAplctVO.setSearchInstrNm(egovCryptoUtil.encrypt(vEEduAplctVO.getSearchInstrNm())); + } + + //모든 리스트를 페이징 없이 다 가져온다. + vEEduAplctVO.setPageIndex(0); + + //강사가 할당안된 리스트만 가져온다. + vEEduAplctVO.setSearchAsgnmAprvlCd("90"); + + //Step1.자동배정 대상 차시가져오기 + //강사할당이 없는 배정 대상 차시를 가져온다. + vEEduAplctVOList = vEEduMIXService.selectTngrRsltPagingList(vEEduAplctVO); + */ + + //대상 리스트, 페이징 정보 전달 + model.addAttribute("searchStartDt", s_searchStartDt); + model.addAttribute("searchEndDt", s_searchEndDt); + model.addAttribute("searchScholNm", s_searchScholNm); + } + + return "oprtn/tngrVisitEdu/popup/instrMassAsgnm20240112Popup"; + } + + /** + * 강사 배정 조건 관리 팝업 + * fncSpcfcInstrAsgnmInfo + */ + + @RequestMapping("popup/instrMassAsgnm20240112PopupAjax.do") + public ModelAndView instrMassAsgnm20240112PopupAjax(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", "fail"); + return modelAndView; + } + + //로그인 처리==================================== + + //Step1.자동배정 차시 대상가져오기 + List vEEduAplctVOList = null; + { + String s_searchStartDt = request.getParameter("searchStartDt"); + String s_searchEndDt = request.getParameter("searchEndDt"); + String s_searchScholNm = request.getParameter("searchScholNm"); + + + System.out.println("s_searchStartDt"); + System.out.println(s_searchStartDt); + System.out.println(s_searchEndDt); + + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + vEEduAplctVO.setInstrDiv("10"); //청소년 + vEEduAplctVO.setLctrDivCd("10"); //청소년강의 + vEEduAplctVO.setAprvlCd("60"); //확정코드 + vEEduAplctVO.setSearchStartDt(s_searchStartDt); + vEEduAplctVO.setSearchEndDt(s_searchEndDt); + vEEduAplctVO.setSearchScholNm(s_searchScholNm); + + if(!"".equals(vEEduAplctVO.getSearchInstrNm())) { + vEEduAplctVO.setSearchInstrNm(egovCryptoUtil.encrypt(vEEduAplctVO.getSearchInstrNm())); + } + + //모든 리스트를 페이징 없이 다 가져온다. + vEEduAplctVO.setPageIndex(0); + + //강사가 할당안된 리스트만 가져온다. + vEEduAplctVO.setSearchAsgnmAprvlCd("90"); + + //Step1.자동배정 대상 차시가져오기 + //강사할당이 없는 배정 대상 차시를 가져온다. + + if (!"".equals(s_searchStartDt) && !"".equals(s_searchEndDt)) { + vEEduAplctVOList = vEEduMIXService.selectTngrRsltPagingList(vEEduAplctVO); + + } + + + //대상 리스트, 페이징 정보 전달 + modelAndView.addObject("vEEduAplctVOList", vEEduAplctVOList); + } + + modelAndView.addObject("result", "success"); + + return modelAndView; + } + /** * 강사 월별 시수계산 관리 팝업 * fncSpcfcInstrAsgnmInfo diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp index 42ab3129..4869ebda 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp @@ -376,8 +376,8 @@ //"searchStartDt" - varEduHopeDtStrt = $('#searchStartDt').val(); - varEduHopeDtEnd = $('#searchEndDt').val(); + varEduHopeDtStrt = $('#listForm #searchStartDt').val(); + varEduHopeDtEnd = $('#listForm #searchEndDt').val(); //alert(varEduHopeDtStrt); //alert(varEduHopeDtEnd); @@ -428,6 +428,36 @@ }); } + + //강사배정(전체)-팝업을 통한 수량 카운팅 기능 변환용 + function fncInstrMassAsgnm20240112Popup() { + + + varEduHopeDtStrt = $('#listForm #searchStartDt').val(); + varEduHopeDtEnd = $('#listForm #searchEndDt').val(); + + varSearchScholNm = $('#listForm #searchScholNm').val(); + + if (varEduHopeDtStrt=='' || varEduHopeDtEnd==''){ + alert("대상의 교육일자 기간은 반드시 선택해야 합니다."); + return ; + } + + var form = document.pop2Form; + + form.searchStartDt.value = varEduHopeDtStrt; + form.searchEndDt.value = varEduHopeDtEnd; + form.searchScholNm.value = varSearchScholNm; + + + form.action = ""; + + window.open("#", "_instrMassAsgnm20240112Pop", "scrollbars = no, top=100px, left=100px, height=350px, width=800px"); + form.target = "_instrMassAsgnm20240112Pop"; + form.submit(); + } + + //강사배정(전체) function fncInstrMassAsgnm20231109(){ //교육일자를 확인 해서 있는 경우만 처리한다. var varEduHopeDtStrt = ''; @@ -437,8 +467,8 @@ //"searchStartDt" - varEduHopeDtStrt = $('#searchStartDt').val(); - varEduHopeDtEnd = $('#searchEndDt').val(); + varEduHopeDtStrt = $('#listForm #searchStartDt').val(); + varEduHopeDtEnd = $('#listForm #searchEndDt').val(); //alert(varEduHopeDtStrt); //alert(varEduHopeDtEnd); @@ -561,6 +591,7 @@ }); } + //강사배정(개별) function fncInstrMassAsgnmEA20231115(){ //개별 선택한 경우만 처리한다. @@ -881,6 +912,11 @@ 신청관리 + + + + + @@ -978,6 +1014,8 @@
+ + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrMassAsgnm20240112Popup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrMassAsgnm20240112Popup.jsp new file mode 100644 index 00000000..759e12e6 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrMassAsgnm20240112Popup.jsp @@ -0,0 +1,362 @@ + +<%@ 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="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<% + /** + * @Class Name : instrMassAsgnm20240112Popup.jsp + * @Description : 강사배정(전체) 수량카운트용 팝업 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 안주영 + * @since 2022.1.8 + * @version 1.0 + * @see + * + */ +%> + + + + +<%-- --%> + + + 강사배치 팝업 + + + + +
+
+ + + " /> + " /> + "> + + + + + + +
+
+ +
+

강사배정(전체)

+
+ + +
+
+
+

+ 배정 대상 확인 중... +

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