diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEACmpltCrtfcMixService.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEACmpltCrtfcMixService.java new file mode 100644 index 00000000..28825571 --- /dev/null +++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEACmpltCrtfcMixService.java @@ -0,0 +1,7 @@ +package kcc.ve.adv.tngr.stngInfo.service; + +public interface VEACmpltCrtfcMixService { + + //기반강화, 기소유예 이수증 정보 - 1 + VEACmpltCrtfcVO selectDetail_CC_1(VEACmpltCrtfcVO paramVO) throws Exception; // R +} diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEACmpltCrtfcVO.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEACmpltCrtfcVO.java new file mode 100644 index 00000000..def23da1 --- /dev/null +++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEACmpltCrtfcVO.java @@ -0,0 +1,100 @@ +package kcc.ve.adv.tngr.stngInfo.service; + +import java.io.Serializable; + +import kcc.com.cmm.ComDefaultVO; + + +public class VEACmpltCrtfcVO extends ComDefaultVO implements Serializable { + /* + * 이수증발급 + * + * */ + + //vea_lctr_yr_stng - 강의 년도 설정 + private String mberId; //회원ID + private String mberNm; //회원명 + private String birthDay; //생일 + private String eduStrtPnttm; //수업시작일 + private String eduDdlnPnttm; //수업종료일 + private String prcsNm; //과정명 + private String prcsDiv; //과정구분 + private String eduCmpltCrtfcNmbr; //이수번호 + + private String prcsAplctPrdOrd; //과정신청기간순번 + private String eduAplctOrd; //신청순번 + + private String rd; //신청일자 + + + private static final long serialVersionUID = 1L; + + public String getMberId() { + return mberId; + } + public void setMberId(String mberId) { + this.mberId = mberId; + } + public String getMberNm() { + return mberNm; + } + public void setMberNm(String mberNm) { + this.mberNm = mberNm; + } + public String getBirthDay() { + return birthDay; + } + public void setBirthDay(String birthDay) { + this.birthDay = birthDay; + } + public String getEduStrtPnttm() { + return eduStrtPnttm; + } + public void setEduStrtPnttm(String eduStrtPnttm) { + this.eduStrtPnttm = eduStrtPnttm; + } + public String getEduDdlnPnttm() { + return eduDdlnPnttm; + } + public void setEduDdlnPnttm(String eduDdlnPnttm) { + this.eduDdlnPnttm = eduDdlnPnttm; + } + public String getPrcsNm() { + return prcsNm; + } + public void setPrcsNm(String prcsNm) { + this.prcsNm = prcsNm; + } + public String getPrcsDiv() { + return prcsDiv; + } + public void setPrcsDiv(String prcsDiv) { + this.prcsDiv = prcsDiv; + } + public String getEduCmpltCrtfcNmbr() { + return eduCmpltCrtfcNmbr; + } + public void setEduCmpltCrtfcNmbr(String eduCmpltCrtfcNmbr) { + this.eduCmpltCrtfcNmbr = eduCmpltCrtfcNmbr; + } + + public String getPrcsAplctPrdOrd() { + return prcsAplctPrdOrd; + } + public void setPrcsAplctPrdOrd(String prcsAplctPrdOrd) { + this.prcsAplctPrdOrd = prcsAplctPrdOrd; + } + public String getEduAplctOrd() { + return eduAplctOrd; + } + public void setEduAplctOrd(String eduAplctOrd) { + this.eduAplctOrd = eduAplctOrd; + } + public String getRd() { + return rd; + } + public void setRd(String rd) { + this.rd = rd; + } + +} diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEACmpltCrtfcMixDAO.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEACmpltCrtfcMixDAO.java new file mode 100644 index 00000000..0853d4eb --- /dev/null +++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEACmpltCrtfcMixDAO.java @@ -0,0 +1,15 @@ +package kcc.ve.adv.tngr.stngInfo.service.impl; + +import org.springframework.stereotype.Repository; + +import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import kcc.ve.adv.tngr.stngInfo.service.VEACmpltCrtfcVO; + +@Repository("vEACmpltCrtfcMixDAO") +public class VEACmpltCrtfcMixDAO extends EgovAbstractDAO { + + //VEA_LCTR_YR_STNG - 강의년도설정 + public VEACmpltCrtfcVO selectDetail_CC_1(VEACmpltCrtfcVO paramVO) throws Exception { + return (VEACmpltCrtfcVO) select("VEACmpltCrtfcMixDAO.selectDetail_CC_1", paramVO); + } +} diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEACmpltCrtfcMixServiceImpl.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEACmpltCrtfcMixServiceImpl.java new file mode 100644 index 00000000..d112fc71 --- /dev/null +++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEACmpltCrtfcMixServiceImpl.java @@ -0,0 +1,22 @@ +package kcc.ve.adv.tngr.stngInfo.service.impl; + + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + +import kcc.ve.adv.tngr.stngInfo.service.VEACmpltCrtfcMixService; +import kcc.ve.adv.tngr.stngInfo.service.VEACmpltCrtfcVO; + +@Service("vEACmpltCrtfcMixService") +public class VEACmpltCrtfcMixServiceImpl implements VEACmpltCrtfcMixService { + + //과정 + @Resource(name="vEACmpltCrtfcMixDAO") + private VEACmpltCrtfcMixDAO vEACmpltCrtfcMixDAO; + + //R + public VEACmpltCrtfcVO selectDetail_CC_1(VEACmpltCrtfcVO paramVO) throws Exception { + return vEACmpltCrtfcMixDAO.selectDetail_CC_1(paramVO); + } +} 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 1d5acbbf..fefa0276 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -27,6 +27,8 @@ import kcc.com.utl.user.service.CheckFileUtil; 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; @@ -145,7 +147,10 @@ public class FndtnEnhanceTrnController { @Resource(name = "fndtnEnhanceTrnService") private FndtnEnhanceTrnService fndtnEnhanceTrnService; - + //강의설정 관리(MIX) + @Resource(name = "vEACmpltCrtfcMixService") + private VEACmpltCrtfcMixService vEACmpltCrtfcMixService; + /** * 대시보드 임시 */ @@ -507,40 +512,164 @@ public class FndtnEnhanceTrnController { } - - - private String dateChk(VEPrcsDetailVO vEPrcsDetailVO , LocalDate currentDate) { - - String returnDate = ""; - - String targetDateString = vEPrcsDetailVO.getEduDdlnPnttm(); - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd"); - - // 문자열로부터 LocalDate 객체를 생성합니다. - LocalDate targetDate = LocalDate.parse(targetDateString, formatter); - - - // 교육종료 날짜와 현재날짜 비교 - if (currentDate.isBefore(targetDate)) { //현재날짜가 종료날짜보다 이전이면 0 - returnDate = "0"; - } else if (currentDate.isAfter(targetDate)) { //현재날짜가 종료날짜 이후면 1 - returnDate = "1"; - } else { // 종료날짜와 같으면 2 - returnDate = "2"; - } - - return returnDate; - } - - + /** + * 교육 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; + + } ////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // // private function // // - + + private String dateChk(VEPrcsDetailVO vEPrcsDetailVO , LocalDate currentDate) { + + String returnDate = ""; + + String targetDateString = vEPrcsDetailVO.getEduDdlnPnttm(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd"); + + // 문자열로부터 LocalDate 객체를 생성합니다. + LocalDate targetDate = LocalDate.parse(targetDateString, formatter); + + + // 교육종료 날짜와 현재날짜 비교 + if (currentDate.isBefore(targetDate)) { //현재날짜가 종료날짜보다 이전이면 0 + returnDate = "0"; + } else if (currentDate.isAfter(targetDate)) { //현재날짜가 종료날짜 이후면 1 + returnDate = "1"; + } else { // 종료날짜와 같으면 2 + returnDate = "2"; + } + + return returnDate; + } + //페이징을 위한 처리 step1 - 페이징 기본 정보 설정 private PaginationInfo setPagingStep1( VEPrcsDetailVO p_vEPrcsDetailVO 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 8e259288..6a5ac1a2 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 @@ -215,7 +215,7 @@ public class EduAplctTngrController { model.addAttribute("list", vEPrcsDetailVOList); model.addAttribute("uniqId", loginVO.getUniqId()); - return "/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctRegSAmple"; + return "/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctRegSample"; } /** diff --git a/src/main/resources/egovframework/sqlmap/config/tibero/sql-map-config-tibero-ve.xml b/src/main/resources/egovframework/sqlmap/config/tibero/sql-map-config-tibero-ve.xml index d2d3bbf6..bd32dbaf 100644 --- a/src/main/resources/egovframework/sqlmap/config/tibero/sql-map-config-tibero-ve.xml +++ b/src/main/resources/egovframework/sqlmap/config/tibero/sql-map-config-tibero-ve.xml @@ -129,4 +129,6 @@ + + \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/ve/tngr/VEACmpltCrtfcMix_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/tngr/VEACmpltCrtfcMix_SQL_Tibero.xml new file mode 100644 index 00000000..7dea82de --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/ve/tngr/VEACmpltCrtfcMix_SQL_Tibero.xml @@ -0,0 +1,50 @@ + + + + + + + + + a.yr AS yr, + + a.psbl_tm_qntty AS psblTmQntty, + + TO_CHAR(a.frst_regist_pnttm,'YYYY-MM-DD') AS frstRegistPnttm, + a.frst_register_id AS frstRegisterId, + TO_CHAR(a.last_updt_pnttm,'YYYY-MM-DD') AS lastUpdtPnttm, + a.last_updusr_id AS lastUpdusrId + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp index 73d3d883..a9b6854e 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp @@ -499,6 +499,7 @@ + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp index 007c68d3..c4d9e023 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp @@ -120,7 +120,7 @@ $(document).ready(function(){ - +
@@ -194,8 +194,10 @@ $(document).ready(function(){ - - + + + @@ -223,4 +225,40 @@ $(document).ready(function(){
- \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp index 491d2425..3347ac0b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp @@ -196,6 +196,8 @@ $(document).ready(function(){ - + + @@ -223,4 +225,42 @@ $(document).ready(function(){ - \ No newline at end of file + + + + + + \ No newline at end of file