From 3c6a8535a1e673e6197c507a2a575a80e5537a03 Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 16 Jan 2024 12:36:45 +0900 Subject: [PATCH 1/6] =?UTF-8?q?2024-01-16=2012:36=20=ED=98=84=EC=97=85=20?= =?UTF-8?q?=EC=9A=94=EC=B2=AD=EC=82=AC=ED=95=AD=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/ScholInfoController.java | 2 +- .../eduAplct/service/EduAplctTngrService.java | 4 +- .../service/impl/EduAplctTngrServiceImpl.java | 60 +++ .../eduAplct/web/EduAplctTngrController.java | 84 ++- .../service/impl/VELctrAreaMngDAO.java | 5 + .../trgtMng/web/CndtnTrgtMngController.java | 140 ++--- .../web/EduAplctMngTngrController.java | 96 ++++ .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 11 +- .../ve/lctr/VELctrAreaMng_SQL_Tibero.xml | 29 +- src/main/webapp/WEB-INF/decorators.xml | 4 +- .../jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp | 4 +- .../cpyrgExprnClsrm/newEduPrfrmMngList.jsp | 2 +- .../oprtn/tngrVisitEdu/eduAplctMngList.jsp | 4 +- .../popup/advRndsStngMngPopup.jsp | 4 +- .../adultVisitEdu/eduAplct/incPrivacy.jsp | 484 ------------------ .../exprnClsrmEnd/popup/scholPopList.jsp | 1 + .../exprnClsrmInfo/popup/scholPopList.jsp | 2 +- .../tngrVisitEdu/eduAplct/eduAplctReg.jsp | 106 +++- 18 files changed, 463 insertions(+), 579 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java index 5c7c8552..363349b2 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java @@ -268,7 +268,7 @@ public class ScholInfoController { vList.get(i).setColor("#FF0000"); }else if (Integer.parseInt(vList.get(i).getTitleF())>=Integer.parseInt(vList.get(i).getTitleB())) - { + { //신청 시간이 넘어간 경우로 불가능 처리함 vList.get(i).setColor("#FF0000"); //vList.get(i).setTitle("가능"); vList.get(i).setTitle("불가능"); diff --git a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/service/EduAplctTngrService.java b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/service/EduAplctTngrService.java index 578b30c1..679352c8 100644 --- a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/service/EduAplctTngrService.java +++ b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/service/EduAplctTngrService.java @@ -41,7 +41,9 @@ public interface EduAplctTngrService { //boolean eduAplctDateChkProcess(VEEduAplctVO vEEduAplctVO , HttpServletRequest request, ModelAndView modelAndView) throws Exception; String eduAplctDateChkProcess(VEEduAplctVO vEEduAplctVO , HttpServletRequest request, ModelAndView modelAndView) throws Exception; - + + //해당일에 신청가능한 차시가 남아 있는지 - 신청지역 + String eduAplctChkZoneChasiProcessToStr(HttpServletRequest request, ModelAndView modelAndView) throws Exception; //해당일에 신청가능한 차시가 남아 있는지 - 전체 String eduAplctChkDayChasiProcessToStr(HttpServletRequest request, ModelAndView modelAndView) throws Exception; //해당일에 신청가능한 차시가 남아 있는지 - 개별 diff --git a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/service/impl/EduAplctTngrServiceImpl.java b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/service/impl/EduAplctTngrServiceImpl.java index 535513f8..40094ff9 100644 --- a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/service/impl/EduAplctTngrServiceImpl.java +++ b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/service/impl/EduAplctTngrServiceImpl.java @@ -670,6 +670,66 @@ public class EduAplctTngrServiceImpl implements EduAplctTngrService { return v_ret; } + @Override + public String eduAplctChkZoneChasiProcessToStr(HttpServletRequest request, ModelAndView modelAndView) throws Exception { + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + //SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + //로그인 처리==================================== + + boolean flag = true; + String v_ret = ""; + + String eduSlctCd = request.getParameter("eduSlctCd"); + + //차시 저장 + String[] s_eduHopeDt = request.getParameterValues("eduHopeDt"); + String[] s_strtTm = request.getParameterValues("strtTm"); + String[] s_endTm = request.getParameterValues("endTm"); + String[] eduSlctAreaCd = request.getParameterValues("eduSlctAreaCd"); + String[] prdDivCd = request.getParameterValues("prdDivCd"); + String rndsOrd = request.getParameter("rndsOrd"); + + VEAStngVO vEAStngVO = new VEAStngVO(); + vEAStngVO.setRndsOrd(rndsOrd); + + //VELctrDetailVO vELctrDetailVO = new VELctrDetailVO(); + + if ("10".equals(eduSlctCd)) { //온라인인 경우 + vEAStngVO.setAreaCd("400"); + }else { //오프라인인 경우 + vEAStngVO.setAreaCd(eduSlctAreaCd[0]); + } + + //vELctrDetailVO.setPrdDivCd(prdDivCd[i]); + + //청소년 요청이 신청한 지역의 신청 제한에 맞게 재대로 신청한 것인지 확인 한다. + List list = vELctrAreaMngDAO.selectList20231024(vEAStngVO); + + + //해당지역의 신청한 차시 + int i_aplctChasi = 0; //신청된 차시 + int i_psblChasi = 0; //신청가능한 차시 + + try { + i_aplctChasi = vELctrAreaMngDAO.selectList20231027(vEAStngVO); + }catch(Exception ex) { + ex.printStackTrace(); + } + + if (list.size()>0) { + i_aplctChasi = Integer.parseInt(list.get(0).getPsblTmQntty()); + } + + if (i_aplctChasi>=i_psblChasi) { + flag = false; + v_ret = "해당 지역의 차시 제한 초과"; + } + + return v_ret; + } + + //개별 시간 체크 @Override public String eduAplctEAChkProcessToStr( 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 8575a316..75d4464f 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 @@ -360,7 +360,11 @@ public class EduAplctTngrController { (해당 강의 회차의 교육 가능일자만 신청 가능하도록) ==>vea_lctr_rnds_stng 2-2.신청 가능한 시간인지(구현) - 2-3.해당일 신청가능한 차시가 남았는지(미구현) + + 2-3-1.해당지역에 신청가능한 차시가 남았는지(미구현) + + 2-3.해당일 신청가능한 차시가 남았는지(구현) + 2-4.동일한 날짜에 기 신청된 건이 있는지(구현) * */ @@ -407,9 +411,10 @@ public class EduAplctTngrController { modelAndView.addObject("msg", s_flag); return modelAndView; } - //2-3.해당일 신청가능한 차시가 남았는지 + //일 교육가능시수 체크 - Y + //지역의 총 접수시간 체크 - N String s_flag4 = eduAplctTngrService.eduAplctChkDayChasiProcessToStr(request, modelAndView); if(!"".equals(s_flag4)){ @@ -437,6 +442,81 @@ public class EduAplctTngrController { return modelAndView; } + /** + * 해당 지역이 신청 가능한지 체크 + */ + @RequestMapping("eduAplctChkZoneAjax.do") + public ModelAndView eduAplctChkZoneAjax(@ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model , HttpServletRequest request ) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + /* + * //0.로그인 실패-fail4 + * //1.교육희망일이 신청 가능한 일자인지 fail3 + //2.신청 시간이 해당 지역의 가능한 시간인지 fail + //3.중복시간 체크 - fail2 + * */ + //로그인 처리==================================== + //0.로그인 실패-fail4 + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + if (loginVO == null || ssoLoginVO == null) { + //이전 url 처리(beforeSiteUrl)_이준호_220228추가 + modelAndView.addObject("result", "fail5"); + return modelAndView; +// return checkLoginUtil.getUserLoginPage(model); //로그인 정보가 없으면 로그인 페이지로 이동한다. + } + + /* + * 2.교육신청시 교육희망일 비교하여 가능한 정보를 가져온다. + 2-1.신청 가능한 일자인지(구현) + (해당 강의 회차의 교육 가능일자만 신청 가능하도록) + ==>vea_lctr_rnds_stng + 2-2.신청 가능한 시간인지(구현) + + 2-3-1.해당지역에 신청가능한 차시가 남았는지(미구현) + + 2-3.해당일 신청가능한 차시가 남았는지(구현) + + + 2-4.동일한 날짜에 기 신청된 건이 있는지(구현) + * */ + 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; + } + */ + + + //2-3-1.해당지역에 신청가능한 차시가 남았는지(미구현) + String s_flag5 = eduAplctTngrService.eduAplctChkZoneChasiProcessToStr(request, modelAndView); + + if(!"".equals(s_flag5)){ + modelAndView.addObject("result", "fail6"); + modelAndView.addObject("msg", s_flag5); + return modelAndView; + } + + modelAndView.addObject("VO", vEEduAplctVO); + modelAndView.addObject("result", "success"); + + }catch(Exception ex) { + ex.printStackTrace(); + } + + return modelAndView; + } + /** * 교육 신청 시 강의신청기간, 강의가능시간이 유효한지 체크 - 건별 체크 */ diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrAreaMngDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrAreaMngDAO.java index 9537d825..e4be758e 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrAreaMngDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrAreaMngDAO.java @@ -84,6 +84,11 @@ public class VELctrAreaMngDAO extends EgovAbstractDAO { public int selectList20231026(VEAStngVO paramVO) throws Exception { return (int) select("VELctrAreaMngDAO.selectList20231026", paramVO); } + + //해당 라운드가 속한 년도의 해당 지역의 신청한 차시수 + public int selectList20231027(VEAStngVO paramVO) throws Exception { + return (int) select("VELctrAreaMngDAO.selectList20231027", paramVO); + } //L public List selectOnList(VELctrDetailVO paramVO) throws Exception { diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java index 875d8798..5958b03f 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java @@ -4,11 +4,9 @@ import java.time.LocalDate; import java.time.Period; import java.time.format.DateTimeFormatter; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Locale; -import java.util.Map; import java.util.Set; import javax.annotation.Resource; @@ -27,13 +25,9 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; -import com.fasterxml.jackson.databind.ObjectMapper; - -import egovframework.rte.fdl.cmmn.exception.FdlException; import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.ComDefaultCodeVO; -import kcc.com.cmm.ComDefaultVO; import kcc.com.cmm.LoginVO; import kcc.com.cmm.service.CmmnDetailCode; import kcc.com.cmm.service.EgovCmmUseService; @@ -47,7 +41,6 @@ import kcc.com.utl.user.service.CheckLoginUtil; import kcc.let.uat.uia.service.SsoLoginVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; -import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsAplctPrdService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsCntntVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; @@ -1379,27 +1372,33 @@ public class CndtnTrgtMngController { //로그인 처리==================================== - //과정 조회 - CndtnTrgtMngVO cndtnTrgtInfoVO = cndtnTrgtInfoMngService.selectDetail(cndtnTrgtInfoMngVO); - model.addAttribute("info", cndtnTrgtInfoVO); + try { + //과정 조회 + CndtnTrgtMngVO cndtnTrgtInfoVO = cndtnTrgtInfoMngService.selectDetail(cndtnTrgtInfoMngVO); + model.addAttribute("info", cndtnTrgtInfoVO); - // 관할청 공통코드 - ComDefaultCodeVO codeParam = new ComDefaultCodeVO(); - codeParam.setCodeId("VEA008"); - List CmmnDetailCodeList = egovCmmUseService.selectCmmCodeDetailOrderByCode(codeParam); - model.addAttribute("CmmnDetailCodeList", CmmnDetailCodeList); + // 관할청 공통코드 + ComDefaultCodeVO codeParam = new ComDefaultCodeVO(); + codeParam.setCodeId("VEA008"); + List CmmnDetailCodeList = egovCmmUseService.selectCmmCodeDetailOrderByCode(codeParam); + model.addAttribute("CmmnDetailCodeList", CmmnDetailCodeList); + + String userWork = this.getUserWork(request); + model.addAttribute("userWork", userWork); + + + //파일 정보 가져오기 + FileVO fileVO = new FileVO(); + fileVO.setAtchFileId(cndtnTrgtInfoVO.getAtchFileId()); + List result = fileService.selectFileInfs(fileVO); + model.addAttribute("fileList", result); + model.addAttribute("fileListCnt", result.size()); + + }catch(Exception ex) { + ex.printStackTrace(); + } - String userWork = this.getUserWork(request); - model.addAttribute("userWork", userWork); - - - //파일 정보 가져오기 - FileVO fileVO = new FileVO(); - fileVO.setAtchFileId(cndtnTrgtInfoVO.getAtchFileId()); - List result = fileService.selectFileInfs(fileVO); - model.addAttribute("fileList", result); - model.addAttribute("fileListCnt", result.size()); return "oprtn/cndtnSspnIdtmt/trgtMdfy"; } @@ -1420,54 +1419,59 @@ public class CndtnTrgtMngController { //로그인 처리==================================== - //과정 조회 - CndtnTrgtMngVO cndtnTrgtInfoVO = cndtnTrgtInfoMngService.selectDetail(cndtnTrgtInfoMngVO); - - //복호화 - cndtnTrgtInfoVO = egovCryptoUtil.decryptCndtnTrgtMngVOInfo(cndtnTrgtInfoVO); - model.addAttribute("info", cndtnTrgtInfoVO); - - - //파일 정보 가져오기 - FileVO fileVO = new FileVO(); - fileVO.setAtchFileId(cndtnTrgtInfoVO.getAtchFileId()); - List result = fileService.selectFileInfs(fileVO); - model.addAttribute("fileList", result); - model.addAttribute("fileListCnt", result.size()); - -/* - // 관할청 공통코드 - ComDefaultCodeVO codeParam = new ComDefaultCodeVO(); - codeParam.setCodeId("VEA008"); - List CmmnDetailCodeList = egovCmmUseService.selectCmmCodeDetailOrderByCode(codeParam); - model.addAttribute("CmmnDetailCodeList", CmmnDetailCodeList); - - */ + try { + //과정 조회 + CndtnTrgtMngVO cndtnTrgtInfoVO = cndtnTrgtInfoMngService.selectDetail(cndtnTrgtInfoMngVO); + + //복호화 + cndtnTrgtInfoVO = egovCryptoUtil.decryptCndtnTrgtMngVOInfo(cndtnTrgtInfoVO); + model.addAttribute("info", cndtnTrgtInfoVO); + + + //파일 정보 가져오기 + FileVO fileVO = new FileVO(); + fileVO.setAtchFileId(cndtnTrgtInfoVO.getAtchFileId()); + List result = fileService.selectFileInfs(fileVO); + model.addAttribute("fileList", result); + model.addAttribute("fileListCnt", result.size()); + + /* + // 관할청 공통코드 + ComDefaultCodeVO codeParam = new ComDefaultCodeVO(); + codeParam.setCodeId("VEA008"); + List CmmnDetailCodeList = egovCmmUseService.selectCmmCodeDetailOrderByCode(codeParam); + model.addAttribute("CmmnDetailCodeList", CmmnDetailCodeList); + + */ - ComDefaultCodeVO codeParam = new ComDefaultCodeVO(); - codeParam.setCodeId("VEA008"); - List CmmnDetailCodeList = egovCmmUseService.selectCmmCodeDetailOrderByCode(codeParam); + ComDefaultCodeVO codeParam = new ComDefaultCodeVO(); + codeParam.setCodeId("VEA008"); + List CmmnDetailCodeList = egovCmmUseService.selectCmmCodeDetailOrderByCode(codeParam); - // CODE 값을 저장할 Set (중복을 제거하기 위해 사용) - Set uniqueCodes = new HashSet<>(); - - for(CmmnDetailCode vo : CmmnDetailCodeList) { - uniqueCodes.add(vo.getCode().split("-")[0]); + // CODE 값을 저장할 Set (중복을 제거하기 위해 사용) + Set uniqueCodes = new HashSet<>(); + + for(CmmnDetailCode vo : CmmnDetailCodeList) { + uniqueCodes.add(vo.getCode().split("-")[0]); + } + + model.addAttribute("CmmnDetailCodeList", uniqueCodes); + + // 관할청 - 지역명 + String codeNm = cndtnTrgtInfoVO.getCmptntAthrt().split("-")[0]; + model.addAttribute("cmptntAthrtCode", codeNm); + + codeParam.setCodeNm(codeNm); + List CmmnDetailList = egovCmmUseService.selectCmmCodeDetailLikeNmOrderByCode(codeParam); + + + model.addAttribute("cmmnCodeList", CmmnDetailList); + + }catch(Exception ex) { + ex.printStackTrace(); } - model.addAttribute("CmmnDetailCodeList", uniqueCodes); - - // 관할청 - 지역명 - String codeNm = cndtnTrgtInfoVO.getCmptntAthrt().split("-")[0]; - model.addAttribute("cmptntAthrtCode", codeNm); - - codeParam.setCodeNm(codeNm); - List CmmnDetailList = egovCmmUseService.selectCmmCodeDetailLikeNmOrderByCode(codeParam); - - - model.addAttribute("cmmnCodeList", CmmnDetailList); - return "oprtn/cndtnSspnIdtmt/trgtMngMdfy"; diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java index 9be99d29..ca61981c 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java @@ -692,6 +692,102 @@ public class EduAplctMngTngrController { } + /** + * 청소년찾아가는 저작권 교육 목록 Excel + * @param model + * @return + * @throws Exception + */ + + @SuppressWarnings("rawtypes") + @RequestMapping(value = "eduAplctApplyExcelDownLoad.do") + public ModelAndView eduAplctApplyExcelDownLoad(@ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO, ModelMap model) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + try { + //년도 + if(StringUtils.isBlank(vEEduAplctVO.getSearchYear())){ + //vEEduAplctVO.setSearchYear(String.valueOf(LocalDate.now().getYear())); + } + + //월 + if(StringUtils.isBlank(vEEduAplctVO.getSearchMonth())){ + //vEEduAplctVO.setSearchMonth(String.valueOf(LocalDate.now().getMonthValue())); + } + + // 요청, 반려건 + //vEEduAplctVO.setSearchNotStatusArr(new String[]{"60",}); + // 청소년 + vEEduAplctVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_10); + + vEEduAplctVO.setMode(VeConstants.MODE_EXCEL); + vEEduAplctVO.setS4Excel("Y"); + //List list = vEEduMIXService.selectPagingList(vEEduAplctVO); + List list = vEEduMIXService.selectPagingApplyList(vEEduAplctVO); + list = egovCryptoUtil.decryptVEEduAplctVOList(list); + list.forEach( vo -> { + /* + ComDefaultCodeVO codeParam = new ComDefaultCodeVO(); + codeParam.setCodeId("VE0008"); + codeParam.setCode(vo.getEduSlctAreaCd()); + vo.setEduSlctAreaCd(egovCmmUseService.selectCmmCodeDetailCodeValue(codeParam)); + + codeParam.setCodeId("VE0009"); + codeParam.setCode(vo.getScholDivCd()); + vo.setScholDivCd(egovCmmUseService.selectCmmCodeDetailCodeValue(codeParam)); + + codeParam.setCodeId("VE0003"); + codeParam.setCode(vo.getAprvlCd()); + vo.setAprvlCd(egovCmmUseService.selectCmmCodeDetailCodeValue(codeParam)); + */ + + //vo.setEduHopeDt(CmmUtil.getStrDateFormat(vo.getEduHopeDt())); + + }); + List excelData = new ArrayList<>(); + excelData.addAll(list); + // 세팅값 + String title = "청소년 찾아가는 저작권 교육 - 교육신청 목록"; + int[] width = { + 4000, 4000, 4000, 4000, 4000 + , 4000, 4000, 4000, 4000, 4000, 7000, 10000 + , 4000 + , 4000, 4000 + }; // 너비 + + String[] header = { + "교육일자", "신청일자", "지역", "학교(기관)명", "신청시간" + , "학교구분", "신청자", "담당자", "연락처", "휴대전화", "E-mail", "주소" + , "신청상태", "확정일자" + , "신청차시", "신청일시" + }; + + String[] order = { + "EduHopeDt", "SbmtPnttm", "EduSlctAreaCd", "ScholInsttNm", "LrnTm" + , "ScholDivCd", "UserNm", "ChrgNm", "Phone", "Clphone", "Email", "Addr" + , "AprvlCd","AprvlPnttm" + , "ChasiCnt","FrstRegistPnttm" + }; + + // 호출 + SXSSFWorkbook workbook = ExcelUtil.makeSimpleFruitExcelWorkbook(excelData , header, order, width, title); + model.addAttribute("locale", Locale.KOREA); + model.addAttribute("workbook", workbook); + model.addAttribute("workbookName", title); + + + modelAndView.setViewName("excelDownloadView"); + modelAndView.addObject(model); + + + }catch(Exception ex) { + ex.printStackTrace(); + } + + + return modelAndView; + } + /** * 청소년찾아가는 저작권 교육 목록 Excel * @param model 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 6ed3bfe9..e8d41050 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 @@ -5857,7 +5857,10 @@ VALUES - + + + + - + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advRndsStngMngPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advRndsStngMngPopup.jsp index 501b3048..2ecad35a 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advRndsStngMngPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advRndsStngMngPopup.jsp @@ -618,8 +618,8 @@
- - + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/incPrivacy.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/incPrivacy.jsp index 16fbe2fc..49faad8e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/incPrivacy.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/incPrivacy.jsp @@ -32,491 +32,7 @@ background-color: #f9f9f9 !important; } - 
한국저작권위원회에서는 귀하의 개인정보를 중요시하며, 개인정보보호법 제15조, 제 17조, 제 22조, 제23조 및 제24조에 따라
아래와 같이 개인정보 처리에 관하여 동의를 얻고자 합니다.

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/popup/scholPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/popup/scholPopList.jsp
index c9d46c44..da1a0f76 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/popup/scholPopList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/popup/scholPopList.jsp
@@ -66,6 +66,7 @@
 			console.log(value.value);
 			rsObj[value.name] = value.value;
 		});
+		alert(rsObj);
 		callBackSchPop(rsObj);
 		$(".btn_popup_close").click();
 	}
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/scholPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/scholPopList.jsp
index 652677de..4ae54233 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/scholPopList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/scholPopList.jsp
@@ -60,7 +60,7 @@
 		$.each(inObj, function(idx, value){
 			console.log(value.value);
 			rsObj[value.name] = value.value;
-		});
+		});		
 		callBackSchPop(rsObj);
 		$(".btn_popup_close").click();
 	}
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 0f3a6d40..a0ca05d9 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
@@ -464,6 +464,9 @@ function _chkChasiTime(p_this){
 			// 작성한 차시가 신청 가능한 기간/시간인지 체크(관리자 지역별 강의관리 참고) 및 중복신청건 조회
 			//DB로 체크
 			if(!checkAplctPsbl()) return;
+
+			//지역체크 추가
+			if(!checkAplctZonePsbl()) return;
 		}
 		
 		var url = '${pageContext.request.contextPath}/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctRegAjax.do';
@@ -893,20 +896,23 @@ function _chkChasiTime(p_this){
 					if(returnData.result == "fail4"){
 						alert("로그인 후 다시 교육신청해 주세요.");
 						flag = false;
-						return;
+						//return false;
 					}else if(returnData.result == "fail3"){
 						//alert("가능한 교육희망일자가 아닙니다.");
 						alert(returnData.msg+"일은 교육가능일자가 아닙니다.");
 						flag = false;
-						return;						
+						//return false;						
 					}else if(returnData.result == "fail"){
 						//alert("신청한 차시 중 신청기간, 강의가능시간이 아닌 교육이 있습니다.");
 						alert(returnData.msg+"는 강의가능시간이 아닙니다.");
 						flag = false;
-						return;
-					}
-					
-					if(!duplChk) {
+						//return false;
+					}else if(returnData.result == "fail5"){
+						//alert("신청한 차시 중 신청기간, 강의가능시간이 아닌 교육이 있습니다.");
+						alert("해당 지역의 차시 신청이 초과 되어서 교육신청을 할 수 없습니다.");
+						flag = false;
+						//return false;						
+					}else if(!duplChk) {
 						if(returnData.result == "fail2"){
 							if(confirm("중복된 신청 건이 있습니다. 진행하시겠습니까?")){
 								//중복신청건이 있어도 등록(최초 질의 후 재질의 방지)
@@ -914,7 +920,7 @@ function _chkChasiTime(p_this){
 							} else {
 								flag = false;
 							}
-							return;
+							//return;
 						}
 					}
 				},
@@ -933,6 +939,88 @@ function _chkChasiTime(p_this){
 
 	}
 
+	// 신청하는 차시가 유효한 신청기간인지, 강의가능시간인지 체크하는 로직
+	// =>강의 가능 시간 여부만 체크로 변경 2022-02-28
+	// 추가로, 본인이 등록했던 신청건인지 체크(사용자아이디, 학교명, 교육희망일, 교육대상 비교)
+	//1.교육희망일이 신청 가능한 일자인지
+	//2.신청 시간이 해당 지역의 가능한 시간인지
+	//3.중복시간 체크
+	function checkAplctZonePsbl() {
+		var trObj = $('.addClassRow').find('tbody > tr').not('.calendar_wrap tr');
+		
+		var flag = true;
+		var duplChk = false;
+		
+		var eduSlctCd = $("select[name=eduSlctCd]").val();
+		//alert(eduSlctCd);
+		//return;
+		
+		$.each(trObj , function(idx, row){
+			if(!flag) return false;
+			
+			var eduHopeDt = $(this).find('input[name=eduHopeDt]').val();
+			var strtTm = 	$(this).find('input[name=strtTm]').val();
+			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();
+			
+
+			/*
+			  2.교육신청시 교육희망일 비교하여 가능한 정보를 가져온다.
+			  	2-1.신청 가능한 일자인지(구현)
+			  (해당 강의 회차의 교육 가능일자만 신청 가능하도록)
+				==>vea_lctr_rnds_stng
+				2-2.신청 가능한 시간인지(구현)
+				2-3.해당일 신청가능한 차시가 남았는지(미구현)
+				
+				2-4.동일한 날짜에 기 신청된 건이 있는지(구현)
+				*/
+				
+			
+			$.ajax({
+				type:"POST",
+				url:"${pageContext.request.contextPath}/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctChkZoneAjax.do",
+				data: {
+					"eduHopeDt" : eduHopeDt ,
+					"strtTm" : strtTm,
+					"endTm" : endTm,
+					"eduSlctAreaCd" : eduSlctAreaCd,
+				//	"prdDivCd" : prdDivCd,
+					"eduSlctCd" : eduSlctCd,
+					"trgt" : trgt,
+					"rndsOrd":rndsOrd,
+				},
+				dataType:'json',
+				async: false,
+				success:function(returnData){
+					if(returnData.result == "fail4"){
+						alert("로그인 후 다시 교육신청해 주세요.");
+						flag = false;
+						return ;
+					}else if(returnData.result == "fail6"){
+						//alert("신청한 차시 중 신청기간, 강의가능시간이 아닌 교육이 있습니다.");
+						alert("해당 지역의 차시 신청이 초과 되어서 교육신청을 할 수 없습니다.");
+						flag = false;
+						return ;						
+					}
+					
+				},
+				error:function(request , status, error){
+					alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+				}
+			});
+			
+		});
+
+		if(!flag){
+			return false;
+		}
+		
+		return true;
+
+	}
+	
 	// 신청기간에 정상적으로 들어온 것인지 체크하는 로직
 	function checkAplctPsbl_date_check() {
 		$.ajax({
@@ -1240,8 +1328,8 @@ function _chkChasiTime(p_this){
 					
 					
 					
-					 학교를 선택하시면 지역은 자동으로 입력됩니다.
-					 강사님이 방문하지 않는 비대면 교육입니다.
+					 
+					 
 				
 			
 			

From 70717de7f2d95981d16cf0556f63085560576ccd Mon Sep 17 00:00:00 2001
From: myname 
Date: Tue, 16 Jan 2024 12:39:20 +0900
Subject: [PATCH 2/6] =?UTF-8?q?2024-01-16=2012:39=20=ED=99=94=EB=A9=B4?=
 =?UTF-8?q?=EB=B9=84=EC=9C=A8=EC=97=90=20=EB=A7=9E=EA=B2=8C=20=EC=9A=94?=
 =?UTF-8?q?=EC=86=8C=EB=84=93=EC=9D=B4=20=EC=A1=B0=EC=A0=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngList.jsp  | 2 +-
 .../WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngTrgtList.jsp     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngList.jsp
index 0134fef9..215b467e 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngList.jsp
@@ -388,11 +388,11 @@
 								
 								
 								
+																
 								
 								
 								
 								
-								
 								
 								
 								
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngTrgtList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngTrgtList.jsp
index ee2d8d2c..8d3f0dde 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngTrgtList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngTrgtList.jsp
@@ -391,9 +391,10 @@
 								
 								
 								
+								
 								
 								
-								
+								
 								
 								
 								

From 8767333981322772d6c0757abe272a0725850ee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?ITN=5F=EB=94=94=EC=9E=90=EC=9D=B8=ED=8C=80?=
 
Date: Tue, 16 Jan 2024 12:46:30 +0900
Subject: [PATCH 3/6] =?UTF-8?q?2024/01/16=20=EC=9B=B9=EC=A0=91=EA=B7=BC?=
 =?UTF-8?q?=EC=84=B1=20=EC=88=98=EC=A0=95(font-weight:=20300=20=E2=86=92?=
 =?UTF-8?q?=20font-weight:=20400)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/visitEdu/usr/publish/css/content.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/visitEdu/usr/publish/css/content.css b/src/main/webapp/visitEdu/usr/publish/css/content.css
index 06a7ea03..771185af 100644
--- a/src/main/webapp/visitEdu/usr/publish/css/content.css
+++ b/src/main/webapp/visitEdu/usr/publish/css/content.css
@@ -163,7 +163,7 @@
 .req_text{display: inline-block; font-size: 16px; font-weight: 600; color: #e40000; vertical-align: middle; padding-right: 5px;}
 .req_text span{display: inline-block; width: 1px; height: 1px; margin: -1px; clip: rect(0,0,0,0); overflow: hidden; padding: 0;}
 .req_text+p{display: inline-block;}
-.cf_text {font-size: 15px; font-weight: 300; color: #e40000;}
+.cf_text {font-size: 15px; font-weight: 400; color: #e40000;}
 .cf_text2 {font-size: 15px; font-weight: 300; color: #666;}
 .cf_text3 {font-size: 18px; font-weight: 300; color: #666; line-height: 1.4; letter-spacing: -1px; display: block; padding-top: 12px;}
 .table_req_text {font-size: 15px; color: #666; font-weight: 300; display: block; padding-top: 5px; line-height: 1.3; letter-spacing: -0.5px;}

From 91a7fae0be81f001af50477f87bd950e1188bfd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?ITN=5F=EB=94=94=EC=9E=90=EC=9D=B8=ED=8C=80?=
 
Date: Tue, 16 Jan 2024 16:27:17 +0900
Subject: [PATCH 4/6] =?UTF-8?q?2024/01/16=20=EC=9B=B9=EC=A0=91=EA=B7=BC?=
 =?UTF-8?q?=EC=84=B1=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/web/cop/bbs/FaqListAjax.jsp | 2 +-
 src/main/webapp/visitEdu/usr/publish/css/content.css    | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/cop/bbs/FaqListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/FaqListAjax.jsp
index 41cc7ae9..68546bd4 100644
--- a/src/main/webapp/WEB-INF/jsp/web/cop/bbs/FaqListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/FaqListAjax.jsp
@@ -59,7 +59,7 @@
-
+
  • diff --git a/src/main/webapp/visitEdu/usr/publish/css/content.css b/src/main/webapp/visitEdu/usr/publish/css/content.css index 771185af..5e30ed39 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/content.css +++ b/src/main/webapp/visitEdu/usr/publish/css/content.css @@ -841,6 +841,12 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa /*알림마당 > 교육자료실 > 첨부파일 수정*/ .fileView a{margin: 0 0 10px 0; white-space: normal; background-image: url(../images/content/file_img.png); background-repeat: no-repeat; background-position: left 48%; padding-left: 23px; letter-spacing: -0.5px; font-size: 16px; font-weight: 400; color:#555; line-height:20px;} +/*알림마당 > FAQ > 답변 색 수정*/ +.full_faq .faq li button{background-color: #f5f5f5;} +.full_faq .faq li button .qst_text{z-index: 1;} +.full_faq .faq li .answer{background-color: #fff;} + + @media all and (max-width: 1300px){ /*교육소개 추가*/ .edu_wrap .tb_type01 table tbody .edu_sus_num li{width: 55%;} From 26e415c5af5dfe9f2b4749647858714fc7419518 Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 16 Jan 2024 16:56:08 +0900 Subject: [PATCH 5/6] =?UTF-8?q?2024-01-16=2016:54=20=EA=B5=90=EC=9C=A1?= =?UTF-8?q?=EB=B0=B0=EC=B9=98=ED=99=95=EC=A0=95=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EA=B0=95=EC=82=AC=EA=B2=80=EC=83=89=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ve/aplct/comweb/CommonWebController.java | 21 ++++++++++ .../service/VEAutoAsgnmMIXService.java | 3 ++ .../service/impl/VEAutoAsgnmMIXDAO.java | 6 +++ .../impl/VEAutoAsgnmMIXServiceImpl.java | 7 +++- .../web/EduAsgnmCnfrmMngTngrController.java | 17 +++++++++ .../ve/edu/VEAutoAsgnm_MIX_SQL_Tibero.xml | 38 +++++++++++++++++++ .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 6 ++- .../tngrVisitEdu/eduAsgnmCnfrmMngList.jsp | 1 - 8 files changed, 96 insertions(+), 3 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java index 1f51129c..3f15635f 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java @@ -1282,11 +1282,32 @@ public class CommonWebController { vEInstrAssiEduAplctVOList = vEAutoAsgnmMIXService.selectInstrMntAsgnmtChasiList(vEAutoAsgnmVO); + + //step2-1-1.동일일자 시간대에 배정이 없는강사찾기 + for (int j=0;j selectRsdneInstrList(VEAutoAsgnmVO paramVO) throws Exception; + + //step2-1-1.동일일자,시간에 배정안된 강사 검색(필) + List selectInstrTimeDupFilterList(VEAutoAsgnmVO paramVO) throws Exception; //step2-2.희망 지역 강사 검색(필) List selectInstrHopeAreaList(VEAutoAsgnmVO paramVO) throws Exception; diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEAutoAsgnmMIXDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEAutoAsgnmMIXDAO.java index 62e01a21..37bf2fee 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEAutoAsgnmMIXDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEAutoAsgnmMIXDAO.java @@ -21,6 +21,12 @@ public class VEAutoAsgnmMIXDAO extends EgovAbstractDAO { List tlist = (List) list("VEAutoAsgnmDAO.selectRsdneInstrList", paramVO); return tlist; } + + public List selectInstrTimeDupFilterList(VEAutoAsgnmVO paramVO) { + @SuppressWarnings("unchecked") + List tlist = (List) list("VEAutoAsgnmDAO.selectInstrTimeDupFilterList", paramVO); + return tlist; + } public List selectInstrHopeAreaList(VEAutoAsgnmVO paramVO) { @SuppressWarnings("unchecked") diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEAutoAsgnmMIXServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEAutoAsgnmMIXServiceImpl.java index 443ab193..c81b89e5 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEAutoAsgnmMIXServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEAutoAsgnmMIXServiceImpl.java @@ -27,7 +27,12 @@ public class VEAutoAsgnmMIXServiceImpl implements VEAutoAsgnmMIXService { public List selectRsdneInstrList(VEAutoAsgnmVO paramVO) throws Exception{ return vEAutoAsgnmMIXDAO.selectRsdneInstrList(paramVO); } - + + @Override + public List selectInstrTimeDupFilterList(VEAutoAsgnmVO paramVO) throws Exception{ + return vEAutoAsgnmMIXDAO.selectInstrTimeDupFilterList(paramVO); + } + @Override public List selectInstrHopeAreaList(VEAutoAsgnmVO paramVO) throws Exception{ return vEAutoAsgnmMIXDAO.selectInstrHopeAreaList(paramVO); diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngTngrController.java index f4124ced..20816ebc 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngTngrController.java @@ -207,6 +207,23 @@ public class EduAsgnmCnfrmMngTngrController { vEEduAplctVO.setSearchAsgnmAprvlCd("30"); //교육배치확정 대상은 강사가 배정확정되어야 한다. + + if (!"".equals(vEEduAplctVO.getSearchKeyword())) { + + if ("2".equals(vEEduAplctVO.getSearchCondition())) { + vEEduAplctVO.setSelectPagingListQuery(" AND i.instr_nm='"+egovCryptoUtil.encrypt(vEEduAplctVO.getSearchKeyword())+"'"); + + }else if ("0".equals(vEEduAplctVO.getSearchCondition())) { + vEEduAplctVO.setSelectPagingListQuery(" AND (A.SCHOL_INSTT_NM LIKE '%' || '"+vEEduAplctVO.getSearchKeyword()+"' || '%' OR i.instr_nm='"+egovCryptoUtil.encrypt(vEEduAplctVO.getSearchKeyword())+"')"); + } + + //AND A.SCHOL_INSTT_NM LIKE '%' || #searchKeyword# || '%' + + //vEEduAplctVO = egovCryptoUtil.encryptVEEduAplctVOInfo(vEEduAplctVO); + } + + + List vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO); //이름 복호화 VEEduAplctVO vo = new VEEduAplctVO(); diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEAutoAsgnm_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEAutoAsgnm_MIX_SQL_Tibero.xml index 07682fd8..8c123034 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEAutoAsgnm_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEAutoAsgnm_MIX_SQL_Tibero.xml @@ -458,6 +458,44 @@ END ,0)>NVL(aa.chasi,0) + + + - From f289cdfdc12ae17476122144826bcc61444e7749 Mon Sep 17 00:00:00 2001 From: kmg Date: Tue, 16 Jan 2024 16:56:11 +0900 Subject: [PATCH 6/6] =?UTF-8?q?2024/01/16=20caption=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visitEdu/usr/publish/script/content.js | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/main/webapp/visitEdu/usr/publish/script/content.js b/src/main/webapp/visitEdu/usr/publish/script/content.js index 10488f72..f25eae77 100644 --- a/src/main/webapp/visitEdu/usr/publish/script/content.js +++ b/src/main/webapp/visitEdu/usr/publish/script/content.js @@ -1067,3 +1067,42 @@ $(function(){ /* 날짜 및 시간 입력 시 자동 작성 스크립트 */ + $(document).ready(function () { + + boardCaptionToggle(); + boardCaptionToggle02(); + + }); + + function boardCaptionToggle() { + var bdWid = $("body").width(); + var thLength = $(".tb_type01 th").length; + if (bdWid > 640) { + var subTit = $(".tb_tit01_left p").text() + var itmText = ""; + $(".tb_type01 th").each(function (index, item) { + itmText += $(item).text(); + if (index === thLength - 1) { + /* 마지막 th일 경우 - ,가 들어가면 안됨. */ + itmText; + } else { + itmText += ", "; + } + }); + if ($(".tb_type01 caption").length == 0) { + if(subTit.indexOf("목록") != -1){ + $(".tb_type01>table").prepend("" + subTit + " : " + itmText + "등의 정보제공 "); + }else{ + if(subTit == "대시보드"){ + $(".tb_type01>table").prepend(" : " + itmText + "등의 정보제공 "); + }else{ + $(".tb_type01>table").prepend("" + subTit + " 목록 : " + itmText + "등의 정보제공 "); + } + + } + + } else {} + } else { + $(".tb_type01 caption").remove(); + } + }