diff --git a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java new file mode 100644 index 00000000..b76794db --- /dev/null +++ b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java @@ -0,0 +1,362 @@ +package kcc.ve.aplct.comweb; + +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 org.springframework.web.servlet.ModelAndView; + +import kcc.let.utl.fcc.service.EgovCryptoUtil; +import kcc.ve.adv.tngr.stngInfo.service.VEACmpltCrtfcMixService; +import kcc.ve.adv.tngr.stngInfo.service.VEACmpltCrtfcVO; +import kcc.ve.aplct.fndtnEnhanceTrn.service.FndtnEnhanceTrnService; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailService; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; + +/** + * + * report 용 json 데이터 생성용 ajax controller 클래스를 정의한다. + * @author 조용준 + * @since 2021.12.16 + * @version 1.0 + * @see + * + *
+ * << 개정이력(Modification Information) >>
+ *
+ *   수정일      수정자           수정내용
+ *  -------    --------    ---------------------------
+ *   2021.12.16  조용준          최초 생성
+ *
+ * 
+ */ + +@Controller +//@RequestMapping("/web/ve/aplct/fndtnEnhanceTrn") +public class CrownixAjaxController { + + private static final Logger LOGGER = LoggerFactory.getLogger(CrownixAjaxController.class); + + //암복호화 유틸 + @Resource(name = "egovCryptoUtil") + EgovCryptoUtil egovCryptoUtil; + + /* + //파일 체크 util + @Resource(name = "checkFileUtil") + private CheckFileUtil checkFileUtil; + + //로그인 체크 util + @Resource(name = "checkLoginUtil") + private CheckLoginUtil checkLoginUtil; + + //파일정보의 관리 + @Resource(name = "EgovFileMngService") + private EgovFileMngService fileService; + + + //과정 관리 + @Resource(name = "vEPrcsService") + private VEPrcsService vEPrcsService; + + //온라인콘텐츠과정 관리 + @Resource(name = "vEPrcsOnlnCntntService") + private VEPrcsOnlnCntntService vEPrcsOnlnCntntService; + + //교육신청 + @Resource(name = "vEEduAplctService") + private VEEduAplctService vEEduAplctService; + + //차시 + @Resource(name = "vEEduChasiService") + private VEEduChasiService vVEEduChasiService; + + //교육과정신청 + @Resource(name = "vEEduMIXService") + private VEEduMIXService vEEduMIXService; + + //교육과정신청 + @Resource(name = "vEPrcsMIXService") + private VEPrcsMIXService vEPrcsMIXService; + + + //과정차시 관리 + @Resource(name = "vEPrcsAplctPrdService") + private VEPrcsAplctPrdService vEPrcsAplctPrdService; + + + + //교육과정순번 + @Resource(name="prcsGnrService") + private EgovIdGnrService prcsGnrService; + + //과정온라인콘텐츠순번 + @Resource(name="prcsOnlnGnrService") + private EgovIdGnrService prcsOnlnGnrService; + + //교육신청순번 + @Resource(name="eduAplctGnrService") + private EgovIdGnrService eduAplctGnrService; + + //교육차시순번 + @Resource(name="eduChasiGnrService") + private EgovIdGnrService eduChasiGnrService; + + //교육신청온라인 + @Resource(name = "vEEduAplctOnlnService") + private VEEduAplctOnlnService vEEduAplctOnlnService; + + @Resource(name = "eduAplctAdultService") + private EduAplctAdultService eduAplctAdultService; + + //코드 + @Resource(name="cmmUseDAO") + private CmmUseDAO cmmUseDAO; + */ + + + //온라인콘텐츠과정 관리 + @Resource(name = "vEInstrDetailService") + private VEInstrDetailService vEInstrDetailService; + + //온라인콘텐츠과정 관리 + @Resource(name = "fndtnEnhanceTrnService") + private FndtnEnhanceTrnService fndtnEnhanceTrnService; + + //강의설정 관리(MIX) + @Resource(name = "vEACmpltCrtfcMixService") + private VEACmpltCrtfcMixService vEACmpltCrtfcMixService; + + + /** + * 교육 list select + * viewer.openFile('cmplt_crtfc_20231030.mrd' + * , '/rf [http://192.168.0.59:3080/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do + * ?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']'); + */ + @RequestMapping("/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do") + public ModelAndView fndtnEduAplctCmpltCrtfcAjax( + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + System.out.println("----------------"); + System.out.println(request.getParameter("prcsAplctPrdOrd")); + System.out.println(request.getParameter("eduAplctOrd")); + System.out.println("----------------"); + + VEACmpltCrtfcVO vEACmpltCrtfcVO = new VEACmpltCrtfcVO(); + vEACmpltCrtfcVO.setPrcsAplctPrdOrd(request.getParameter("prcsAplctPrdOrd")); + vEACmpltCrtfcVO.setEduAplctOrd(request.getParameter("eduAplctOrd")); + + vEACmpltCrtfcVO = vEACmpltCrtfcMixService.selectDetail_CC_1(vEACmpltCrtfcVO); + + vEACmpltCrtfcVO.setMberNm(egovCryptoUtil.decrypt(vEACmpltCrtfcVO.getMberNm())); + + /* + modelAndView.addObject("data_t", "교육연수이수증X"); + + modelAndView.addObject("data_1", "허은성"); + modelAndView.addObject("data_2", "허은성"); + modelAndView.addObject("data_3", "1986-08-02"); + modelAndView.addObject("data_4", "직무연수"); + modelAndView.addObject("data_5", "선율과 함꼐하는 저작권 여행"); + modelAndView.addObject("data_6", "총15시간(1학점)"); + modelAndView.addObject("data_7", "2023년5월15일~2023년05월26일"); + + modelAndView.addObject("data_d", "2023년05월28일"); + */ + + modelAndView.addObject("data_t", "교육연수이수증"); + + modelAndView.addObject("data_1", vEACmpltCrtfcVO.getEduCmpltCrtfcNmbr()); + modelAndView.addObject("data_2", vEACmpltCrtfcVO.getMberNm()); + modelAndView.addObject("data_3", vEACmpltCrtfcVO.getBirthDay()); + modelAndView.addObject("data_4", vEACmpltCrtfcVO.getPrcsDiv()); + modelAndView.addObject("data_5", vEACmpltCrtfcVO.getPrcsNm()); + modelAndView.addObject("data_6", vEACmpltCrtfcVO.getMberNm()); + modelAndView.addObject("data_7", vEACmpltCrtfcVO.getEduStrtPnttm()+"~"+vEACmpltCrtfcVO.getEduDdlnPnttm()); + + String s_rd = vEACmpltCrtfcVO.getRd(); + s_rd = s_rd.substring(0,4)+"년"+s_rd.substring(4,6)+"년"+s_rd.substring(6,8); + System.out.println(s_rd); + System.out.println(s_rd); + + modelAndView.addObject("data_d", s_rd); + + return modelAndView; + + } + + + /** + * 기소유예 이수증 + * viewer.openFile('cmplt_crtfc_20231030.mrd' + * , '/rf [http://192.168.0.59:3080/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do + * ?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']'); + */ + @RequestMapping("/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctCmpltCrtfcAjax.do") + public ModelAndView sspnIdtmtEduAplctCmpltCrtfcAjax( + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + System.out.println("----------------"); + System.out.println(request.getParameter("prcsAplctPrdOrd")); + System.out.println(request.getParameter("eduAplctOrd")); + System.out.println("----------------"); + + VEACmpltCrtfcVO vEACmpltCrtfcVO = new VEACmpltCrtfcVO(); + vEACmpltCrtfcVO.setPrcsAplctPrdOrd(request.getParameter("prcsAplctPrdOrd")); + vEACmpltCrtfcVO.setEduAplctOrd(request.getParameter("eduAplctOrd")); + + vEACmpltCrtfcVO = vEACmpltCrtfcMixService.selectDetail_CC_1(vEACmpltCrtfcVO); + + vEACmpltCrtfcVO.setMberNm(egovCryptoUtil.decrypt(vEACmpltCrtfcVO.getMberNm())); + + /* + modelAndView.addObject("data_t", "교육연수이수증X"); + + modelAndView.addObject("data_1", "허은성"); + modelAndView.addObject("data_2", "허은성"); + modelAndView.addObject("data_3", "1986-08-02"); + modelAndView.addObject("data_4", "직무연수"); + modelAndView.addObject("data_5", "선율과 함꼐하는 저작권 여행"); + modelAndView.addObject("data_6", "총15시간(1학점)"); + modelAndView.addObject("data_7", "2023년5월15일~2023년05월26일"); + + modelAndView.addObject("data_d", "2023년05월28일"); + */ + + modelAndView.addObject("data_t", "기소유예이수증"); + + modelAndView.addObject("data_1", vEACmpltCrtfcVO.getEduCmpltCrtfcNmbr()); + modelAndView.addObject("data_2", vEACmpltCrtfcVO.getMberNm()); + modelAndView.addObject("data_3", vEACmpltCrtfcVO.getBirthDay()); + modelAndView.addObject("data_4", vEACmpltCrtfcVO.getPrcsDiv()); + modelAndView.addObject("data_5", vEACmpltCrtfcVO.getPrcsNm()); + modelAndView.addObject("data_6", vEACmpltCrtfcVO.getMberNm()); + modelAndView.addObject("data_7", vEACmpltCrtfcVO.getEduStrtPnttm()+"~"+vEACmpltCrtfcVO.getEduDdlnPnttm()); + + String s_rd = vEACmpltCrtfcVO.getRd(); + s_rd = s_rd.substring(0,4)+"년"+s_rd.substring(4,6)+"년"+s_rd.substring(6,8); + System.out.println(s_rd); + System.out.println(s_rd); + + modelAndView.addObject("data_d", s_rd); + + return modelAndView; + + } + + /** + * 성인강사 출력 정보 + * + */ + @RequestMapping("/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetailAjax.do") + public ModelAndView eduAplctDetailAjax( + ModelMap model + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + System.out.println("----------------"); + System.out.println(request.getParameter("p_instrId")); + System.out.println(request.getParameter("p_instrId")); + System.out.println("----------------"); + /* + VEACmpltCrtfcVO vEACmpltCrtfcVO = new VEACmpltCrtfcVO(); + vEACmpltCrtfcVO.setPrcsAplctPrdOrd(request.getParameter("prcsAplctPrdOrd")); + vEACmpltCrtfcVO.setEduAplctOrd(request.getParameter("eduAplctOrd")); + + vEACmpltCrtfcVO = vEACmpltCrtfcMixService.selectDetail_CC_1(vEACmpltCrtfcVO); + + vEACmpltCrtfcVO.setMberNm(egovCryptoUtil.decrypt(vEACmpltCrtfcVO.getMberNm())); + */ + + + modelAndView.addObject("data_t", "강사정보"); + + modelAndView.addObject("data_1", "성인강사2"); + modelAndView.addObject("data_2", "010-9341-4986"); + modelAndView.addObject("data_3", "rosehips@naver.com"); + modelAndView.addObject("data_4", "13473 경기 성남시 분당구 경부고속도로 409삼평동"); + modelAndView.addObject("data_5", "광주광역시(동구 계림동)"); + modelAndView.addObject("data_6", "20110812"); + modelAndView.addObject("data_7", "전문분야"); + + //modelAndView.addObject("path", "http://119.193.215.98:9989/offedu/visitEdu/usr/publish/images/common/ci.png"); + modelAndView.addObject("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId=FILE_000000000000463"); + + + modelAndView.addObject("data_d", "2023년05월28일"); + + //////////////////////////////////////////////성인 강사 정보 + String s_user_id = request.getParameter("p_instrId"); + VEInstrDetailVO vEInstrDetailVO = new VEInstrDetailVO(); + + vEInstrDetailVO.setUserId(s_user_id); + vEInstrDetailVO.setInstrDiv("20"); + vEInstrDetailVO.setUseYn("Y"); + VEInstrDetailVO info = vEInstrDetailService.selectDetail(vEInstrDetailVO); + + // 강사 정보 select + info = egovCryptoUtil.decryptVEInstrDetailVO(info); + + + modelAndView.addObject("data_t", "강사정보"); + + modelAndView.addObject("data_1", info.getInstrNm()); + modelAndView.addObject("data_2", info.getPhone()); + modelAndView.addObject("data_3", info.getEmail()); + modelAndView.addObject("data_4", info.getAddr()); + modelAndView.addObject("data_5", info.getRsdne()); + modelAndView.addObject("data_6", info.getdBirth()); + modelAndView.addObject("data_7", info.getPrfsnFld()); + + //modelAndView.addObject("path", "http://119.193.215.98:9989/offedu/visitEdu/usr/publish/images/common/ci.png"); + //modelAndView.addObject("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId=FILE_000000000000463"); + modelAndView.addObject("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+info.getPhtAtchFileId()); + + + modelAndView.addObject("data_d", "2023년05월28일"); + + /* + modelAndView.addObject("data_t", "기소유예이수증"); + + modelAndView.addObject("data_1", vEACmpltCrtfcVO.getEduCmpltCrtfcNmbr()); + modelAndView.addObject("data_2", vEACmpltCrtfcVO.getMberNm()); + modelAndView.addObject("data_3", vEACmpltCrtfcVO.getBirthDay()); + modelAndView.addObject("data_4", vEACmpltCrtfcVO.getPrcsDiv()); + modelAndView.addObject("data_5", vEACmpltCrtfcVO.getPrcsNm()); + modelAndView.addObject("data_6", vEACmpltCrtfcVO.getMberNm()); + modelAndView.addObject("data_7", vEACmpltCrtfcVO.getEduStrtPnttm()+"~"+vEACmpltCrtfcVO.getEduDdlnPnttm()); + + String s_rd = vEACmpltCrtfcVO.getRd(); + s_rd = s_rd.substring(0,4)+"년"+s_rd.substring(4,6)+"년"+s_rd.substring(6,8); + System.out.println(s_rd); + System.out.println(s_rd); + + modelAndView.addObject("data_d", s_rd); + */ + + return modelAndView; + + } +} diff --git a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java index 03e8c9d0..98483d78 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -28,7 +28,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.adv.tngr.stngInfo.service.VEACmpltCrtfcMixService; -import kcc.ve.adv.tngr.stngInfo.service.VEACmpltCrtfcVO; import kcc.ve.aplct.adultVisitEdu.eduAplct.service.EduAplctAdultService; import kcc.ve.aplct.fndtnEnhanceTrn.service.FndtnEnhanceTrnService; import kcc.ve.cmm.VeConstants; @@ -515,135 +514,6 @@ public class FndtnEnhanceTrnController { } - /** - * 교육 list select - * viewer.openFile('cmplt_crtfc_20231030.mrd' - * , '/rf [http://192.168.0.59:3080/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do - * ?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']'); - */ - @RequestMapping("/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do") - public ModelAndView fndtnEduAplctCmpltCrtfcAjax( - @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO - , ModelMap model - , HttpServletRequest request - ) throws Exception { - - ModelAndView modelAndView = new ModelAndView(); - modelAndView.setViewName("jsonView"); - - System.out.println("----------------"); - System.out.println(request.getParameter("prcsAplctPrdOrd")); - System.out.println(request.getParameter("eduAplctOrd")); - System.out.println("----------------"); - - VEACmpltCrtfcVO vEACmpltCrtfcVO = new VEACmpltCrtfcVO(); - vEACmpltCrtfcVO.setPrcsAplctPrdOrd(request.getParameter("prcsAplctPrdOrd")); - vEACmpltCrtfcVO.setEduAplctOrd(request.getParameter("eduAplctOrd")); - - vEACmpltCrtfcVO = vEACmpltCrtfcMixService.selectDetail_CC_1(vEACmpltCrtfcVO); - - vEACmpltCrtfcVO.setMberNm(egovCryptoUtil.decrypt(vEACmpltCrtfcVO.getMberNm())); - - /* - modelAndView.addObject("data_t", "교육연수이수증X"); - - modelAndView.addObject("data_1", "허은성"); - modelAndView.addObject("data_2", "허은성"); - modelAndView.addObject("data_3", "1986-08-02"); - modelAndView.addObject("data_4", "직무연수"); - modelAndView.addObject("data_5", "선율과 함꼐하는 저작권 여행"); - modelAndView.addObject("data_6", "총15시간(1학점)"); - modelAndView.addObject("data_7", "2023년5월15일~2023년05월26일"); - - modelAndView.addObject("data_d", "2023년05월28일"); - */ - - modelAndView.addObject("data_t", "교육연수이수증"); - - modelAndView.addObject("data_1", vEACmpltCrtfcVO.getEduCmpltCrtfcNmbr()); - modelAndView.addObject("data_2", vEACmpltCrtfcVO.getMberNm()); - modelAndView.addObject("data_3", vEACmpltCrtfcVO.getBirthDay()); - modelAndView.addObject("data_4", vEACmpltCrtfcVO.getPrcsDiv()); - modelAndView.addObject("data_5", vEACmpltCrtfcVO.getPrcsNm()); - modelAndView.addObject("data_6", vEACmpltCrtfcVO.getMberNm()); - modelAndView.addObject("data_7", vEACmpltCrtfcVO.getEduStrtPnttm()+"~"+vEACmpltCrtfcVO.getEduDdlnPnttm()); - - String s_rd = vEACmpltCrtfcVO.getRd(); - s_rd = s_rd.substring(0,4)+"년"+s_rd.substring(4,6)+"년"+s_rd.substring(6,8); - System.out.println(s_rd); - System.out.println(s_rd); - - modelAndView.addObject("data_d", s_rd); - - return modelAndView; - - } - - - /** - * 기소유예 이수증 - * viewer.openFile('cmplt_crtfc_20231030.mrd' - * , '/rf [http://192.168.0.59:3080/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do - * ?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']'); - */ - @RequestMapping("/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctCmpltCrtfcAjax.do") - public ModelAndView sspnIdtmtEduAplctCmpltCrtfcAjax( - @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO - , ModelMap model - , HttpServletRequest request - ) throws Exception { - - ModelAndView modelAndView = new ModelAndView(); - modelAndView.setViewName("jsonView"); - - System.out.println("----------------"); - System.out.println(request.getParameter("prcsAplctPrdOrd")); - System.out.println(request.getParameter("eduAplctOrd")); - System.out.println("----------------"); - - VEACmpltCrtfcVO vEACmpltCrtfcVO = new VEACmpltCrtfcVO(); - vEACmpltCrtfcVO.setPrcsAplctPrdOrd(request.getParameter("prcsAplctPrdOrd")); - vEACmpltCrtfcVO.setEduAplctOrd(request.getParameter("eduAplctOrd")); - - vEACmpltCrtfcVO = vEACmpltCrtfcMixService.selectDetail_CC_1(vEACmpltCrtfcVO); - - vEACmpltCrtfcVO.setMberNm(egovCryptoUtil.decrypt(vEACmpltCrtfcVO.getMberNm())); - - /* - modelAndView.addObject("data_t", "교육연수이수증X"); - - modelAndView.addObject("data_1", "허은성"); - modelAndView.addObject("data_2", "허은성"); - modelAndView.addObject("data_3", "1986-08-02"); - modelAndView.addObject("data_4", "직무연수"); - modelAndView.addObject("data_5", "선율과 함꼐하는 저작권 여행"); - modelAndView.addObject("data_6", "총15시간(1학점)"); - modelAndView.addObject("data_7", "2023년5월15일~2023년05월26일"); - - modelAndView.addObject("data_d", "2023년05월28일"); - */ - - modelAndView.addObject("data_t", "기소유예이수증"); - - modelAndView.addObject("data_1", vEACmpltCrtfcVO.getEduCmpltCrtfcNmbr()); - modelAndView.addObject("data_2", vEACmpltCrtfcVO.getMberNm()); - modelAndView.addObject("data_3", vEACmpltCrtfcVO.getBirthDay()); - modelAndView.addObject("data_4", vEACmpltCrtfcVO.getPrcsDiv()); - modelAndView.addObject("data_5", vEACmpltCrtfcVO.getPrcsNm()); - modelAndView.addObject("data_6", vEACmpltCrtfcVO.getMberNm()); - modelAndView.addObject("data_7", vEACmpltCrtfcVO.getEduStrtPnttm()+"~"+vEACmpltCrtfcVO.getEduDdlnPnttm()); - - String s_rd = vEACmpltCrtfcVO.getRd(); - s_rd = s_rd.substring(0,4)+"년"+s_rd.substring(4,6)+"년"+s_rd.substring(6,8); - System.out.println(s_rd); - System.out.println(s_rd); - - modelAndView.addObject("data_d", s_rd); - - return modelAndView; - - } - /** * 교육소개 임시페이지 */ diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java index e4cd9966..d5903fc4 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java @@ -29,6 +29,8 @@ import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrAsgnmVO; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrFeeAcmdtVO; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrFeeService; +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.VEPrcsDetailVO; @@ -80,6 +82,10 @@ public class VEAsgnmController { @Resource(name="vEAsgnmNotiService") private VEAsgnmNotiService vEAsgnmNotiService; + //교육과정신청 + @Resource(name = "vEEduMIXService") + private VEEduMIXService vEEduMIXService; + //청소년강사 강의 요청 목록 @RequestMapping("/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.do") public String instrAsgnmRqstList( @@ -555,6 +561,19 @@ public class VEAsgnmController { System.out.println("+++++++++++++++++++++++++++1111111++++99999++"); + + //동반강사 리스트 + VEEduChasiVO vEEduChasiVO = new VEEduChasiVO(); + vEEduChasiVO.setEduAplctOrd(vEInstrAsgnmVO.getEduAplctOrd()); + vEEduChasiVO.setEduChasiOrd(vEInstrAsgnmVO.getEduChasiOrd()); + List vEEduChasiCompanionVOList = vEEduMIXService.selectChasiCompanionList(vEEduChasiVO); + + vEEduChasiCompanionVOList = egovCryptoUtil.decryptVEEduChasiVOList(vEEduChasiCompanionVOList); + + model.addAttribute("vEEduChasiCompanionVOList", vEEduChasiCompanionVOList); + + + }catch(Exception ex) { ex.printStackTrace(); } 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 d79033e6..9a7911a4 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 @@ -35,6 +35,9 @@ public interface VEEduMIXService { List selectChasiList(VEEduChasiVO vEEduChasiVO) throws Exception; + //차시별 동반강사 리스트 + List selectChasiCompanionList(VEEduChasiVO vEEduChasiVO) throws Exception; + List selectAdultChasiList(VEEduChasiVO vEEduChasiVO) throws Exception; VEEduChasiVO selectChasiInfo(VEEduChasiVO vEEduChasiVO) 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 6235b9e8..00f0efdc 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 @@ -92,6 +92,13 @@ public class VEEduMIXDAO extends EgovAbstractDAO { List tlist = (List) list("VEEduMIXDAO.selectChasiList", vEEduChasiVO); return tlist; } + + //차시별 동반강사 리스트 + public List selectChasiCompanionList(VEEduChasiVO vEEduChasiVO) throws Exception { + @SuppressWarnings("unchecked") + List tlist = (List) list("VEEduMIXDAO.selectChasiCompanionList", vEEduChasiVO); + return tlist; + } public List selectAdultChasiList(VEEduChasiVO vEEduChasiVO) throws Exception { @SuppressWarnings("unchecked") 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 e5f29ddf..7342ac5a 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 @@ -80,6 +80,11 @@ public class VEEduMIXServiceImpl implements VEEduMIXService { return vEEduMIXDAO.selectChasiList(vEEduChasiVO); } + @Override + public List selectChasiCompanionList(VEEduChasiVO vEEduChasiVO) throws Exception { + return vEEduMIXDAO.selectChasiCompanionList(vEEduChasiVO); + } + @Override public List selectAdultChasiList(VEEduChasiVO vEEduChasiVO) throws Exception { return vEEduMIXDAO.selectAdultChasiList(vEEduChasiVO); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java index e85c93d3..c4319464 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java @@ -162,6 +162,8 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable { private String sigMemo; // 특이사항 메모 + private String hopeEduFld; // 희망교육분야 + private String day5cnt; private String day4cnt; private String day3cnt; @@ -853,5 +855,11 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable { public void setDay0cnt(String day0cnt) { this.day0cnt = day0cnt; } + public String getHopeEduFld() { + return hopeEduFld; + } + public void setHopeEduFld(String hopeEduFld) { + this.hopeEduFld = hopeEduFld; + } } 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 adbf19e1..3b0007e4 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 @@ -739,7 +739,7 @@ public class InstrPrflController { //현재 요청중인 내역 조회 - 요청 중 항목이 있으면 수정 요청 버튼 막기 vEInstrDetailVO.setFirstIndex(0); - vEInstrDetailVO.setSelectPagingListQuery("AND a.aprvl_cd = '10'"); + vEInstrDetailVO.setSelectPagingListQuery(" AND a.aprvl_cd = '10' AND NVL(a.use_yn,'N') = 'N' "); List vEInstrMdfyRqstList = vEInstrDetailService.selectPagingList(vEInstrDetailVO); model.addAttribute("vEInstrMdfyRqstList", vEInstrMdfyRqstList); diff --git a/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java b/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java index cd1c9870..a3368cd0 100644 --- a/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java +++ b/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java @@ -1543,10 +1543,20 @@ public class OprtnInstrAdultPrflContoller { //요청 내용의 상세만 조회 vEInstrDetailVO.setAprvlCd("10"); + vEInstrDetailVO.setSelectPagingListQuery(" AND NVL(a.use_yn,'N')='N' AND a.sbmt_yn='Y' "); VEInstrDetailVO vEInstrDetailVODetail = vEInstrMixService.selectMdfyRqstDetail(vEInstrDetailVO); vEInstrDetailVODetail = egovCryptoUtil.decryptVEInstrDetailVO(vEInstrDetailVODetail); model.addAttribute("info", vEInstrDetailVODetail); + + //현재 사용 내용의 상세만 조회 + vEInstrDetailVO.setAprvlCd(null); + vEInstrDetailVO.setInstrMdfyOrd(null); + vEInstrDetailVO.setSelectPagingListQuery(" AND NVL(a.use_yn,'N')='Y' AND a.sbmt_yn='Y' "); + VEInstrDetailVO vEInstrDetailVODetail_ori = vEInstrMixService.selectMdfyRqstDetail(vEInstrDetailVO); + vEInstrDetailVODetail_ori = egovCryptoUtil.decryptVEInstrDetailVO(vEInstrDetailVODetail_ori); + model.addAttribute("info_ori", vEInstrDetailVODetail_ori); + /*if(StringUtils.isNotBlank(vEInstrDetailVODetail.getPhtAtchFileId())){ FileVO fileVO = new FileVO(); fileVO.setAtchFileId(vEInstrDetailVODetail.getPhtAtchFileId()); 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 a135050d..48ed5dda 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 @@ -2214,10 +2214,21 @@ public class OprtnInstrTngrPrflContoller { //요청 내용의 상세만 조회 vEInstrDetailVO.setAprvlCd("10"); + vEInstrDetailVO.setSelectPagingListQuery(" AND NVL(a.use_yn,'N')='N' AND a.sbmt_yn='Y' "); VEInstrDetailVO vEInstrDetailVODetail = vEInstrMixService.selectMdfyRqstDetail(vEInstrDetailVO); vEInstrDetailVODetail = egovCryptoUtil.decryptVEInstrDetailVO(vEInstrDetailVODetail); model.addAttribute("info", vEInstrDetailVODetail); + + //현재 사용 내용의 상세만 조회 + vEInstrDetailVO.setAprvlCd(null); + vEInstrDetailVO.setInstrMdfyOrd(null); + vEInstrDetailVO.setSelectPagingListQuery(" AND NVL(a.use_yn,'N')='Y' AND a.sbmt_yn='Y' "); + VEInstrDetailVO vEInstrDetailVODetail_ori = vEInstrMixService.selectMdfyRqstDetail(vEInstrDetailVO); + vEInstrDetailVODetail_ori = egovCryptoUtil.decryptVEInstrDetailVO(vEInstrDetailVODetail_ori); + model.addAttribute("info_ori", vEInstrDetailVODetail_ori); + + /*if(StringUtils.isNotBlank(vEInstrDetailVODetail.getPhtAtchFileId())){ FileVO fileVO = new FileVO(); fileVO.setAtchFileId(vEInstrDetailVODetail.getPhtAtchFileId()); 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 fbcec0a0..f6ed1370 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 @@ -3410,6 +3410,50 @@ + + + diff --git a/src/main/webapp/WEB-INF/decorators.xml b/src/main/webapp/WEB-INF/decorators.xml index 17e9bb34..e7dbf45d 100644 --- a/src/main/webapp/WEB-INF/decorators.xml +++ b/src/main/webapp/WEB-INF/decorators.xml @@ -44,6 +44,7 @@ */oprtn/cmm/rejectPopup.jsp */oprtn/comm/popup/** */ve/oprtn/instr/adultVisitEdu/popup/instrRsdnePopup.do + */ve/oprtn/instr/adultVisitEdu/instrInfo/instrMdfyRqstPopup.do 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 555a5299..33285f8b 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp @@ -159,7 +159,7 @@ function getYears(getYear){ //수정요청 팝업 function fncRqstPopup() { var pop = document.detailForm; - commonPopWindowopenForm("${pageContext.request.contextPath}/ve/oprtn/instr/adultVisitEdu/instrInfo/instrMdfyRqstPopup.do", "900", "700", "instrMdfyRqstPopup", $('#detailForm')); + commonPopWindowopenForm("${pageContext.request.contextPath}/ve/oprtn/instr/adultVisitEdu/instrInfo/instrMdfyRqstPopup.do", "1300", "700", "instrMdfyRqstPopup", $('#detailForm')); } //강의설정 승인팝업 diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp index 7f8476a4..4846ee3d 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp @@ -73,7 +73,7 @@ popupForm.userId.value = userId popupForm.instrDiv.value = instrDiv popupForm.action = ""; - window.open("#", "_instrMdfyRqstPopup", "scrollbars = no, top=100px, left=100px, height=750px, width=950px"); + window.open("#", "_instrMdfyRqstPopup", "scrollbars = no, top=100px, left=100px, height=750px, width=1300px"); popupForm.target = "_instrMdfyRqstPopup"; popupForm.submit(); @@ -228,7 +228,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrMdfyRqstPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrMdfyRqstPopup.jsp index a28833c1..b6eea7d2 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrMdfyRqstPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrMdfyRqstPopup.jsp @@ -117,6 +117,132 @@
+ +
+ + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + + + + + + + --%> + + + + + <%-- + + + --%> + +
+

강사명

+
+ +
+
+
+ + 이미지를 넣어주세요 + + + ${info_ori.instrNm} 사진?atchFileId=' /> + +
+
+
+
+

연락처(핸드폰)

+
+

e-mail

+
+

주소

+
+ 우)   +
+

거주지

+
+

생년월일

+
+

소속

+
+

직위

+
+

위촉년도

+
+

구분

+
+

위촉구분

+
+

활동경력

+
+

전문분야

+
+

주요강의내용

+
+
+
+ + 기존>>>변경 + +
@@ -224,6 +350,10 @@ --%>
+
+
@@ -237,6 +367,7 @@
+ 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 b996009e..dce2a02c 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp @@ -179,7 +179,7 @@ //수정요청 팝업 function fncRqstPopup() { var pop = document.detailForm; - commonPopWindowopenForm("${pageContext.request.contextPath}/ve/oprtn/instr/tngrVisitEdu/popup/instrInfo/instrMdfyRqstPopup.do", "900", "700", "instrMdfyRqstPopup", $('#detailForm')); + commonPopWindowopenForm("${pageContext.request.contextPath}/ve/oprtn/instr/tngrVisitEdu/popup/instrInfo/instrMdfyRqstPopup.do", "1300", "700", "instrMdfyRqstPopup", $('#detailForm')); } function fncUpdate(){ 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 624d8415..7113f513 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngList.jsp @@ -72,7 +72,7 @@ popupForm.instrDiv.value = instrDiv popupForm.instrMdfyOrd.value = instrMdfyOrd ; popupForm.action = ""; - window.open("#", "_instrMdfyRqstPopup", "scrollbars = no, top=100px, left=100px, height=750px, width=950px"); + window.open("#", "_instrMdfyRqstPopup", "scrollbars = no, top=100px, left=100px, height=750px, width=1300px"); popupForm.target = "_instrMdfyRqstPopup"; popupForm.submit(); diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrMdfyRqstPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrMdfyRqstPopup.jsp index 783bdba2..a0e0acc2 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrMdfyRqstPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrMdfyRqstPopup.jsp @@ -107,6 +107,133 @@
+ +
+ + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

강사명

+
+ +
+
+
+ + 이미지를 넣어주세요 + + + ${info_ori.instrNm} 사진?atchFileId=' /> + +
+
+
+
+

연락처(핸드폰)

+
+

e-mail

+
+

주소

+
+ 우)   +
+

거주지

+
+

생년월일

+
+

최종학교

+
+

전공

+
+

위촉년도

+
+

구분

+
+

위촉구분

+
+

활동경력

+
+ +
+

주요강의내용

+
+ +
+
+ +
+ + 기존>>>변경 + + +
@@ -212,6 +339,12 @@
+
+ +
@@ -223,7 +356,9 @@
-
+ + + 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 2fb1382d..91bf146f 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 @@ -102,6 +102,9 @@ } function selectInstrInfo(instrId){ + + $('#p_instrId').val(instrId); + $.ajax({ type:"POST" ,url:"${pageContext.request.contextPath}/web/ve/aplct/adultVisitEdu/eduEnd/selectInstrInfo.do" @@ -167,6 +170,7 @@

강사명

+

원영현

@@ -327,6 +331,7 @@
+
@@ -705,4 +710,45 @@
- \ No newline at end of file + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp index d9e9b946..b9af714a 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp @@ -710,6 +710,70 @@ + + +
+
+

동반강사리스트

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호교육일자강사명차시학교(기관)명교육장소교육대상
+ + + ${list.eduHopeDt} + + ${list.instrNm} + + + ~ + (분) + + + + + + +
+
+