diff --git a/src/main/java/kcc/com/utl/fcc/service/EgovStringUtil.java b/src/main/java/kcc/com/utl/fcc/service/EgovStringUtil.java index 9d674b2a..feb3b4b3 100644 --- a/src/main/java/kcc/com/utl/fcc/service/EgovStringUtil.java +++ b/src/main/java/kcc/com/utl/fcc/service/EgovStringUtil.java @@ -901,4 +901,22 @@ public class EgovStringUtil { return ""; } } + + /** + *

날짜 형식의 문자열 내부에 마이너스 character(-)를 추가한다.

+ * + * 
+	 *   StringUtil.addDotChar("20100901") = "2010.09.01"
+	 *
+ * + * @param date 입력받는 문자열 + * @return " - "가 추가된 입력문자열 + */ + public static String addDotChar(String date) { + if (date.length() == 8) { + return date.substring(0, 4).concat(".").concat(date.substring(4, 6)).concat(".").concat(date.substring(6, 8)); + } else { + return ""; + } + } } diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngMixService.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngMixService.java index 91f5d016..86cb027f 100644 --- a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngMixService.java +++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngMixService.java @@ -2,6 +2,10 @@ package kcc.ve.adv.tngr.stngInfo.service; import java.util.List; +import javax.servlet.http.HttpServletRequest; + +import org.springframework.web.servlet.ModelAndView; + public interface VEAStngMixService { //VEA_LCTR_YR_STNG - 강의년도설정 @@ -24,5 +28,15 @@ public interface VEAStngMixService { //VEA_AREA_LCTR_STNG - 지역별 강의 가능 시간 정보 //강의가능기간 일정 데이터 - 강의가능기간 세부 선택 데이터 - List selectList_VEAALS_1(VEAStngVO paramVO) throws Exception; // LIST + List selectList_VEAALS_1(VEAStngVO paramVO) throws Exception; // LIST + + //vea_lctr_rnds_stng - 강의회차설정 + String eduAplctDateChkProcess(VEAStngVO paramVO , HttpServletRequest request, ModelAndView modelAndView) throws Exception; + + //vea_lctr_psbl_prd_stng - 해당 회차의 신청 가능한 기간일지 체크 + boolean eduAplctChkDate(VEAStngVO vEAStngVO , HttpServletRequest request) throws Exception; + + //vea_lctr_rnds_stng - 해당 회차의 신청 가능한 시간인지 체크 + //vea_area_lctr_stng + boolean eduAplctChkTime(VEAStngVO vEAStngVO , HttpServletRequest request) throws Exception; } 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 1649bf52..f4ac6265 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 @@ -44,4 +44,25 @@ public class VEAStngMixDAO extends EgovAbstractDAO { return tlist; } + //L + public List selectDateChkList(VEAStngVO paramVO) throws Exception { + List tlist = (List) list("VEALctrYrStngMixDAO.selectDateChkList", paramVO); + return tlist; + } + + public List selectNextDateList(VEAStngVO paramVO) throws Exception { + List tlist = (List) list("VEALctrYrStngMixDAO.selectNextDateList", paramVO); + return tlist; + } + + //L + public VEAStngVO selectEduAplctDateChkList(VEAStngVO paramVO) throws Exception { + VEAStngVO tlist = (VEAStngVO) list("VEALctrYrStngMixDAO.selectEduAplctDateChkList", paramVO); + return tlist; + } + + public VEAStngVO selectEduAplctTimeChkList(VEAStngVO paramVO) throws Exception { + 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 5eae8346..cef1d389 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 @@ -4,8 +4,10 @@ package kcc.ve.adv.tngr.stngInfo.service.impl; import java.util.List; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import org.springframework.stereotype.Service; +import org.springframework.web.servlet.ModelAndView; import kcc.ve.adv.tngr.stngInfo.service.VEAStngMixService; import kcc.ve.adv.tngr.stngInfo.service.VEAStngVO; @@ -56,5 +58,167 @@ public class VEAStngMixServiceImpl implements VEAStngMixService { public List selectList_VEAALS_1(VEAStngVO paramVO) throws Exception{ return vEAStngMixDAO.selectList_VEAALS_1(paramVO); - } + } + + @Override + public String eduAplctDateChkProcess(VEAStngVO vEAStngVO, HttpServletRequest request, ModelAndView modelAndView) throws Exception { + + //VELctrDetailVO vELctrDetailVO = new VELctrDetailVO(); + //boolean flag = true; + String s_ret = ""; + + //현재 일시로 등록 가능한 강의 지역이 있는지 확인 + //List list = vELctrAreaMngDAO.selectDateChkList(vELctrDetailVO); + List list = vEAStngMixDAO.selectDateChkList(vEAStngVO); + + + + //위 날짜와 시간에 부합하는 데이터가 없는 경우 flag 변경 처리 + if(list.size() <= 0) { + + list = vEAStngMixDAO.selectNextDateList(vEAStngVO); + + if (list.size() != 0) { + try { + String s_start = list.get(0).getRgstrStrtPnttm().substring(0, 10) + " " + list.get(0).getRgstrStrtPnttm().substring(10, 12); + String s_ddln = list.get(0).getRgstrDdlnPnttm().substring(0, 10) + " " + list.get(0).getRgstrDdlnPnttm().substring(10, 12); + + s_ret = "다음 등록기간은 아래와 같습니다.\n"+s_start+"시 ~ "+s_ddln+"시 "; + }catch(Exception ex) { + ex.printStackTrace(); + s_ret = "현재 다음 등록기간 정보가 없습니다."; + } + + }else { + s_ret = "현재 다음 등록기간 정보가 없습니다."; + } + + //s_ret = "다음 등록기간은 아래와 같습니다.\n2022.03.02 9시 ~ 2022.03.11 24시 "; + //flag = false; + }else { + s_ret = list.get(0).getRndsOrd(); + } + + return s_ret; + } + + @Override + public boolean eduAplctChkDate(VEAStngVO vEAStngVO, HttpServletRequest request) throws Exception { + boolean flag = true; + + + //교육 희망일자별로 가능한 일자인지 확인 한다. + System.out.println("vEAStngVO.toString()1"); + String[] s_eduHopeDt = request.getParameterValues("eduHopeDt"); + System.out.println("vEAStngVO.toString()2"); + + + for (int i=0; i0 && Integer.parseInt(dateVO.getDpDdlnDt())<=0){ + ; + }else { + flag = false; + } + } + + return flag; + } + + @Override + public boolean eduAplctChkTime(VEAStngVO vEAStngVO, HttpServletRequest request) throws Exception { + + //로그인 처리==================================== + + boolean flag = true; + + /* + + String eduSlctCd = request.getParameter("eduSlctCd"); + + //차시 저장 + String[] s_strtTm = request.getParameterValues("strtTm"); + String[] s_endTm = request.getParameterValues("endTm"); + String[] eduSlctAreaCd = request.getParameterValues("eduSlctAreaCd"); + + VELctrDetailVO vELctrDetailVO = new VELctrDetailVO(); + + + for (int i=0; i list = vELctrAreaMngDAO.selectList(vELctrDetailVO); + + //위 날짜와 시간에 부합하는 데이터가 없는 경우 flag 변경 처리 + if(list.size() == 0) { + flag = false; + } + + } + + + + //차시 저장 + String[] s_eduHopeDt = request.getParameterValues("eduHopeDt"); + + VELctrDetailVO vELctrDetailVO = new VELctrDetailVO(); + + + for (int i=0; i list = vEAStngMixDAO.selectEduAplctDateChkList(vELctrDetailVO); + + //위 날짜와 시간에 부합하는 데이터가 없는 경우 flag 변경 처리 + if(list.size() == 0) { + flag = false; + } + + } + */ + + return flag; + } } diff --git a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduAplct/service/impl/EduAplctAdultServiceImpl.java b/src/main/java/kcc/ve/aplct/adultVisitEdu/eduAplct/service/impl/EduAplctAdultServiceImpl.java index 1f063743..a14ab456 100644 --- a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduAplct/service/impl/EduAplctAdultServiceImpl.java +++ b/src/main/java/kcc/ve/aplct/adultVisitEdu/eduAplct/service/impl/EduAplctAdultServiceImpl.java @@ -1,5 +1,14 @@ package kcc.ve.aplct.adultVisitEdu.eduAplct.service.impl; +import java.util.List; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; + import egovframework.rte.fdl.idgnr.EgovIdGnrService; import kcc.com.cmm.LoginVO; import kcc.com.cmm.service.EgovFileMngService; @@ -8,20 +17,16 @@ import kcc.com.utl.user.service.CheckFileUtil; import kcc.com.utl.user.service.CheckLoginUtil; import kcc.let.utl.fcc.service.EgovCryptoUtil; import kcc.ve.aplct.adultVisitEdu.eduAplct.service.EduAplctAdultService; -import kcc.ve.aplct.tngrVisitEdu.eduAplct.service.EduAplctTngrService; import kcc.ve.cmm.VeConstants; -import kcc.ve.instr.tngrVisitEdu.eduInfo.service.*; -import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsCntntVO; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctOnlnService; +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.VEEduChasiVO; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsMIXService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsOnlnCntntService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsService; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import org.springframework.web.servlet.ModelAndView; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.List; @Service("eduAplctAdultService") public class EduAplctAdultServiceImpl implements EduAplctAdultService { @@ -137,7 +142,8 @@ public class EduAplctAdultServiceImpl implements EduAplctAdultService { for (int i=0;i vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO); + List vEEduAplctVOList = vEEduMIXService.selectPagingList4Temp(vEEduAplctVO); vEEduAplctVOList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduAplctVOList); paginationInfo = this.setPagingStep3(vEEduAplctVOList, paginationInfo); @@ -248,6 +249,14 @@ public class CommonWebController { vEEduChasiVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); List vEEduChasiVOList = vVEEduChasiService.selectList(vEEduChasiVO); + for(int i=0;i vEPrcsDetailVOList = vEPrcsMIXService.selectMberEduAplctPrcsList(vEPrcsDetailVO); + System.out.println("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++3"); List vEPrcsDetailVOList = vEPrcsService.selectTngrPrcsList(vEPrcsDetailVO); model.addAttribute("list", vEPrcsDetailVOList); @@ -388,12 +435,12 @@ public class EduAplctTngrController { //사용자 교육신청 차시 리스트 VEEduChasiVO vEEduChasiVO = new VEEduChasiVO(); vEEduChasiVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); - + System.out.println("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++2"); List vEEduChasiVOList = vVEEduChasiService.selectList(vEEduChasiVO); model.addAttribute("chasiList", vEEduChasiVOList); - + System.out.println("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++1"); //파일 정보 가져오기 FileVO fileVO = new FileVO(); fileVO.setAtchFileId(vEEduAplctVO.getScholSealAtchFileId()); @@ -401,6 +448,8 @@ public class EduAplctTngrController { model.addAttribute("fileList", result); model.addAttribute("fileListCnt", result.size()); + System.out.println("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"); + return "/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfy"; } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java index e7723144..fed8d0e3 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java @@ -52,4 +52,7 @@ public interface VEEduMIXService { void updateRsltRprtFileId(VEEduAplctVO vEEduAplctVO) throws Exception; //저작권 체험교실 목록 List selectExprnPagingList(VEEduAplctVO paramVO) throws Exception; + + //신청서 임시 저장 리스트 불러오기 + List selectPagingList4Temp(VEEduAplctVO paramVO) throws Exception; } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java index 29e64cd1..dc2f5399 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java @@ -143,4 +143,11 @@ public class VEEduMIXDAO extends EgovAbstractDAO { List tlist = (List) list("VEEduMIXDAO.selectExprnPagingList", paramVO); return tlist; } + + public List selectPagingList4Temp(VEEduAplctVO paramVO) throws Exception { + @SuppressWarnings("unchecked") + List tlist = (List) list("VEEduMIXDAO.selectPagingList4Temp", paramVO); + return tlist; + } + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java index add8b050..d54fa866 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java @@ -129,4 +129,9 @@ public class VEEduMIXServiceImpl implements VEEduMIXService { public List selectExprnPagingList(VEEduAplctVO paramVO) throws Exception{ return vEEduMIXDAO.selectExprnPagingList(paramVO); } + + //paging List + public List selectPagingList4Temp(VEEduAplctVO paramVO) throws Exception{ + return vEEduMIXDAO.selectPagingList4Temp(paramVO); + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/web/InstrPrflController.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/web/InstrPrflController.java index fee9bb03..53856799 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/web/InstrPrflController.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/web/InstrPrflController.java @@ -279,7 +279,7 @@ public class InstrPrflController { //강의조사 기간 여부 VELctrDetailVO vELctrDetailVO = new VELctrDetailVO(); //vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATETIME,'yyyymmdd') BETWEEN rsrch_strt_dt and rsrch_end_dt"); - vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATE,'YYYYMMDD') BETWEEN rsrch_strt_dt and rsrch_end_dt"); + vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATE,'YYYY.MM.DD') BETWEEN rsrch_strt_dt and rsrch_end_dt"); vELctrDetailVO = vELctrRsrchMngService.selectDetailWithQuery(vELctrDetailVO); model.addAttribute("vELctrDetailVO", vELctrDetailVO); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/web/lctrTngrInfoStngController.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/web/lctrTngrInfoStngController.java index 5b137590..a7dbbd1b 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/web/lctrTngrInfoStngController.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/web/lctrTngrInfoStngController.java @@ -155,7 +155,7 @@ public class lctrTngrInfoStngController { //날짜 표시 및 제출 버튼 노출 에 사용 VELctrDetailVO vELctrRsrchDetailVO = new VELctrDetailVO(); //vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATETIME,'yyyymmdd') BETWEEN rsrch_strt_dt and rsrch_end_dt " - vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATE,'YYYYMMDD') BETWEEN rsrch_strt_dt and rsrch_end_dt " + vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATE,'YYYY.MM.DD') BETWEEN rsrch_strt_dt and rsrch_end_dt " + " AND rsrch_instr_div='"+vELctrDetailVO.getRsrchInstrDiv()+"' " + " AND stng_yr_mnt='"+vELctrDetailVO.getStngYrMnt()+"' "); //vELctrRsrchDetailVO = vELctrRsrchMngService.selectDetail(vELctrDetailVO); @@ -335,7 +335,7 @@ public class lctrTngrInfoStngController { //2.오늘이 선택해서 들어온 강의조사의 기간 여부 체크 VELctrDetailVO vELctrRsrchDetailVO = new VELctrDetailVO(); //vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATETIME,'yyyymmdd') BETWEEN rsrch_strt_dt and rsrch_end_dt " - vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATE,'YYYYMMDD') BETWEEN rsrch_strt_dt and rsrch_end_dt " + vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATE,'YYYY.MM.DD') BETWEEN rsrch_strt_dt and rsrch_end_dt " + " AND rsrch_instr_div='"+vELctrDetailVO.getRsrchInstrDiv()+"' " + " AND stng_yr_mnt='"+vELctrDetailVO.getStngYrMnt()+"' "); //vELctrRsrchDetailVO = vELctrRsrchMngService.selectDetail(vELctrDetailVO); diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/service/impl/EduAplctMngAdultServiceImpl.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/service/impl/EduAplctMngAdultServiceImpl.java index 9e00364d..654b2f75 100644 --- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/service/impl/EduAplctMngAdultServiceImpl.java +++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/service/impl/EduAplctMngAdultServiceImpl.java @@ -1,5 +1,14 @@ package kcc.ve.oprtn.adultVisitEdu.eduAplctMng.service.impl; +import java.util.List; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; + import egovframework.rte.fdl.idgnr.EgovIdGnrService; import kcc.com.cmm.LoginVO; import kcc.com.cmm.service.EgovFileMngService; @@ -8,18 +17,16 @@ import kcc.com.utl.user.service.CheckFileUtil; import kcc.com.utl.user.service.CheckLoginUtil; import kcc.let.utl.fcc.service.EgovCryptoUtil; import kcc.ve.cmm.VeConstants; -import kcc.ve.instr.tngrVisitEdu.eduInfo.service.*; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctOnlnService; +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.VEEduChasiVO; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsMIXService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsOnlnCntntService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsService; import kcc.ve.oprtn.adultVisitEdu.eduAplctMng.service.EduAplctMngAdultService; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import org.springframework.web.servlet.ModelAndView; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.List; @Service("eduAplctMngAdultService") public class EduAplctMngAdultServiceImpl implements EduAplctMngAdultService { @@ -135,7 +142,8 @@ public class EduAplctMngAdultServiceImpl implements EduAplctMngAdultService { for (int i=0;i0) modelAndView.addObject("result", "success"); + else modelAndView.addObject("result", "fail"); + + + + //return "redirect:/ve/oprtn/instr/adultVisitEdu/instrInfo/instrMngList.do"; + return modelAndView; + } + //페이징을 위한 처리 step1 - 페이징 기본 정보 설정 private PaginationInfo setPagingStep1( VEInstrDetailVO p_vEInstrDetailVO diff --git a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java index dbfe0ea4..a135050d 100644 --- a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java +++ b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java @@ -1630,7 +1630,7 @@ public class OprtnInstrTngrPrflContoller { //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') "; + //selectCondition += "AND (b0.tngr_instr_yn ='Y' OR a0.qlfct_end_yn = 'Y') "; //3.3 이름 검색 시 if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchKeyword())){ //이름 암호화 - comDefaultVO 검색단어 공통 암호화 @@ -1638,7 +1638,8 @@ public class OprtnInstrTngrPrflContoller { comDefaultVO.setSearchKeyword(vEInstrDetailVO.getSearchKeyword()); comDefaultVO = egovCryptoUtil.encryptComDefaultVO(comDefaultVO); vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); - selectCondition += "AND a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.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()); } @@ -1955,7 +1956,7 @@ public class OprtnInstrTngrPrflContoller { //강의조사 기간 여부 VELctrDetailVO vELctrRsrchDetailVO = new VELctrDetailVO(); //vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATETIME,'yyyymmdd') BETWEEN rsrch_strt_dt and rsrch_end_dt " - vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATE,'YYYYMMDD') BETWEEN rsrch_strt_dt and rsrch_end_dt " + vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATE,'YYYY.MM.DD') BETWEEN rsrch_strt_dt and rsrch_end_dt " + " AND rsrch_instr_div='"+vELctrDetailVO.getRsrchInstrDiv()+"' " + " AND stng_yr_mnt='"+vELctrDetailVO.getStngYrMnt()+"' "); //vELctrRsrchDetailVO = vELctrRsrchMngService.selectDetail(vELctrDetailVO); @@ -2308,6 +2309,10 @@ public class OprtnInstrTngrPrflContoller { vEInstrDetailVO.setTngrInstrYn("Y"); vEInstrDetailVO.setApptDt(now2);; } + + //암호화 + vEInstrDetailVO = egovCryptoUtil.encryptVEInstrDetailVO(vEInstrDetailVO); + vEInstrDetailService.update(vEInstrDetailVO); vEInstrService.update(vEInstrDetailVO); diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/service/impl/EduAplctMngTngrServiceImpl.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/service/impl/EduAplctMngTngrServiceImpl.java index be467497..2a268a65 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/service/impl/EduAplctMngTngrServiceImpl.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/service/impl/EduAplctMngTngrServiceImpl.java @@ -175,7 +175,8 @@ public class EduAplctMngTngrServiceImpl implements EduAplctMngTngrService { for (int i=0;i vEPrcsDetailVOList = vEPrcsService.selectTngrPrcsList(vEPrcsDetailVO); + System.out.println("=========================12"); model.addAttribute("list", vEPrcsDetailVOList); @@ -490,6 +493,7 @@ public class EduAplctMngTngrController { List vEEduChasiVOList = vVEEduChasiService.selectList(vEEduChasiVO); + System.out.println("=========================13"); model.addAttribute("chasiList", vEEduChasiVOList); @@ -500,6 +504,8 @@ public class EduAplctMngTngrController { model.addAttribute("fileList", result); model.addAttribute("fileListCnt", result.size()); + System.out.println("=========================14"); + return "oprtn/tngrVisitEdu/eduAplctMngReg"; } diff --git a/src/main/resources/egovframework/sqlmap/let/sym/ccm/ccc/EgovCmmnClCodeManage_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/sym/ccm/ccc/EgovCmmnClCodeManage_SQL_Tibero.xml index 37661a9c..be5794a0 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/ccm/ccc/EgovCmmnClCodeManage_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/ccm/ccc/EgovCmmnClCodeManage_SQL_Tibero.xml @@ -91,9 +91,9 @@ , #clCodeNm# , #clCodeDc# , #useAt# - , NOW() + , SYSDATE , #frstRegisterId# - , NOW() + , SYSDATE , #frstRegisterId# ) ]]> @@ -105,7 +105,7 @@ SET CL_CODE_NM = #clCodeNm# , CL_CODE_DC = #clCodeDc# , USE_AT = #useAt# - , LAST_UPDT_PNTTM = NOW() + , LAST_UPDT_PNTTM = SYSDATE , LAST_UPDUSR_ID = #lastUpdusrId# WHERE CL_CODE = #clCode# ]]> @@ -132,7 +132,7 @@ SET CL_CODE_NM = #clCodeNm# , CL_CODE_DC = #clCodeDc# , USE_AT = #useAt# - , LAST_UPDT_PNTTM = NOW() + , LAST_UPDT_PNTTM = SYSDATE , LAST_UPDUSR_ID = #lastUpdusrId# , CL_CODE = #clCode# WHERE CL_CODE = #tempClCode# @@ -143,7 +143,7 @@ diff --git a/src/main/resources/egovframework/sqlmap/let/sym/ccm/cde/EgovCmmnDetailCodeManage_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/sym/ccm/cde/EgovCmmnDetailCodeManage_SQL_Tibero.xml index 406d23f2..f020ddeb 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/ccm/cde/EgovCmmnDetailCodeManage_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/ccm/cde/EgovCmmnDetailCodeManage_SQL_Tibero.xml @@ -103,9 +103,9 @@ , #codeNm# , #codeDc# , #useAt# - , NOW() + , SYSDATE , #frstRegisterId# - , NOW() + , SYSDATE , #frstRegisterId# ) ]]> @@ -117,7 +117,7 @@ SET CODE_NM = #codeNm# , CODE_DC = #codeDc# , USE_AT = #useAt# - , LAST_UPDT_PNTTM = NOW() + , LAST_UPDT_PNTTM = SYSDATE , LAST_UPDUSR_ID = #lastUpdusrId# WHERE CODE_ID = #codeId# AND CODE = #code# @@ -185,7 +185,7 @@ , USE_AT = #useAt# - , LAST_UPDT_PNTTM = NOW() + , LAST_UPDT_PNTTM = SYSDATE , LAST_UPDUSR_ID = #lastUpdusrId# , CODE = #code# WHERE CODE_ID = #codeId# diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml index 2aec9581..ad8b4125 100644 --- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml @@ -1570,7 +1570,7 @@ AND c.use_yn ='Y' /* 사용중인강의설정 */ AND b.instr_div=c.instr_div AND b.user_id =c.user_id - AND IFNULL(b.qlfct_end_yn,'N')='N' + AND NVL(b.qlfct_end_yn,'N')='N' /* ( b.qlfct_end_yn='N' OR b.qlfct_end_yn IS NULL @@ -1611,7 +1611,7 @@ AND a.edu_aplct_ord=b.edu_aplct_ord AND a.edu_chasi_ord=b.edu_chasi_ord AND a.edu_aplct_ord=c.edu_aplct_ord - AND IFNULL(c.use_yn,'Y')='Y' + AND NVL(c.use_yn,'Y')='Y' /* 교육확정된 수업만 계산 */ /* @@ -3476,7 +3476,7 @@ , aaaaaa.edu_chasi_ord AS eduChasiOrd , aaaaaa.user_id AS userId - , IFNULL(aaaaaa.lrn_tm_sum,0) AS lrnTmSum + , NVL(aaaaaa.lrn_tm_sum,0) AS lrnTmSum , aaaaaa.instr_nm AS instrNm @@ -3498,11 +3498,26 @@ , aaaaaa.rsdne - , bbbbbb.user_id AS chrgNm + , bbbbbb.user_id AS chrgNm + /* , IF (dddddd.cntnsCnt>1 AND aaaaaa.user_id =cccccc.user_id,1 ,0 ) + IF (dddddd.cntnsCnt>1 ,IF(aaaaaa.cntns_lctr_psbl_yn='Y',1,0) ,0 ) + IFNULL(aaaaaa.pnlty_cnt,0)*-1 + IF((aaaaaa.area_cnt)>0,1,0) + IF((aaaaaa.checkTop)>0,1,0) + IFNULL(CAST(aaaaaa.lrn_tm_sum AS DOUBLE)/(aaaaaa.mnt_mnmm_tm+1),0)*-1 AS checkTopSum - + */ + , CASE WHEN dddddd.cntnsCnt>1 AND aaaaaa.user_id =cccccc.user_id THEN 1 ELSE 0 END + + CASE WHEN dddddd.cntnsCnt>1 THEN + DECODE(aaaaaa.cntns_lctr_psbl_yn,'Y',1,0) + ELSE 0 END + + + NVL(aaaaaa.pnlty_cnt,0)*-1 + + CASE WHEN aaaaaa.area_cnt>0 THEN 1 ELSE 0 END + + CASE WHEN aaaaaa.checkTop>0 THEN 1 ELSE 0 END + + NVL( + CAST(aaaaaa.lrn_tm_sum AS NUMBER)/(aaaaaa.mnt_mnmm_tm+1) + ,0 + ) + *-1 + AS checkTopSum , aaaaaa.onewayDstnc , aaaaaa.scholAddr @@ -4503,7 +4518,7 @@ /* VEAsgnmMIXDAO.selectInstrDstncStep1 */ SELECT b.new_addr AS sAddr , d.addr AS iAddr - , ifnull(e.oneway_dstnc,'') AS onewayDstnc + , NVL(e.oneway_dstnc,'') AS onewayDstnc , a.schol_instt_nm AS scholInsttNm , a.edu_aplct_ord AS eduAplctOrd , c.edu_chasi_ord AS eduChasiOrd @@ -4520,7 +4535,7 @@ WHERE 1 =1 AND a.stndrd_schol_cd=b.stndrd_schol_cd - AND IFNULL(A.USE_YN, 'Y') != 'N' + AND NVL(A.USE_YN, 'Y') != 'N' AND A.SBMT_YN = 'Y' AND A.LCTR_DIV_CD = '10' AND A.APRVL_CD IN ( '60') @@ -4565,8 +4580,8 @@ AND ( - A.SCHOL_INSTT_NM LIKE CONCAT('%' , #searchKeyword# , '%') OR - A.INSTT_NM LIKE CONCAT('%' , #searchKeyword# , '%') + A.SCHOL_INSTT_NM LIKE '%' || #searchKeyword# || '%' OR + A.INSTT_NM LIKE '%' || #searchKeyword# || '%' ) @@ -4588,7 +4603,7 @@ - ORDER BY 1=1 , + ORDER BY 1 , A.EDU_APLCT_ORD DESC @@ -4811,7 +4826,7 @@ /* VEAsgnmMIXDAO.selectTtlMntChasiSumDetail */ SELECT aa0.sumMntChasi , bb0.sumMntLctr , - CEIL(CAST(aa0.sumMntChasi AS DOUBLE)/bb0.sumMntLctr) AS mxmmChasi + CEIL(CAST(aa0.sumMntChasi AS NUMBER)/bb0.sumMntLctr) AS mxmmChasi FROM ( SELECT SUBSTRING(b.edu_hope_dt,1,6) AS eduHopeMnt , SUM(b.chasi) AS sumMntChasi FROM ve_edu_aplct a , @@ -4825,7 +4840,7 @@ c0 WHERE a.aprvl_cd ='60' AND a.lctr_div_cd ='10' - AND IFNULL(a.use_yn,'Y') ='Y' + AND NVL(a.use_yn,'Y') ='Y' AND a.edu_aplct_ord = b.edu_aplct_ord AND SUBSTRING(b.edu_hope_dt,1,6) =SUBSTRING(c0.edu_hope_dt,1,6) GROUP BY SUBSTRING(b.edu_hope_dt,1,6) @@ -4837,7 +4852,20 @@ aaa.sum_lctr_cnt , COUNT(*) cnt FROM ( SELECT aa.instr_div , - IF (mon_lctr_yn='Y',1,0) + IF (tue_lctr_yn='Y',1,0) + IF (wed_lctr_yn='Y',1,0) + IF (thu_lctr_yn='Y',1,0) + IF (fri_lctr_yn='Y',1,0) AS sum_lctr_cnt + /* + IF (mon_lctr_yn='Y',1,0) + + IF (tue_lctr_yn='Y',1,0) + + IF (wed_lctr_yn='Y',1,0) + + IF (thu_lctr_yn='Y',1,0) + + IF (fri_lctr_yn='Y',1,0) + AS sum_lctr_cnt + */ + DECODE(mon_lctr_yn,'Y',1,0) + + DECODE(tue_lctr_yn,'Y',1,0) + + DECODE(wed_lctr_yn,'Y',1,0) + + DECODE(thu_lctr_yn,'Y',1,0) + + DECODE(fri_lctr_yn,'Y',1,0) + AS sum_lctr_cnt FROM ( /* 신청 가능한 전체 강사 리스트 */ SELECT c.* , @@ -4856,7 +4884,7 @@ /* 사용중인강의설정 */ AND b.instr_div =c.instr_div AND b.user_id =c.user_id - AND IFNULL(b.qlfct_end_yn,'N')='N' + AND NVL(b.qlfct_end_yn,'N')='N' AND b.instr_div ='10' ) aa 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 31fed8f6..27df1027 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 @@ -508,7 +508,10 @@ , SBMT_YN = #sbmtYn# + /* , SBMT_PNTTM = IF(SBMT_PNTTM is null, SYSDATE, SBMT_PNTTM) + */ + , SBMT_PNTTM = CASE WHEN SBMT_PNTTM is null THEN SYSDATE ELSE SBMT_PNTTM END , APRVL_CD = #aprvlCd# @@ -1043,7 +1046,7 @@ diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml index 6b7d6e52..8f969b66 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml @@ -2145,7 +2145,10 @@ , A.INSTT_DIV_CD AS insttDivCd , A.EDU_SLCT_CD AS eduSlctCd , B.EDU_CHASI_ORD AS eduChasiOrd + /* , TO_CHAR(B.EDU_HOPE_DT,'YYYY.MM.DD') AS eduHopeDt + */ + , B.EDU_HOPE_DT AS eduHopeDt , B.STRT_TM AS strtTm , B.END_TM AS endTm , B.LRN_TM AS lrnTm @@ -3546,4 +3549,427 @@ VALUES OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; + + + diff --git a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrAreaMng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrAreaMng_SQL_Tibero.xml index 888f20fc..7492e585 100644 --- a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrAreaMng_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrAreaMng_SQL_Tibero.xml @@ -683,6 +683,7 @@ + /* VELctrAreaMngDAO.selectNextDateList */ SELECT rgstr_strt_dt AS rgstrStrtDt , rgstr_end_dt AS rgstrEndDt , TO_CHAR(SYSDATE, 'YYYY.MM.DDHH24') diff --git a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrArea_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrArea_SQL_Tibero.xml index 99829645..a1a68455 100644 --- a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrArea_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrArea_SQL_Tibero.xml @@ -195,7 +195,7 @@ - ORDER BY 1=1 + ORDER BY 1 , a.user_id desc @@ -204,8 +204,11 @@ , $orderByQuery$ - - LIMIT #recordCountPerPage# OFFSET #firstIndex# + + /* + LIMIT recordCountPerPage OFFSET firstIndex + */ + OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; 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 e0b0ca34..bf972c54 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 @@ -416,5 +416,49 @@ ORDER BY ccc.code_nm - + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp index 2fff5133..555a5299 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp @@ -25,9 +25,102 @@ <%--
@@ -137,6 +279,12 @@ $( document ).ready(function(){ " /> <%-- --%> + + + + + +
@@ -296,9 +444,235 @@ $( document ).ready(function(){
- <%--
- -
--%> + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

강사명

+ 		+ +
+
+
+
+
+ 이미지를 넣어주세요 +
+ +
+
+
+
+
+

연락처(핸드폰)

+ 		+ + + - + + - + +
+

e-mail

+ 		+ + + @ + + + +
+

주소

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

거주지

+ 		+ + + +
+

생년월일

+ 		+ + + + + +
+

소속

+ 		+ + + +

직위

+ 		+ + +
+

위촉년도

+ 		+ + + +

구분

+ 		+ + // + +
+

위촉구분${info.apptDiv}

+ 		+ + +
+

필수입력 항목*

+

전문분야

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

월별 교육시간 배정 정보

@@ -373,7 +747,9 @@ $( document ).ready(function(){ --%> + +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp index 0e2e77f9..59492335 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp @@ -419,6 +419,7 @@

+

기자재유무

@@ -481,11 +483,13 @@ +
- - " name="eduHopeDt" class="calendar" title="시작일 선택" size="8"> +<%-- --%> +<%-- " name="eduHopeDt" class="calendar" title="시작일 선택" size="8"> --%> +
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 bc2ecb5c..d4107a47 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp @@ -853,8 +853,8 @@ title="Check" type="checkbox"/> - - + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngList.jsp index 9ff2186f..624d8415 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngList.jsp @@ -200,10 +200,12 @@ - - + + - + + + @@ -216,6 +218,7 @@ + @@ -254,6 +257,9 @@ + @@ -276,7 +282,7 @@ - +
거주지 강의 가능지역 연락처이메일 주 5일여부 자격 종료 여부 정보변경 + + 주${list.monLctrYn + list.tueLctrYn + list.wedLctrYn + list.thuLctrYn + list.friLctrYn}일
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 f9f5093f..bde395b2 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 @@ -122,7 +122,9 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크 if(psblFlag == 'N') { //$("select[name=divCd] option[value='10']").remove(); } - + + //기존 구분값 선택 부분 제외(학생, 선생님, 학부모) + $("select[name=divCd] option[value='10']").remove(); $("select[name=divCd] option[value='20']").remove(); $("select[name=divCd] option[value='30']").remove(); }); @@ -476,6 +478,9 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크 // 신청하는 차시가 유효한 신청기간인지, 강의가능시간인지 체크하는 로직 // =>강의 가능 시간 여부만 체크로 변경 2022-02-28 // 추가로, 본인이 등록했던 신청건인지 체크(사용자아이디, 학교명, 교육희망일, 교육대상 비교) + //1.교육희망일이 신청 가능한 일자인지 + //2.신청 시간이 해당 지역의 가능한 시간인지 + //3.중복시간 체크 function checkAplctPsbl() { var trObj = $('.addClassRow').find('tbody > tr').not('.calendar_wrap tr'); @@ -494,6 +499,7 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크 var endTm = $(this).find('input[name=endTm]').val(); var eduSlctAreaCd = $("select[name=eduSlctAreaCd]").val(); var trgt = $(this).find('input[name=trgt]').val(); + var rndsOrd = $('input[name=rndsOrd]').val(); /* if (eduSlctCd=='10'){ @@ -530,15 +536,25 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크 // "prdDivCd" : prdDivCd, "eduSlctCd" : eduSlctCd, "trgt" : trgt, + "rndsOrd":rndsOrd, }, dataType:'json', async: false, success:function(returnData){ - if(returnData.result == "fail"){ + if(returnData.result == "fail4"){ + alert("로그인 후 다시 교육신청해 주세요."); + flag = false; + return; + }else if(returnData.result == "fail3"){ + alert("가능한 교육희망일자가 아닙니다."); + flag = false; + return; + }else if(returnData.result == "fail"){ alert("신청한 차시 중 신청기간, 강의가능시간이 아닌 교육이 있습니다."); flag = false; return; } + if(!duplChk) { if(returnData.result == "fail2"){ if(confirm("중복된 신청 건이 있습니다. 진행하시겠습니까?")){ @@ -585,6 +601,8 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크 //location.href="" psblFlag = 'N'; + }else{ + $("input[name=rndsOrd]").val(returnData.rndsOrd); } }, error:function(request , status, error){ @@ -719,16 +737,20 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크 function itemChg(item){ var eduSlctAreaCd = $("#eduSlctAreaCd"); var areaMent = $(".areaMent"); + var onlineMent = $(".onlineMent"); + //온라인 if(item == '10'){ eduSlctAreaCd.hide(); areaMent.hide(); + onlineMent.show(); } //오프라인 if(item == '20'){ eduSlctAreaCd.show(); areaMent.show(); + onlineMent.hide(); } } @@ -747,6 +769,8 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크 + +
@@ -798,6 +822,7 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크 학교를 선택하시면 지역은 자동으로 입력됩니다. + 강사님이 방문하지 않는 비대면 교육입니다. @@ -827,10 +852,10 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크

도서벽지학교여부

- + + + - - @@ -923,6 +948,7 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크 checked> +

기자재유무

@@ -950,7 +977,7 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크

교육차시 정보

- ※ 교육추가 버튼을누러 대상별 1줄씩 작성(1줄 = 강사 1인) 바랍니다. (예시 : 3개 학급 신청 시 대상별 3줄 작성) + ※ 교육추가 버튼을누러 대상별 1줄씩 작성(1줄 = 강사 1인) 바랍니다. (예시 : 3개 학급 신청 시 1학급 당 1줄씩 총 3줄을 작성)
@@ -970,7 +997,7 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크

필수입력 항목*

교육희망일

필수입력 항목*

시간 -

필수입력 항목*

구분 +

필수입력 항목*

점심시간 포함여부

필수입력 항목*

대상
ex) 1-5반 또는 전교생

필수입력 항목*

인원 삭제 @@ -1117,9 +1144,16 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
(분)
+ + +

명

@@ -1256,10 +1290,17 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
(분) + + + 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 ea33f51e..3b3739a8 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 @@ -135,9 +135,8 @@ - - - + + ${list.frstRegistPnttm} - diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrDashboard.jsp index 4c4b8c2a..29cfa823 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrDashboard.jsp @@ -69,8 +69,8 @@
- - 마감기간 : + + 마감기간 : ${vELctrDetailVO.rsrchEndDt}
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/lctrInfo/lctrStngReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/lctrInfo/lctrStngReg.jsp index fbf12361..2fea05d4 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/lctrInfo/lctrStngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/lctrInfo/lctrStngReg.jsp @@ -483,12 +483,14 @@
- + + + - - +<%-- --%> + - +<%-- --%>