diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixDAO.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixDAO.java index f4ac6265..10a27e1b 100644 --- a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixDAO.java +++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixDAO.java @@ -56,13 +56,14 @@ public class VEAStngMixDAO extends EgovAbstractDAO { } //L - public VEAStngVO selectEduAplctDateChkList(VEAStngVO paramVO) throws Exception { - VEAStngVO tlist = (VEAStngVO) list("VEALctrYrStngMixDAO.selectEduAplctDateChkList", paramVO); - return tlist; + public VEAStngVO selectEduAplctDateChkList(VEAStngVO paramVO) throws Exception { + return (VEAStngVO) select("VEALctrYrStngMixDAO.selectEduAplctDateChkList", paramVO); + //return tlist; } public VEAStngVO selectEduAplctTimeChkList(VEAStngVO paramVO) throws Exception { - VEAStngVO tlist = (VEAStngVO) list("VEALctrYrStngMixDAO.selectEduAplctTimeChkList", paramVO); - return tlist; + return (VEAStngVO) select("VEALctrYrStngMixDAO.selectEduAplctTimeChkList", paramVO); + //VEAStngVO tlist = (VEAStngVO) list("VEALctrYrStngMixDAO.selectEduAplctTimeChkList", paramVO); + //return tlist; } } diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixServiceImpl.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixServiceImpl.java index cef1d389..5b769307 100644 --- a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixServiceImpl.java +++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixServiceImpl.java @@ -127,8 +127,15 @@ public class VEAStngMixServiceImpl implements VEAStngMixService { System.out.println("vEAStngVO.toString()3"); + if (dateVO==null) { + //대상 기간이 없다. + flag = false; + break; + } + //위 날짜에 부합하는 데이터가 없는 경우 flag 변경 처리 //가능한 기간에 값이 있고, 불가능한 기간에 값이 없음 + if (Integer.parseInt(dateVO.getDpStrtDt())>0 && Integer.parseInt(dateVO.getDpDdlnDt())<=0){ ; }else { diff --git a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java b/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java index c60aff73..3afe2ff0 100644 --- a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java +++ b/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java @@ -36,6 +36,8 @@ import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailService; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsCntntVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsMIXService; @@ -168,6 +170,10 @@ public class EduEndAdultController { @Resource(name = "checkAdrProcessUtil") private CheckAdrProcessUtil checkAdrProcessUtil; */ + + //강사상세 정보 + @Resource(name="vEInstrDetailService") + private VEInstrDetailService vEInstrDetailService; /** * 교육완료 목록 화면 @@ -416,6 +422,31 @@ public class EduEndAdultController { return "/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail"; } + /** + * 배정강사 정보 조회 + */ + @RequestMapping(value="/selectInstrInfo.do") + public ModelAndView selectInstrInfo( HttpServletRequest request + , ModelMap model + , @ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + System.out.println("vEInstrDetailVO.getUserId() :: "+ vEInstrDetailVO.getUserId()); + + vEInstrDetailVO.setUserId(vEInstrDetailVO.getUserId()); + vEInstrDetailVO.setInstrDiv("20"); + vEInstrDetailVO.setUseYn("Y"); + VEInstrDetailVO info = vEInstrDetailService.selectDetail(vEInstrDetailVO); + + // 강사 정보 select + info = egovCryptoUtil.decryptVEInstrDetailVO(info); + + modelAndView.addObject("info", info); + modelAndView.addObject("result", "success"); + return modelAndView; + } + /** * 교육 설문 팝업 차수정보 조회 */ diff --git a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java index a7f8eae9..d59bb6e4 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java @@ -234,47 +234,55 @@ public class CommonWebController { public ModelAndView dataCallAjax(HttpServletRequest request , ModelMap model , VEEduAplctVO vEEduAplctVO) throws Exception { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); - if(VeConstants.LCTR_DIV_CD_30.equals(vEEduAplctVO.getLctrDivCd())){ - vEEduAplctVO = vEEduAplctService.selectOprtnDetail(vEEduAplctVO); - }else{ - vEEduAplctVO = vEEduAplctService.selectDetail(vEEduAplctVO); - } - - //데이터 복호화 - vEEduAplctVO = egovCryptoUtil.decryptVEEduAplctVOInfo(vEEduAplctVO); - - //사용자 교육신청 과정 리스트 - VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO(); - vEPrcsDetailVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); - vEPrcsDetailVO.setUseYn("Y"); - vEPrcsDetailVO.setLctrDivCd(vEEduAplctVO.getLctrDivCd()); - List vEPrcsDetailVOList = vEPrcsMIXService.selectPrcsList(vEPrcsDetailVO); - - //사용자 교육신청 차시 리스트 - VEEduChasiVO vEEduChasiVO = new VEEduChasiVO(); - vEEduChasiVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); - List vEEduChasiVOList = vVEEduChasiService.selectList(vEEduChasiVO); - - for(int i=0;i result = fileService.selectFileInfs(fileVO); + try { + if(VeConstants.LCTR_DIV_CD_30.equals(vEEduAplctVO.getLctrDivCd())){ + vEEduAplctVO = vEEduAplctService.selectOprtnDetail(vEEduAplctVO); + }else{ + vEEduAplctVO = vEEduAplctService.selectDetail(vEEduAplctVO); + } + + //데이터 복호화 + vEEduAplctVO = egovCryptoUtil.decryptVEEduAplctVOInfo(vEEduAplctVO); + + //사용자 교육신청 과정 리스트 + VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO(); + vEPrcsDetailVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); + vEPrcsDetailVO.setUseYn("Y"); + vEPrcsDetailVO.setLctrDivCd(vEEduAplctVO.getLctrDivCd()); + List vEPrcsDetailVOList = vEPrcsMIXService.selectPrcsList(vEPrcsDetailVO); + + //사용자 교육신청 차시 리스트 + VEEduChasiVO vEEduChasiVO = new VEEduChasiVO(); + vEEduChasiVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); + List vEEduChasiVOList = vVEEduChasiService.selectList(vEEduChasiVO); + + for(int i=0;i result = fileService.selectFileInfs(fileVO); + + modelAndView.addObject("info", vEEduAplctVO); + modelAndView.addObject("list", vEPrcsDetailVOList); + modelAndView.addObject("chasiList", vEEduChasiVOList); + modelAndView.addObject("fileList", result); + modelAndView.addObject("fileListCnt", result.size()); + modelAndView.addObject("result", "success"); + + }catch(Exception ex) { + ex.printStackTrace(); + } - modelAndView.addObject("info", vEEduAplctVO); - modelAndView.addObject("list", vEPrcsDetailVOList); - modelAndView.addObject("chasiList", vEEduChasiVOList); - modelAndView.addObject("fileList", result); - modelAndView.addObject("fileListCnt", result.size()); - modelAndView.addObject("result", "success"); return modelAndView; } diff --git a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/web/EduAplctTngrController.java b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/web/EduAplctTngrController.java index 6cb21822..6a9c3ca5 100644 --- a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/web/EduAplctTngrController.java +++ b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/web/EduAplctTngrController.java @@ -285,38 +285,47 @@ public class EduAplctTngrController { // return checkLoginUtil.getUserLoginPage(model); //로그인 정보가 없으면 로그인 페이지로 이동한다. } - //1.교육희망일이 신청 가능한 일자인지 fail3 - VEAStngVO vEAStngVO = new VEAStngVO(); - vEAStngVO.setFrstRegisterId(loginVO.getUniqId()); - vEAStngVO.setRndsOrd(request.getParameter("rndsOrd")); - System.out.println(vEAStngVO.toString()); - boolean flag3 = vEAStngMixService.eduAplctChkDate(vEAStngVO, request); - - if(!flag3){ - modelAndView.addObject("result", "fail3"); - return modelAndView; - } - - //2.신청 시간이 해당 지역의 가능한 시간인지 fail - //신청한 교육 일자 및 시간이 신청기간에 받을수 있는 지역의 시간, 일자 조건에 맞는지 확인 한다. - //boolean flag = vEAStngMixService.eduAplctChkTime(vEAStngVO, request); - boolean flag = eduAplctTngrService.eduAplctChkProcess(vEEduAplctVO, request, modelAndView); + try { + //1.교육희망일이 신청 가능한 일자인지 fail3 + VEAStngVO vEAStngVO = new VEAStngVO(); + vEAStngVO.setFrstRegisterId(loginVO.getUniqId()); + vEAStngVO.setRndsOrd(request.getParameter("rndsOrd")); + System.out.println(vEAStngVO.toString()); + boolean flag3 = vEAStngMixService.eduAplctChkDate(vEAStngVO, request); + + if(!flag3){ + modelAndView.addObject("result", "fail3"); + return modelAndView; + } + + //작업 필요함 2023-10-17 + //2.신청 시간이 해당 지역의 가능한 시간인지 fail + //신청한 교육 일자 및 시간이 신청기간에 받을수 있는 지역의 시간, 일자 조건에 맞는지 확인 한다. + //boolean flag = vEAStngMixService.eduAplctChkTime(vEAStngVO, request); + /* + boolean flag = eduAplctTngrService.eduAplctChkProcess(vEEduAplctVO, request, modelAndView); + + if(!flag){ + modelAndView.addObject("result", "fail"); + return modelAndView; + } + */ + + //동일한 신청건이 있는지 확인(신청자아이디, 교육희망일, 교육대상 동일 건 비교) + boolean flag2 = eduAplctTngrService.eduAplctDuplChkProcess(vEEduAplctVO, request, modelAndView); + + if(!flag2){ + modelAndView.addObject("result", "fail2"); + return modelAndView; + } + + modelAndView.addObject("VO", vEEduAplctVO); + modelAndView.addObject("result", "success"); + + }catch(Exception ex) { + ex.printStackTrace(); + } - if(!flag){ - modelAndView.addObject("result", "fail"); - return modelAndView; - } - //동일한 신청건이 있는지 확인(신청자아이디, 교육희망일, 교육대상 동일 건 비교) - boolean flag2 = eduAplctTngrService.eduAplctDuplChkProcess(vEEduAplctVO, request, modelAndView); - - if(!flag2){ - modelAndView.addObject("result", "fail2"); - return modelAndView; - } - - modelAndView.addObject("VO", vEEduAplctVO); - modelAndView.addObject("result", "success"); - return modelAndView; } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java index 5195329a..50b61a70 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java @@ -97,6 +97,8 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { private String corpsEdu; //집체교육 여부 private String broadroomEdu; //방송실교육 여부 + private String rndsOrd; //회차순번(해당 신청이 속하는 회차 고유 순번) + //ve_edu_aplct_snd_hstry @@ -1569,6 +1571,12 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { public void setLastYear(String lastYear) { this.lastYear = lastYear; } + public String getRndsOrd() { + return rndsOrd; + } + public void setRndsOrd(String rndsOrd) { + this.rndsOrd = rndsOrd; + } } diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java index a9293913..27305607 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java @@ -811,6 +811,46 @@ public class AreaLctrMngTngrController { } + /** + * 패널티 삭제 처리 + */ + @RequestMapping("popup/instrPnltyDelAjax.do") + public ModelAndView instrPnltyDelPopupAjax( + @ModelAttribute("vEInstrAsgnmVO") VEInstrAsgnmVO vEInstrAsgnmVO + , ModelMap model + //, RedirectAttributes redirectAttributes + , 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(); //권한에 따른 로그인 정보 가져오기 + + //교육차시강사배정 테이블에 패널티 정보 삭제 + try { + //목록에서 한 패널티를 여러 유저에게 등록 시 + vEEduPnltyService.delete(vEInstrAsgnmVO); + + } catch (Exception ex) { + ex.printStackTrace(); + } + + 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 new file mode 100644 index 00000000..2d6b780b --- /dev/null +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduCnfrmMng/web/NewEduCnfrmMngTngrController.java @@ -0,0 +1,709 @@ +package kcc.ve.oprtn.tngrVisitEdu.eduCnfrmMng.web; + +import java.util.List; +import java.util.Properties; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +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 egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; +import kcc.com.cmm.ComDefaultVO; +import kcc.com.cmm.service.EgovCmmUseService; +import kcc.com.cmm.service.EgovFileMngService; +import kcc.com.cmm.service.EgovFileMngUtil; +import kcc.com.cmm.util.StringUtil; +import kcc.com.utl.user.service.CheckLoginUtil; +import kcc.let.utl.fcc.service.EgovCryptoUtil; +import kcc.let.utl.fcc.service.VEPagingUtil; +import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAcmdtAplctService; +import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIX2023Service; +import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService; +import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduChasiInstrAsgnmService; +import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduPnltyService; +import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrAsgnmVO; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctService; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiService; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduInstrDstncService; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrMixService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsMIXService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsService; +/** + * 교육확정관리(관리자-청소년찾아가는저작권교육) + * 교육확정관리에 관한 controller 클래스를 정의한다. + * @author 조용준 + * @since 2021.12.16 + * @version 1.0 + * @see + * + *
+ * << 개정이력(Modification Information) >>
+ *
+ *   수정일      수정자           수정내용
+ *  -------    --------    ---------------------------
+ *   2021.12.16  조용준          최초 생성
+ *
+ * 
+ */ + +@Controller +@RequestMapping("/kccadr/oprtn/tngrVisitEdu") +public class NewEduCnfrmMngTngrController { + + private static final Logger LOGGER = LoggerFactory.getLogger(NewEduCnfrmMngTngrController.class); + + //로그인 체크 util + @Resource(name = "checkLoginUtil") + private CheckLoginUtil checkLoginUtil; + + //과정 관리 + @Resource(name = "vEPrcsService") + private VEPrcsService vEPrcsService; + + //신청과정 관리 + @Resource(name = "vEEduMIXService") + private VEEduMIXService vEEduMIXService; + + //교육신청 + @Resource(name = "vEEduAplctService") + private VEEduAplctService vEEduAplctService; + + //교육과정신청 + @Resource(name = "vEPrcsMIXService") + private VEPrcsMIXService vEPrcsMIXService; + + //차시 + @Resource(name = "vEEduChasiService") + private VEEduChasiService vVEEduChasiService; + + // eGov 공통코드 + @Resource(name = "EgovCmmUseService") + private EgovCmmUseService cmmUseService; + + @Resource(name = "EgovFileMngService") + private EgovFileMngService fileService; + + // global 프로퍼티 + @Resource(name="globalSettings") + protected Properties propertiesService; + + //첨부파일 경로, realPath 설정 + @Resource(name="EgovFileMngUtil") + private EgovFileMngUtil fileUtil; + + // 첨부파일 정보 + @Resource(name="EgovFileMngService") + private EgovFileMngService fileMngService; + + //암복호화 유틸 + @Resource(name = "egovCryptoUtil") + EgovCryptoUtil egovCryptoUtil; + + // 교육패널티 + @Resource(name = "vEEduPnltyService") + private VEEduPnltyService vEEduPnltyService; + + // 강의배정정보 + @Resource(name = "vEAsgnmMIXService") + private VEAsgnmMIXService vEAsgnmMIXService; + + // 강의배정정보2023 + @Resource(name = "vEAsgnmMIX2023Service") + private VEAsgnmMIX2023Service vEAsgnmMIX2023Service; + + // 숙박신청정보 + @Resource(name = "vEAcmdtAplctService") + private VEAcmdtAplctService vEAcmdtAplctService; + + // 강사배치 확정 처리 + @Resource(name = "vEEduChasiInstrAsgnmService") + private VEEduChasiInstrAsgnmService vEEduChasiInstrAsgnmService; + + // 강사목록 + @Resource(name = "vEInstrMixService") + private VEInstrMixService vEInstrMixService; + + // 페이지 유틸 + @Resource(name = "vEPagingUtil") + private VEPagingUtil vEPagingUtil; + + // 교육강사거리 + @Resource(name = "vEEduInstrDstncService") + private VEEduInstrDstncService vEEduInstrDstncService; + + /** + * 특정 강사배치 팝업 + * fncSpcfcInstrAsgnmInfo + */ + @RequestMapping("popup/spcfcInstrAsgnmPopup.do") + public String spcfcInstrAsgnmPopup( + @ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO + ,@ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO + ,@ModelAttribute("vEInstrAsgnmVO") VEInstrAsgnmVO vEInstrAsgnmVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + + //String s_userCheckNInfo = checkLoginUtil.userCheckNInfo(model, request); + //if (!"".equals(s_userCheckNInfo)) return s_userCheckNInfo; + + //로그인 처리==================================== + //0.pageing step0 + //온라인 오프라인 여부 확인 + //배치대상신청정보 + //vEEduAplctVO = vEEduAplctService.selectDetail(vEEduAplctVO); + //System.out.println(vEEduAplctVO.getEduSlctCd()); //10-온라인, 20-오프라인 + + //1.pageing step1 + PaginationInfo paginationInfo = this.setPagingStep1(vEInstrDetailVO); + + + //2. pageing step2 + vEInstrDetailVO = this.setPagingStep2(vEInstrDetailVO, paginationInfo); + + //3. SelectPagingListQuery set 할 조건 설정 + String selectCondition = new String(); + //3.1 제출 완료 후 사용중인 데이터 조회 + selectCondition += "AND a0.sbmt_yn='Y' AND a0.use_yn = 'Y'"; + //3.2 강사 테이블 성인강사여부 Y인것만 조회 + //selectCondition += "AND (b0.tngr_instr_yn ='Y' OR a0.qlfct_end_yn = 'Y') "; + //3.3 이름 검색 시 + if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchKeyword())){ + //이름 암호화 - comDefaultVO 검색단어 공통 암호화 + ComDefaultVO comDefaultVO = new ComDefaultVO(); + comDefaultVO.setSearchKeyword(vEInstrDetailVO.getSearchKeyword()); + comDefaultVO = egovCryptoUtil.encryptComDefaultVO(comDefaultVO); + vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); + //selectCondition += "AND a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.getSearchKeyword() + "', '%')"; + selectCondition += "AND a0.instr_nm LIKE '%'||'" +vEInstrDetailVO.getSearchKeyword() + "'||'%'"; + comDefaultVO = egovCryptoUtil.decryptComDefaultVO(comDefaultVO); + vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); + } + //3.4 요청일 시작일 검색 시 + /*if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchStartDt())){ + selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')"; + } + //3.5 요청일 종료일 검색 시 + if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchEndDt())){ + selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')"; + }*/ + + //정보변경 요청사항 있는 강사부터 조회 + vEInstrDetailVO.setOrderByQuery(" rqstCnt DESC "); + + vEInstrDetailVO.setInstrDiv("10"); + vEInstrDetailVO.setSelectPagingListQuery(selectCondition); + + List vEInstrDetailVOList = vEInstrMixService.selectPagingDetailList(vEInstrDetailVO); + + vEInstrDetailVOList = egovCryptoUtil.decryptVEInstrDetailVOList(vEInstrDetailVOList); + + //4.pageing step3 + paginationInfo = this.setPagingStep3(vEInstrDetailVOList, paginationInfo); + model.addAttribute("paginationInfo", paginationInfo); + + //대상 리스트, 페이징 정보 전달 + model.addAttribute("resultList", vEInstrDetailVOList); + + + + //배치 목록 + //1.pageing step1 + PaginationInfo paginationInfo1 = this.setPagingStep_1(vEEduAplctVO); + + //2. pageing step2 + vEEduAplctVO = this.setPagingStep_2(vEEduAplctVO, paginationInfo1); + vEEduAplctVO.setInstrDiv("10"); //청소년 + vEEduAplctVO.setLctrDivCd("10"); //청소년강의 + vEEduAplctVO.setAprvlCd("60"); //확정코드 + + if(!"".equals(vEEduAplctVO.getSearchInstrNm())) { + vEEduAplctVO.setSearchInstrNm(egovCryptoUtil.encrypt(vEEduAplctVO.getSearchInstrNm())); + } + + vEEduAplctVO.setAprvlCd("60"); //확정코드 + + List vEEduAplctVOList = vEEduMIXService.selectTngrRsltPagingList(vEEduAplctVO); + VEEduAplctVO vo = new VEEduAplctVO(); + for(int i=0; i < vEEduAplctVOList.size(); i++) { + vo = egovCryptoUtil.decryptVEEduAplctVOInfo(vEEduAplctVOList.get(i)); + vEEduAplctVOList.get(i).setUserId(vo.getUserId()); + vEEduAplctVOList.get(i).setChrgNm(vo.getChrgNm()); + } + + //3.pageing step3 + paginationInfo1 = this.setPagingStep_3(vEEduAplctVOList, paginationInfo1); + + model.addAttribute("paginationInfo1", paginationInfo1); + model.addAttribute("cryptoUtil", egovCryptoUtil); + + //대상 리스트, 페이징 정보 전달 + model.addAttribute("list", vEEduAplctVOList); + + + + return "oprtn/tngrVisitEdu/popup/spcfcInstrAsgnmPopup"; + } + + /** + * 강사 배정 조건 관리 팝업 + * fncSpcfcInstrAsgnmInfo + */ + @RequestMapping("popup/instrAsgnmCndtnMngPopup.do") + public String instrAsgnmCndtnMngPopup( + @ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO + ,@ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO + ,@ModelAttribute("vEInstrAsgnmVO") VEInstrAsgnmVO vEInstrAsgnmVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + + //String s_userCheckNInfo = checkLoginUtil.userCheckNInfo(model, request); + //if (!"".equals(s_userCheckNInfo)) return s_userCheckNInfo; + + //로그인 처리==================================== + //0.pageing step0 + //온라인 오프라인 여부 확인 + //배치대상신청정보 + //vEEduAplctVO = vEEduAplctService.selectDetail(vEEduAplctVO); + //System.out.println(vEEduAplctVO.getEduSlctCd()); //10-온라인, 20-오프라인 + + //1.pageing step1 + PaginationInfo paginationInfo = this.setPagingStep1(vEInstrDetailVO); + + + //2. pageing step2 + vEInstrDetailVO = this.setPagingStep2(vEInstrDetailVO, paginationInfo); + + //3. SelectPagingListQuery set 할 조건 설정 + String selectCondition = new String(); + //3.1 제출 완료 후 사용중인 데이터 조회 + selectCondition += "AND a0.sbmt_yn='Y' AND a0.use_yn = 'Y'"; + //3.2 강사 테이블 성인강사여부 Y인것만 조회 + //selectCondition += "AND (b0.tngr_instr_yn ='Y' OR a0.qlfct_end_yn = 'Y') "; + //3.3 이름 검색 시 + if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchKeyword())){ + //이름 암호화 - comDefaultVO 검색단어 공통 암호화 + ComDefaultVO comDefaultVO = new ComDefaultVO(); + comDefaultVO.setSearchKeyword(vEInstrDetailVO.getSearchKeyword()); + comDefaultVO = egovCryptoUtil.encryptComDefaultVO(comDefaultVO); + vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); + //selectCondition += "AND a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.getSearchKeyword() + "', '%')"; + selectCondition += "AND a0.instr_nm LIKE '%'||'" +vEInstrDetailVO.getSearchKeyword() + "'||'%'"; + comDefaultVO = egovCryptoUtil.decryptComDefaultVO(comDefaultVO); + vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); + } + //3.4 요청일 시작일 검색 시 + /*if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchStartDt())){ + selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')"; + } + //3.5 요청일 종료일 검색 시 + if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchEndDt())){ + selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')"; + }*/ + + //정보변경 요청사항 있는 강사부터 조회 + vEInstrDetailVO.setOrderByQuery(" rqstCnt DESC "); + + vEInstrDetailVO.setInstrDiv("10"); + vEInstrDetailVO.setSelectPagingListQuery(selectCondition); + + List vEInstrDetailVOList = vEInstrMixService.selectPagingDetailList(vEInstrDetailVO); + + vEInstrDetailVOList = egovCryptoUtil.decryptVEInstrDetailVOList(vEInstrDetailVOList); + + //4.pageing step3 + paginationInfo = this.setPagingStep3(vEInstrDetailVOList, paginationInfo); + model.addAttribute("paginationInfo", paginationInfo); + + //대상 리스트, 페이징 정보 전달 + model.addAttribute("resultList", vEInstrDetailVOList); + + + + //배치 목록 + //1.pageing step1 + PaginationInfo paginationInfo1 = this.setPagingStep_1(vEEduAplctVO); + + //2. pageing step2 + vEEduAplctVO = this.setPagingStep_2(vEEduAplctVO, paginationInfo1); + vEEduAplctVO.setInstrDiv("10"); //청소년 + vEEduAplctVO.setLctrDivCd("10"); //청소년강의 + vEEduAplctVO.setAprvlCd("60"); //확정코드 + + if(!"".equals(vEEduAplctVO.getSearchInstrNm())) { + vEEduAplctVO.setSearchInstrNm(egovCryptoUtil.encrypt(vEEduAplctVO.getSearchInstrNm())); + } + + vEEduAplctVO.setAprvlCd("60"); //확정코드 + + List vEEduAplctVOList = vEEduMIXService.selectTngrRsltPagingList(vEEduAplctVO); + VEEduAplctVO vo = new VEEduAplctVO(); + for(int i=0; i < vEEduAplctVOList.size(); i++) { + vo = egovCryptoUtil.decryptVEEduAplctVOInfo(vEEduAplctVOList.get(i)); + vEEduAplctVOList.get(i).setUserId(vo.getUserId()); + vEEduAplctVOList.get(i).setChrgNm(vo.getChrgNm()); + } + + //3.pageing step3 + paginationInfo1 = this.setPagingStep_3(vEEduAplctVOList, paginationInfo1); + + model.addAttribute("paginationInfo1", paginationInfo1); + model.addAttribute("cryptoUtil", egovCryptoUtil); + + //대상 리스트, 페이징 정보 전달 + model.addAttribute("list", vEEduAplctVOList); + + + + return "oprtn/tngrVisitEdu/popup/instrAsgnmCndtnMngPopup"; + } + + /** + * 강사 월별 시수계산 관리 팝업 + * fncSpcfcInstrAsgnmInfo + */ + @RequestMapping("popup/instrMntTmMngPopup.do") + public String instrMntTmMngPopup( + @ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO + ,@ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO + ,@ModelAttribute("vEInstrAsgnmVO") VEInstrAsgnmVO vEInstrAsgnmVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + + //String s_userCheckNInfo = checkLoginUtil.userCheckNInfo(model, request); + //if (!"".equals(s_userCheckNInfo)) return s_userCheckNInfo; + + //로그인 처리==================================== + //0.pageing step0 + //온라인 오프라인 여부 확인 + //배치대상신청정보 + //vEEduAplctVO = vEEduAplctService.selectDetail(vEEduAplctVO); + //System.out.println(vEEduAplctVO.getEduSlctCd()); //10-온라인, 20-오프라인 + + //1.pageing step1 + PaginationInfo paginationInfo = this.setPagingStep1(vEInstrDetailVO); + + + //2. pageing step2 + vEInstrDetailVO = this.setPagingStep2(vEInstrDetailVO, paginationInfo); + + //3. SelectPagingListQuery set 할 조건 설정 + String selectCondition = new String(); + //3.1 제출 완료 후 사용중인 데이터 조회 + selectCondition += "AND a0.sbmt_yn='Y' AND a0.use_yn = 'Y'"; + //3.2 강사 테이블 성인강사여부 Y인것만 조회 + //selectCondition += "AND (b0.tngr_instr_yn ='Y' OR a0.qlfct_end_yn = 'Y') "; + //3.3 이름 검색 시 + if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchKeyword())){ + //이름 암호화 - comDefaultVO 검색단어 공통 암호화 + ComDefaultVO comDefaultVO = new ComDefaultVO(); + comDefaultVO.setSearchKeyword(vEInstrDetailVO.getSearchKeyword()); + comDefaultVO = egovCryptoUtil.encryptComDefaultVO(comDefaultVO); + vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); + //selectCondition += "AND a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.getSearchKeyword() + "', '%')"; + selectCondition += "AND a0.instr_nm LIKE '%'||'" +vEInstrDetailVO.getSearchKeyword() + "'||'%'"; + comDefaultVO = egovCryptoUtil.decryptComDefaultVO(comDefaultVO); + vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); + } + //3.4 요청일 시작일 검색 시 + /*if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchStartDt())){ + selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')"; + } + //3.5 요청일 종료일 검색 시 + if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchEndDt())){ + selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')"; + }*/ + + //정보변경 요청사항 있는 강사부터 조회 + vEInstrDetailVO.setOrderByQuery(" rqstCnt DESC "); + + vEInstrDetailVO.setInstrDiv("10"); + vEInstrDetailVO.setSelectPagingListQuery(selectCondition); + + List vEInstrDetailVOList = vEInstrMixService.selectPagingDetailList(vEInstrDetailVO); + + vEInstrDetailVOList = egovCryptoUtil.decryptVEInstrDetailVOList(vEInstrDetailVOList); + + //4.pageing step3 + paginationInfo = this.setPagingStep3(vEInstrDetailVOList, paginationInfo); + model.addAttribute("paginationInfo", paginationInfo); + + //대상 리스트, 페이징 정보 전달 + model.addAttribute("resultList", vEInstrDetailVOList); + + + + //배치 목록 + //1.pageing step1 + PaginationInfo paginationInfo1 = this.setPagingStep_1(vEEduAplctVO); + + //2. pageing step2 + vEEduAplctVO = this.setPagingStep_2(vEEduAplctVO, paginationInfo1); + vEEduAplctVO.setInstrDiv("10"); //청소년 + vEEduAplctVO.setLctrDivCd("10"); //청소년강의 + vEEduAplctVO.setAprvlCd("60"); //확정코드 + + if(!"".equals(vEEduAplctVO.getSearchInstrNm())) { + vEEduAplctVO.setSearchInstrNm(egovCryptoUtil.encrypt(vEEduAplctVO.getSearchInstrNm())); + } + + vEEduAplctVO.setAprvlCd("60"); //확정코드 + + List vEEduAplctVOList = vEEduMIXService.selectTngrRsltPagingList(vEEduAplctVO); + VEEduAplctVO vo = new VEEduAplctVO(); + for(int i=0; i < vEEduAplctVOList.size(); i++) { + vo = egovCryptoUtil.decryptVEEduAplctVOInfo(vEEduAplctVOList.get(i)); + vEEduAplctVOList.get(i).setUserId(vo.getUserId()); + vEEduAplctVOList.get(i).setChrgNm(vo.getChrgNm()); + } + + //3.pageing step3 + paginationInfo1 = this.setPagingStep_3(vEEduAplctVOList, paginationInfo1); + + model.addAttribute("paginationInfo1", paginationInfo1); + model.addAttribute("cryptoUtil", egovCryptoUtil); + + //대상 리스트, 페이징 정보 전달 + model.addAttribute("list", vEEduAplctVOList); + + + + return "oprtn/tngrVisitEdu/popup/instrMntTmMngPopup"; + } + + /** + * 강사 거주지별 배정 비율 관리 팝업 + * fncSpcfcInstrAsgnmInfo + */ + @RequestMapping("popup/instrRsdncMngPopup.do") + public String instrRsdncMngPopup( + @ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO + ,@ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO + ,@ModelAttribute("vEInstrAsgnmVO") VEInstrAsgnmVO vEInstrAsgnmVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + + //String s_userCheckNInfo = checkLoginUtil.userCheckNInfo(model, request); + //if (!"".equals(s_userCheckNInfo)) return s_userCheckNInfo; + + //로그인 처리==================================== + //0.pageing step0 + //온라인 오프라인 여부 확인 + //배치대상신청정보 + //vEEduAplctVO = vEEduAplctService.selectDetail(vEEduAplctVO); + //System.out.println(vEEduAplctVO.getEduSlctCd()); //10-온라인, 20-오프라인 + + //1.pageing step1 + PaginationInfo paginationInfo = this.setPagingStep1(vEInstrDetailVO); + + + //2. pageing step2 + vEInstrDetailVO = this.setPagingStep2(vEInstrDetailVO, paginationInfo); + + //3. SelectPagingListQuery set 할 조건 설정 + String selectCondition = new String(); + //3.1 제출 완료 후 사용중인 데이터 조회 + selectCondition += "AND a0.sbmt_yn='Y' AND a0.use_yn = 'Y'"; + //3.2 강사 테이블 성인강사여부 Y인것만 조회 + //selectCondition += "AND (b0.tngr_instr_yn ='Y' OR a0.qlfct_end_yn = 'Y') "; + //3.3 이름 검색 시 + if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchKeyword())){ + //이름 암호화 - comDefaultVO 검색단어 공통 암호화 + ComDefaultVO comDefaultVO = new ComDefaultVO(); + comDefaultVO.setSearchKeyword(vEInstrDetailVO.getSearchKeyword()); + comDefaultVO = egovCryptoUtil.encryptComDefaultVO(comDefaultVO); + vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); + //selectCondition += "AND a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.getSearchKeyword() + "', '%')"; + selectCondition += "AND a0.instr_nm LIKE '%'||'" +vEInstrDetailVO.getSearchKeyword() + "'||'%'"; + comDefaultVO = egovCryptoUtil.decryptComDefaultVO(comDefaultVO); + vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); + } + //3.4 요청일 시작일 검색 시 + /*if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchStartDt())){ + selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')"; + } + //3.5 요청일 종료일 검색 시 + if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchEndDt())){ + selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')"; + }*/ + + //정보변경 요청사항 있는 강사부터 조회 + vEInstrDetailVO.setOrderByQuery(" rqstCnt DESC "); + + vEInstrDetailVO.setInstrDiv("10"); + vEInstrDetailVO.setSelectPagingListQuery(selectCondition); + + List vEInstrDetailVOList = vEInstrMixService.selectPagingDetailList(vEInstrDetailVO); + + vEInstrDetailVOList = egovCryptoUtil.decryptVEInstrDetailVOList(vEInstrDetailVOList); + + //4.pageing step3 + paginationInfo = this.setPagingStep3(vEInstrDetailVOList, paginationInfo); + model.addAttribute("paginationInfo", paginationInfo); + + //대상 리스트, 페이징 정보 전달 + model.addAttribute("resultList", vEInstrDetailVOList); + + + + //배치 목록 + //1.pageing step1 + PaginationInfo paginationInfo1 = this.setPagingStep_1(vEEduAplctVO); + + //2. pageing step2 + vEEduAplctVO = this.setPagingStep_2(vEEduAplctVO, paginationInfo1); + vEEduAplctVO.setInstrDiv("10"); //청소년 + vEEduAplctVO.setLctrDivCd("10"); //청소년강의 + vEEduAplctVO.setAprvlCd("60"); //확정코드 + + if(!"".equals(vEEduAplctVO.getSearchInstrNm())) { + vEEduAplctVO.setSearchInstrNm(egovCryptoUtil.encrypt(vEEduAplctVO.getSearchInstrNm())); + } + + vEEduAplctVO.setAprvlCd("60"); //확정코드 + + List vEEduAplctVOList = vEEduMIXService.selectTngrRsltPagingList(vEEduAplctVO); + VEEduAplctVO vo = new VEEduAplctVO(); + for(int i=0; i < vEEduAplctVOList.size(); i++) { + vo = egovCryptoUtil.decryptVEEduAplctVOInfo(vEEduAplctVOList.get(i)); + vEEduAplctVOList.get(i).setUserId(vo.getUserId()); + vEEduAplctVOList.get(i).setChrgNm(vo.getChrgNm()); + } + + //3.pageing step3 + paginationInfo1 = this.setPagingStep_3(vEEduAplctVOList, paginationInfo1); + + model.addAttribute("paginationInfo1", paginationInfo1); + model.addAttribute("cryptoUtil", egovCryptoUtil); + + //대상 리스트, 페이징 정보 전달 + model.addAttribute("list", vEEduAplctVOList); + + + + return "oprtn/tngrVisitEdu/popup/instrRsdncMngPopup"; + //instrRsdncMng + } + + ////////////////////////////////////////////////////////////////////////////////////////////////////////////// + // + // + // private function + // + // + + + private PaginationInfo setPagingStep1( + VEInstrDetailVO p_vEInstrDetailVO + )throws Exception{ + // pageing step1 + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(p_vEInstrDetailVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(p_vEInstrDetailVO.getPageUnit()); + paginationInfo.setPageSize(p_vEInstrDetailVO.getPageSize()); + + return paginationInfo; + } + + //페이징을 위한 처리 step2 - 게시물 리스트 수량 설정 및 검색 조건 초기화 + private VEInstrDetailVO setPagingStep2( + VEInstrDetailVO p_vEInstrDetailVO + , PaginationInfo p_paginationInfo + )throws Exception{ + // pageing step2 + p_vEInstrDetailVO.setFirstIndex(p_paginationInfo.getFirstRecordIndex()); + p_vEInstrDetailVO.setLastIndex(p_paginationInfo.getLastRecordIndex()); + p_vEInstrDetailVO.setRecordCountPerPage(p_paginationInfo.getRecordCountPerPage()); + + if("".equals(p_vEInstrDetailVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + p_vEInstrDetailVO.setSearchSortCnd("sbmt_pnttm"); + p_vEInstrDetailVO.setSearchSortOrd("desc"); + } + + return p_vEInstrDetailVO; + } + + + //페이징을 위한 처리 step3 - 전체 게시물 수량 설정하기 + private PaginationInfo setPagingStep3( + List p_vEInstrDetailVOList + , PaginationInfo p_paginationInfo + )throws Exception{ + // pageing step3 + int totCnt = 0; + if(p_vEInstrDetailVOList.size() > 0) totCnt = p_vEInstrDetailVOList.get(0).getTotCnt(); + p_paginationInfo.setTotalRecordCount(totCnt); + + return p_paginationInfo; + } + + + //페이징을 위한 처리 step1 - 페이징 기본 정보 설정 + private PaginationInfo setPagingStep_1( + VEEduAplctVO p_vEEduAplctVO + )throws Exception{ + // pageing step1 + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(p_vEEduAplctVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(p_vEEduAplctVO.getPageUnit()); + paginationInfo.setPageSize(p_vEEduAplctVO.getPageSize()); + + return paginationInfo; + } + + //페이징을 위한 처리 step2 - 게시물 리스트 수량 설정 및 검색 조건 초기화 + private VEEduAplctVO setPagingStep_2( + VEEduAplctVO p_vEEduAplctVO + , PaginationInfo p_paginationInfo + )throws Exception{ + // pageing step2 + p_vEEduAplctVO.setFirstIndex(p_paginationInfo.getFirstRecordIndex()); + p_vEEduAplctVO.setLastIndex(p_paginationInfo.getLastRecordIndex()); + p_vEEduAplctVO.setRecordCountPerPage(p_paginationInfo.getRecordCountPerPage()); + + if("".equals(p_vEEduAplctVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + p_vEEduAplctVO.setSearchSortCnd("prcs_ord"); + p_vEEduAplctVO.setSearchSortOrd("desc"); + } + + return p_vEEduAplctVO; + } + + //페이징을 위한 처리 step3 - 전체 게시물 수량 설정하기 + private PaginationInfo setPagingStep_3( + List p_vEEduAplctVOList + + , PaginationInfo p_paginationInfo + )throws Exception{ + // pageing step3 + int totCnt = 0; + if(p_vEEduAplctVOList.size() > 0) totCnt = p_vEEduAplctVOList.get(0).getTotCnt(); + p_paginationInfo.setTotalRecordCount(totCnt); + + return p_paginationInfo; + } +} diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEEduPnlty_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEEduPnlty_SQL_Tibero.xml index 784e3b94..bc2d88e5 100644 --- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEEduPnlty_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEEduPnlty_SQL_Tibero.xml @@ -19,7 +19,8 @@ pnlty_cd, frst_regist_pnttm, frst_register_id, - user_id + user_id, + memo_cn @@ -30,7 +31,8 @@ a.pnlty_cd AS pnltyCd, TO_CHAR(a.frst_regist_pnttm,'YYYY-MM-DD') AS frstRegistPnttm, a.frst_register_id AS frstRegisterId, - a.user_id AS userId + a.user_id AS userId, + a.memo_cn AS memoCn @@ -44,7 +46,8 @@ pnlty_cd = #pnltyCd#, frst_regist_pnttm = SYSDATE, frst_register_id = #frstRegisterId#, - user_id = #userId# + user_id = #userId#, + memo_cn = #memoCn# WHEN NOT MATCHED THEN INSERT( @@ -55,7 +58,8 @@ #pnltyCd#, SYSDATE, #frstRegisterId#, - #userId# + #userId#, + #memoCn# ) 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 1392960b..57419b4b 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 @@ -85,6 +85,8 @@ IS_WAIT, CORPS_EDU, BROADROOM_EDU + + , RNDS_ORD @@ -151,6 +153,7 @@ A.IS_WAIT AS isWait, A.CORPS_EDU AS corpsEdu, A.BROADROOM_EDU AS broadroomEdu + , A.RNDS_ORD AS rndsOrd @@ -236,6 +239,7 @@ #isWait#, #corpsEdu#, #broadroomEdu# + , #rndsOrd# ) @@ -350,6 +354,7 @@ A.IS_WAIT , A.CORPS_EDU , A.BROADROOM_EDU + , A.RNDS_ORD @@ -636,6 +641,9 @@ , ADMIN_UPDT_YN = #adminUpdtYn# + + , RNDS_ORD = #rndsOrd# + WHERE EDU_APLCT_ORD = #eduAplctOrd# @@ -822,6 +830,9 @@ , ADMIN_UPDT_YN = #adminUpdtYn# + + , RNDS_ORD = #rndsOrd# + WHERE EDU_APLCT_ORD = #eduAplctOrd# diff --git a/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrYrStngMix_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrYrStngMix_SQL_Tibero.xml index bf972c54..18ad1795 100644 --- a/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrYrStngMix_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrYrStngMix_SQL_Tibero.xml @@ -430,6 +430,9 @@ FROM vea_lctr_rnds_stng WHERE TO_CHAR(SYSDATE, 'YYYY.MM.DDHH24MI') BETWEEN rgstr_strt_pnttm||'00' AND rgstr_ddln_pnttm||'00' AND nvl(rgstr_state,'00') ]]>'03' + + ORDER BY rnds_ord ASC + LIMIT 1 diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advAreaLctrMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advAreaLctrMngList.jsp index 46661505..14493f92 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advAreaLctrMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advAreaLctrMngList.jsp @@ -585,12 +585,15 @@ + + + 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 19e480e9..88eca96f 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp @@ -673,7 +673,61 @@ }); } } - + + // 특정 강사 배정 + function fncSpcfcInstrAsgnmInfo() { + var chkLen = $(listForm).find("input[name=chk]:checked").length; + + if(chkLen == 0){ + alert("선택된 항목이 없습니다."); + return; + } + + + var form = document.listForm; + + form.action = ""; + + window.open("#", "_spcfcPop", "scrollbars = no, top=100px, left=100px, height=750px, width=1200px"); + form.target = "_spcfcPop"; + form.submit(); + } + + // 강사배정조건관리 + function fncInstrAsgnmCndtnMng() { + + var form = document.listForm; + + form.action = ""; + + window.open("#", "_cndtnMngPop", "scrollbars = no, top=100px, left=100px, height=750px, width=1200px"); + form.target = "_cndtnMngPop"; + form.submit(); + } + + // 강사월별시수계산 + function fncInstrMntTmMng() { + + var form = document.listForm; + + form.action = ""; + + window.open("#", "_instrMntTmMngPop", "scrollbars = no, top=100px, left=100px, height=750px, width=1200px"); + form.target = "_instrMntTmMngPop"; + form.submit(); + } + + // 강사거주지별배정비율설정 + function fncInstrRsdncMng() { + + var form = document.listForm; + + form.action = ""; + + window.open("#", "_instrRsdncMngPop", "scrollbars = no, top=100px, left=100px, height=750px, width=1200px"); + form.target = "_instrRsdncMngPop"; + form.submit(); + } 신청관리 @@ -740,11 +794,12 @@
- - + + + - +
@@ -757,12 +812,15 @@ - -
+
+
+ + - - -
+ +
+
+
@@ -771,6 +829,12 @@
+
+
+ + +
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp index 0742f3f7..b996009e 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp @@ -264,7 +264,7 @@ } function updateHiddenMemo(){ - $("#memo").val($("#memoCn").val()); + $("#memo").val($("#detailForm #memoCn").val()); var data1 = new FormData(document.getElementById("hiddenMemoForm")); @@ -315,7 +315,64 @@ }); } + // 패널티 부여 + function fnPnltyInsert() { + $("#listForm #memoCn").val($("#pnltyCn").val()); + $("#listForm #pnltyCd").val($("#pnltyCd1").val()); + + var data1 = new FormData(document.getElementById("listForm")); + if(confirm("해당 강사에게 패널티를 부여하시겠습니까?")){ + $.ajax({ + type:"POST", + url: "${pageContext.request.contextPath}/kccadr/oprtn/tngrVisitEdu/popup/instrPnltyRegAjax.do", + data: data1, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success:function(returnData){ + if(returnData.result == 'success'){ + alert("저장 되었습니다."); + location.reload(); + } + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + } + } + + // 패널티 삭제 + function fnPnltyDelete(p_pnlty_ord) { + + $("#listForm #pnltyOrd").val(p_pnlty_ord); + + var data1 = new FormData(document.getElementById("listForm")); + if(confirm("해당 패널티를 삭제하시겠습니까?)")){ + $.ajax({ + type:"POST", + url: "${pageContext.request.contextPath}/kccadr/oprtn/tngrVisitEdu/popup/instrPnltyDelAjax.do", + data: data1, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success:function(returnData){ + if(returnData.result == 'success'){ + alert("삭제 되었습니다."); + location.reload(); + } + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + } + } @@ -710,33 +767,51 @@
- - - - - + + + + + + + + + - - + + - - - - + + + + + + + + + + + + + + + + @@ -748,9 +823,10 @@
-
-
-
+
+ + +
@@ -765,6 +841,13 @@
+ + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrAsgnmCndtnMngPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrAsgnmCndtnMngPopup.jsp new file mode 100644 index 00000000..bd070ef0 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrAsgnmCndtnMngPopup.jsp @@ -0,0 +1,263 @@ + +<%@ 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 : instrAsgnmCndtnMngPopup.jsp + * @Description : 강사배정조건관리 팝업 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 안주영 + * @since 2022.1.8 + * @version 1.0 + * @see + * + */ +%> + + + + +<%-- --%> + + + 강사배치 팝업 + + + + +
+
+ + + " /> + " /> + "> + + + + + + + " /> + " /> + " /> + " /> + " /> + + + +
+
+ +
+

강사 배정 조건 관리

+
+ +
+
패널티부여일패널티상세교육일자 학교명 교육차시패널티상세패널티부여일삭제
- - ~ - (분) - + + ~ + (분) + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
항목선택
+

거주지 우선

+
+ + + + + +
+

연강 기준

+
+ + + + + +
+

패널티 기준

+
+ + + + + +
+
+ + +
+
+
+
+ + +
+
+
+
+ +
+ + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrCostPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrCostPopup.jsp index 603addc2..0eea3e1d 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrCostPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrCostPopup.jsp @@ -266,7 +266,7 @@

강사료

- "/> + "/> 강의차시 * 43,000원 diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrMntTmMngPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrMntTmMngPopup.jsp new file mode 100644 index 00000000..d09c7139 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrMntTmMngPopup.jsp @@ -0,0 +1,412 @@ + +<%@ 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 : instrMntTmMngPopup.jsp + * @Description : 강사월별시수계산 팝업 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 안주영 + * @since 2022.1.8 + * @version 1.0 + * @see + * + */ +%> + + + + +<%-- --%> + + + 강사배치 팝업 + + + + +
+
+ + + " /> + " /> + "> + + + + + + + " /> + " /> + " /> + " /> + " /> + + + +
+
+ +
+

강사 월별 시수 계산

+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
교육일정(월)1월2월3월4월5월6월7월8월9월10월11월12월
교육접수차시100차시100차시100차시100차시100차시100차시100차시100차시100차시100차시100차시100차시1200차시
구분강사|차시|시간(인)강사|차시|시간(인)강사|차시|시간(인)강사|차시|시간(인)강사|차시|시간(인)강사|차시|시간(인)강사|차시|시간(인)강사|차시|시간(인)강사|차시|시간(인)강사|차시|시간(인)강사|차시|시간(인)강사|차시|시간(인)강사|차시|시간(인)
5일40|800|20||||||||||||||||||||||40|800|20
4일30|480|16||||||||||||||||||||||30|480|16
3일20|240|12||||||||||||||||||||||20|240|12
2일10|80|8||||||||||||||||||||||10|80|8
1일5|20|4||||||||||||||||||||||5|20|4
0일5|0|0||||||||||||||||||||||5|0|0
110|1620|||||||||||||||||||||||110|1620|
+
+ + +
+
+
+
+ + +
+
+
+
+ +
+
+ +
+ +
+
+ + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrRsdncMngPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrRsdncMngPopup.jsp new file mode 100644 index 00000000..50924218 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrRsdncMngPopup.jsp @@ -0,0 +1,584 @@ + +<%@ 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 : instrRsdncMngPopup.jsp + * @Description : 강사거주지별배정비율설정 팝업 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 안주영 + * @since 2022.1.8 + * @version 1.0 + * @see + * + */ +%> + + + + +<%-- --%> + + + 강사배치 팝업 + + + + +
+
+ + + " /> + " /> + "> + + + + + + + " /> + " /> + " /> + " /> + " /> + + + +
+
+ +
+

강사 배정 조건 관리

+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
거주지별비율강원도경기도경상남도경상북도광주광역시대구광역시대전광역시부산광역시서울특별시온라인울산광역시인천광역시제외한국학교교육청전라남도전라북도제주특별자치도충청남도충청북도
비율|차시비율|차시비율|차시비율|차시비율|차시비율|차시비율|차시비율|차시비율|차시비율|차시비율|차시비율|차시비율|차시비율|차시비율|차시비율|차시비율|차시비율|차시
5일 + 10
4일 + 8
3일 + 6
2일 + 4
1일 + 2
+
+ + +
+
+
+
+ + +
+
+
+
+ +
+
+ +
+ +
+
+ + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/spcfcInstrAsgnmPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/spcfcInstrAsgnmPopup.jsp new file mode 100644 index 00000000..948853d4 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/spcfcInstrAsgnmPopup.jsp @@ -0,0 +1,442 @@ + +<%@ 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 : spcfcInstrAsgnmPopup.jsp + * @Description : 특정강사배치 팝업 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 안주영 + * @since 2022.1.8 + * @version 1.0 + * @see + * + */ +%> + + + + +<%-- --%> + + + 강사배치 팝업 + + + + +
+
+ + + " /> + " /> + "> + + + + + + + " /> + " /> + " /> + " /> + " /> + + + +
+
+ +
+
+
+

강사검색

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

강사 목록

+
+ +
+ + + + + +<%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%-- --%> + +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> + + + + + + + + + +
이름거주
지역
강의희망지역온라인강의일수누적차시(월)Penalty 횟수선택
+
(${fn:split(list.userId,'_')[1]*1}) +
/%Km + + + + + + + + + + + + + +
+
+ + + + + + + + +
+
+
+
+ +
+
+
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- --%> + + + + + + + + + + + + + + + + + + +
교육희망일자요일차시지역기관(학교)명교육대상강사명선택근거확정여부추가강사인원
+ <%-- + + --%> + ${list.asgnmAprvlCd} + + + + + + + + ~ + (분) + + + (온) + + + + + + + + + +
(${fn:split(list.userId,'_')[1]*1}) +
+
+ + + + + + + + + + - + + +
+
+ + +
+
+
+
+ +
+
+
+
+ +
+
+ +
+ +
+
+ + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp index ad09e071..bf9b3522 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp @@ -100,9 +100,228 @@ , "chrgInfoUpdatePop" ); } + + function selectInstrInfo(instrId){ + $.ajax({ + type:"POST" + ,url:"${pageContext.request.contextPath}/web/ve/aplct/adultVisitEdu/eduEnd/selectInstrInfo.do" + ,data: { + "userId" : instrId + } + ,dataType:'json' + ,success:function(returnData){ + console.log(returnData); + var info = returnData.info; + + $('#info_instrNm').text(info.instrNm); + + var appendHtml = ""; + if(info.phtAtchFileId == null) + appendHtml = '이미지를 넣어주세요' + else + appendHtml = ''+info.instrNm+' 사진?atchFileId='+info.phtAtchFileId+'" />' + + $('#info_instrPhoto').append(appendHtml); + + $('#info_phone').text(info.phone); + $('#info_email').text(info.email); + $('#info_post').text(info.post); + $('#info_addr').text(info.addr); + $('#info_rsdne').text(info.rsdne); + $('#info_dBirth').text(info.dBirth); + $('#info_finalSchol').text(info.finalSchol); + $('#info_mjr').text(info.mjr); + $('#info_apptYr').text(info.apptYr); + $('#info_actvtCarer').text(info.actvtCarer); + $('#info_mnLctrCn').text(info.mnLctrCn); + } + ,error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + } +
+ +
+ + + " /> @@ -356,7 +575,18 @@ (${list.lrnTm}분) ${list.trgt} - ${empty list.instrNm ? '-' : list.instrNm} + +<%-- ${empty list.instrNm ? '-' : list.instrNm} --%> + + + - + + + + + + ${list.prsnl} diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp index a6b8b18d..c94a08f8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp @@ -332,8 +332,227 @@ , "fileUploadPop" ); } + + function selectInstrInfo(instrId){ + $.ajax({ + type:"POST" + ,url:"${pageContext.request.contextPath}/web/ve/aplct/adultVisitEdu/eduEnd/selectInstrInfo.do" + ,data: { + "userId" : instrId + } + ,dataType:'json' + ,success:function(returnData){ + console.log(returnData); + var info = returnData.info; + + $('#info_instrNm').text(info.instrNm); + + var appendHtml = ""; + if(info.phtAtchFileId == null) + appendHtml = '이미지를 넣어주세요' + else + appendHtml = ''+info.instrNm+' 사진?atchFileId='+info.phtAtchFileId+'" />' + + $('#info_instrPhoto').append(appendHtml); + + $('#info_phone').text(info.phone); + $('#info_email').text(info.email); + $('#info_post').text(info.post); + $('#info_addr').text(info.addr); + $('#info_rsdne').text(info.rsdne); + $('#info_dBirth').text(info.dBirth); + $('#info_finalSchol').text(info.finalSchol); + $('#info_mjr').text(info.mjr); + $('#info_apptYr').text(info.apptYr); + $('#info_actvtCarer').text(info.actvtCarer); + $('#info_mnLctrCn').text(info.mnLctrCn); + } + ,error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + } + +
+ +
+ +
@@ -843,7 +1062,18 @@ (${list.lrnTm}분) ${list.trgt} - ${empty list.instrNm ? '-' : list.instrNm} + +<%-- ${empty list.instrNm ? '-' : list.instrNm} --%> + + + - + + + + + + ${list.prsnl} diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp index bde395b2..7caa8ad7 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp @@ -3,6 +3,23 @@ Class Name : eduAplctReg.jsp Description : 교육신청 Modification Information + + 1.해당일에 접수가 가능한 강의 회차를 가져온다.(먼저 가능한 강의 회차) + ==>vea_lctr_rnds_stng + + rndsOrd + ==>없으면 오류 발생 + + 2.교육신청시 교육희망일 비교하여 가능한 정보를 가져온다. + 2-1.신청 가능한 일자인지(구현) + (해당 강의 회차의 교육 가능일자만 신청 가능하도록) + ==>vea_lctr_rnds_stng + 2-2.신청 가능한 시간인지(미구현) + 2-3.해당일 신청가능한 차시가 남았는지(미구현) + 2-4.해당 지역에 신청 가능한 차시가 남았는지(미구현) + + 2-5.동일한 날짜에 기 신청된 건이 있는지(구현) + 수정일 수정자 수정내용 ------- -------- --------------------------- diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp index 73e2d6fd..ebac84ff 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp @@ -1013,7 +1013,8 @@ - - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/comm/searchBeforeContentPopup.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/comm/searchBeforeContentPopup.jsp index 3b3739a8..e8f1cfe5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/comm/searchBeforeContentPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/comm/searchBeforeContentPopup.jsp @@ -42,8 +42,8 @@ url:"", data: {"eduAplctOrd" : eduAplctOrd, 'lctrDivCd' :'${vEEduAplctVO.lctrDivCd}' }, dataType:'json', - success:function(returnData){ - if(returnData.result == 'success'){ + success:function(returnData){ + if(returnData.result == 'success'){ var rsData = new Object(); rsData.info = returnData.info; rsData.list = returnData.list; @@ -51,7 +51,7 @@ rsData.fileList = returnData.fileList; rsData.fileListCnt = returnData.fileListCnt; callDataSetting(rsData); - $('button[data-focus=list_popup_close]').trigger('click'); + $('button[data-focus=list_popup_close]').trigger('click'); } }, error:function(request , status, error){