diff --git a/src/main/java/kcc/let/my/web/MyPageController.java b/src/main/java/kcc/let/my/web/MyPageController.java index 75020404..9edb1c16 100644 --- a/src/main/java/kcc/let/my/web/MyPageController.java +++ b/src/main/java/kcc/let/my/web/MyPageController.java @@ -102,7 +102,8 @@ public class MyPageController { * 청소년 진행목록 */ { - VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + /*진행/종료 건수에서 신청/완료 건수로 변경 > 진행/종료는 차시 기준. 신청은 신청 기준이라 조회쿼리 변경*/ + /*VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); // 청소년 // 사용자 교육신청 차시 리스트 @@ -138,14 +139,45 @@ public class MyPageController { model.addAttribute("tngrMap", tngrMap); - model.addAttribute("tngrList", tngrList); + model.addAttribute("tngrList", tngrList);*/ + + //신청목록 + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + vEEduAplctVO.setUserId(loginVO.getUniqId()); + vEEduAplctVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_10); + vEEduAplctVO.setRecordCountPerPage(10); + vEEduAplctVO.setFirstIndex(0); + List vEEduAplctVOList = vEEduMIXService.selectPagingApplyList(vEEduAplctVO); + int tngrAplctCnt = 0; + if(vEEduAplctVOList != null && !vEEduAplctVOList.isEmpty()) { + tngrAplctCnt = vEEduAplctVOList.get(0).getTotCnt(); + } + model.addAttribute("tngrAplctCnt", tngrAplctCnt); + + //완료목록 + VEEduChasiVO vEEduChasiVO = new VEEduChasiVO(); + vEEduChasiVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_10); + vEEduChasiVO.setAprvlCd(VeConstants.STATUS_CD_EDU_SELCT); + vEEduChasiVO.setUserId(loginVO.getUniqId()); + vEEduChasiVO.setSearchStartDt(vEEduAplctVO.getSearchStartDt()); + vEEduChasiVO.setSearchEndDt(vEEduAplctVO.getSearchEndDt()); + vEEduChasiVO.setRecordCountPerPage(10); + vEEduChasiVO.setFirstIndex(0); + List vEEduChasiVOList = vEEduMIXService.selectChasiList(vEEduChasiVO); + int tngrEndCnt = 0; + if(vEEduChasiVOList != null && !vEEduChasiVOList.isEmpty()) { + tngrEndCnt = vEEduChasiVOList.get(0).getTotCnt(); + } + model.addAttribute("tngrEndCnt", tngrEndCnt); + model.addAttribute("tngrList", vEEduChasiVOList); } /* * 성인 진행목록 */ { - VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + /*진행/종료 건수에서 신청/완료 건수로 변경 > 진행/종료는 차시 기준. 신청은 신청 기준이라 조회쿼리 변경*/ + /*VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); // 청소년 // 사용자 교육신청 차시 리스트 @@ -176,7 +208,34 @@ public class MyPageController { ); model.addAttribute("adultMap", adultMap); - model.addAttribute("adultList", adultList); + model.addAttribute("adultList", adultList);*/ + //신청목록 + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + vEEduAplctVO.setUserId(loginVO.getUniqId()); + vEEduAplctVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_20); + vEEduAplctVO.setRecordCountPerPage(10); + vEEduAplctVO.setFirstIndex(0); + List vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO); + int adultAplctCnt = 0; + if(vEEduAplctVOList != null && !vEEduAplctVOList.isEmpty()) { + adultAplctCnt = vEEduAplctVOList.get(0).getTotCnt(); + } + model.addAttribute("adultAplctCnt", adultAplctCnt); + + //완료목록 + VEEduChasiVO vEEduChasiVO = new VEEduChasiVO(); + vEEduChasiVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_20); + vEEduChasiVO.setAprvlCd(VeConstants.STATUS_CD_EDU_SELCT); + vEEduChasiVO.setUserId(loginVO.getUniqId()); + vEEduChasiVO.setRecordCountPerPage(10); + vEEduChasiVO.setFirstIndex(0); + List vEEduChasiVOList = vEEduMIXService.selectChasiList(vEEduChasiVO); + int adultEndCnt = 0; + if(vEEduChasiVOList != null && !vEEduChasiVOList.isEmpty()) { + adultEndCnt = vEEduChasiVOList.get(0).getTotCnt(); + } + model.addAttribute("adultEndCnt", adultEndCnt); + model.addAttribute("adultList", vEEduChasiVOList); } /* * 체험교실 diff --git a/src/main/java/kcc/let/uss/olp/qri/service/EgovQustnrRespondInfoService.java b/src/main/java/kcc/let/uss/olp/qri/service/EgovQustnrRespondInfoService.java index 05854aee..6c0d17e5 100644 --- a/src/main/java/kcc/let/uss/olp/qri/service/EgovQustnrRespondInfoService.java +++ b/src/main/java/kcc/let/uss/olp/qri/service/EgovQustnrRespondInfoService.java @@ -165,8 +165,11 @@ public interface EgovQustnrRespondInfoService { // 차수별 설문 조회 public List selectChasiSrvyList(QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception; - // 차수별 설문 조회 + // 차수별 설문 조회 - 상세 답변 정보 public List selectChasiSrvyList202312(QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception; + + // 차수별 설문 조회 - 상세 답변 정보(기반, 기소 용) + public List selectChasiSrvyFndtnList202312(QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception; public List selectChasiSrvyExcelList(QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception; diff --git a/src/main/java/kcc/let/uss/olp/qri/service/QustnrRespondInfoVO.java b/src/main/java/kcc/let/uss/olp/qri/service/QustnrRespondInfoVO.java index c82bdda5..a09afc5e 100644 --- a/src/main/java/kcc/let/uss/olp/qri/service/QustnrRespondInfoVO.java +++ b/src/main/java/kcc/let/uss/olp/qri/service/QustnrRespondInfoVO.java @@ -124,6 +124,13 @@ public class QustnrRespondInfoVO implements Serializable { private String qustnrNm = ""; //등록자명 private String qustnrBirth = ""; //등록자생년월일 + private String answer5 = ""; + private String answer4 = ""; + private String answer3 = ""; + private String answer2 = ""; + private String answer1 = ""; + + private String prcsAplctPrdOrd = ""; // 20231124 이호영 @@ -567,6 +574,78 @@ public class QustnrRespondInfoVO implements Serializable { public void setQustnrBirth(String qustnrBirth) { this.qustnrBirth = qustnrBirth; } + + + + public String getAnswer5() { + return answer5; + } + + + + public void setAnswer5(String answer5) { + this.answer5 = answer5; + } + + + + public String getAnswer4() { + return answer4; + } + + + + public void setAnswer4(String answer4) { + this.answer4 = answer4; + } + + + + public String getAnswer3() { + return answer3; + } + + + + public void setAnswer3(String answer3) { + this.answer3 = answer3; + } + + + + public String getAnswer2() { + return answer2; + } + + + + public void setAnswer2(String answer2) { + this.answer2 = answer2; + } + + + + public String getAnswer1() { + return answer1; + } + + + + public void setAnswer1(String answer1) { + this.answer1 = answer1; + } + + + + public String getPrcsAplctPrdOrd() { + return prcsAplctPrdOrd; + } + + + + public void setPrcsAplctPrdOrd(String prcsAplctPrdOrd) { + this.prcsAplctPrdOrd = prcsAplctPrdOrd; + } } diff --git a/src/main/java/kcc/let/uss/olp/qri/service/impl/EgovQustnrRespondInfoServiceImpl.java b/src/main/java/kcc/let/uss/olp/qri/service/impl/EgovQustnrRespondInfoServiceImpl.java index db012e95..c619b597 100644 --- a/src/main/java/kcc/let/uss/olp/qri/service/impl/EgovQustnrRespondInfoServiceImpl.java +++ b/src/main/java/kcc/let/uss/olp/qri/service/impl/EgovQustnrRespondInfoServiceImpl.java @@ -253,6 +253,11 @@ public class EgovQustnrRespondInfoServiceImpl extends EgovAbstractServiceImpl im return dao.selectChasiSrvyList202312(qustnrRespondInfoVO); } + @Override + public List selectChasiSrvyFndtnList202312(QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception { + return dao.selectChasiSrvyFndtnList202312(qustnrRespondInfoVO); + } + @Override public QustnrRespondInfoVO selectSiteIdQustnrTmplat(QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception { return dao.selectSiteIdQustnrTmplat(qustnrRespondInfoVO); diff --git a/src/main/java/kcc/let/uss/olp/qri/service/impl/QustnrRespondInfoDao.java b/src/main/java/kcc/let/uss/olp/qri/service/impl/QustnrRespondInfoDao.java index a0aa903e..b0c997df 100644 --- a/src/main/java/kcc/let/uss/olp/qri/service/impl/QustnrRespondInfoDao.java +++ b/src/main/java/kcc/let/uss/olp/qri/service/impl/QustnrRespondInfoDao.java @@ -207,6 +207,11 @@ public class QustnrRespondInfoDao extends EgovAbstractDAO { return (List) list("QustnrRespondInfo.selectChasiSrvyList202312", qustnrRespondInfoVO); } + @SuppressWarnings("unchecked") + public List selectChasiSrvyFndtnList202312(QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception{ + return (List) list("QustnrRespondInfo.selectChasiSrvyFndtnList202312", qustnrRespondInfoVO); + } + public QustnrRespondInfoVO selectSiteIdQustnrTmplat(QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception{ return (QustnrRespondInfoVO) select("QustnrRespondInfo.selectSiteIdQustnrTmplat", qustnrRespondInfoVO); } diff --git a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java index ac193583..6621a45c 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java @@ -165,71 +165,80 @@ public class CrownixAjaxController { 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())); - vEACmpltCrtfcVO.setInstrNm(egovCryptoUtil.decrypt(vEACmpltCrtfcVO.getInstrNm())); - - /* - 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_t", "<"+vEACmpltCrtfcVO.getEduCmpltCrtfcNmbr()+">"); - - modelAndView.addObject("data_1", vEACmpltCrtfcVO.getPrcsNm()); + try { - String s_birthDay = vEACmpltCrtfcVO.getBirthDay(); - - if (s_birthDay.length()==6) { - int i_birthDay = Integer.parseInt(s_birthDay.substring(0,2)); + VEACmpltCrtfcVO vEACmpltCrtfcVO = new VEACmpltCrtfcVO(); + vEACmpltCrtfcVO.setPrcsAplctPrdOrd(request.getParameter("prcsAplctPrdOrd")); + vEACmpltCrtfcVO.setEduAplctOrd(request.getParameter("eduAplctOrd")); - if (i_birthDay>23) { - s_birthDay = "19"+s_birthDay.substring(0,2)+"."+s_birthDay.substring(2,4)+"."+s_birthDay.substring(4,6); + vEACmpltCrtfcVO = vEACmpltCrtfcMixService.selectDetail_CC_1(vEACmpltCrtfcVO); + + vEACmpltCrtfcVO.setMberNm(egovCryptoUtil.decrypt(vEACmpltCrtfcVO.getMberNm())); + vEACmpltCrtfcVO.setInstrNm(egovCryptoUtil.decrypt(vEACmpltCrtfcVO.getInstrNm())); + + /* + 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_t", "<"+vEACmpltCrtfcVO.getEduCmpltCrtfcNmbr()+">"); + + modelAndView.addObject("data_1", vEACmpltCrtfcVO.getPrcsNm()); + + String s_birthDay = vEACmpltCrtfcVO.getBirthDay(); + + if (s_birthDay.length()==6) { + int i_birthDay = Integer.parseInt(s_birthDay.substring(0,2)); + + if (i_birthDay>23) { + s_birthDay = "19"+s_birthDay.substring(0,2)+"."+s_birthDay.substring(2,4)+"."+s_birthDay.substring(4,6); + }else { + s_birthDay = "20"+s_birthDay.substring(0,2)+"."+s_birthDay.substring(2,4)+"."+s_birthDay.substring(4,6); + } + } + + + modelAndView.addObject("data_2", vEACmpltCrtfcVO.getMberNm()+"("+s_birthDay+")"); + modelAndView.addObject("data_3", vEACmpltCrtfcVO.getEduStrtPnttm()+"~"+vEACmpltCrtfcVO.getEduDdlnPnttm()); + + //강사명1,2,3 + System.out.println("vEACmpltCrtfcVO.getDesc1()"); + System.out.println(vEACmpltCrtfcVO.getInstrNm()); + System.out.println(vEACmpltCrtfcVO.getDesc1()); + + + if ("".equals(vEACmpltCrtfcVO.getDesc1()) || vEACmpltCrtfcVO.getDesc1()==null) { + modelAndView.addObject("data_41", vEACmpltCrtfcVO.getInstrNm()); }else { - s_birthDay = "20"+s_birthDay.substring(0,2)+"."+s_birthDay.substring(2,4)+"."+s_birthDay.substring(4,6); - } - } - - - modelAndView.addObject("data_2", vEACmpltCrtfcVO.getMberNm()+"("+s_birthDay+")"); - modelAndView.addObject("data_3", vEACmpltCrtfcVO.getEduStrtPnttm()+"~"+vEACmpltCrtfcVO.getEduDdlnPnttm()); - - //강사명1,2,3 - - if ("".equals(vEACmpltCrtfcVO.getDesc1())) { - modelAndView.addObject("data_41", vEACmpltCrtfcVO.getInstrNm()); - }else { - //modelAndView.addObject("data_41", vEACmpltCrtfcVO.getInstrNm()); - modelAndView.addObject("data_41", vEACmpltCrtfcVO.getDesc1()); + //modelAndView.addObject("data_41", vEACmpltCrtfcVO.getInstrNm()); + modelAndView.addObject("data_41", vEACmpltCrtfcVO.getDesc1()); + + } - } - - modelAndView.addObject("data_42", vEACmpltCrtfcVO.getDesc2()); - modelAndView.addObject("data_43", vEACmpltCrtfcVO.getDesc3()); - modelAndView.addObject("data_44", vEACmpltCrtfcVO.getDesc4()); - - modelAndView.addObject("data_7", "위 사람은 한국저작권위원회에서 진행하는 '"+vEACmpltCrtfcVO.getPrcsNm()+"'을 수료 하였기에 위 교육이수증을 부여 합니다."); - - String s_rd = vEACmpltCrtfcVO.getRd(); - s_rd = s_rd.substring(0,4)+"년 "+s_rd.substring(4,6)+"월 "+s_rd.substring(6,8)+"일"; - - - modelAndView.addObject("data_d", s_rd); + modelAndView.addObject("data_42", vEACmpltCrtfcVO.getDesc2()); + modelAndView.addObject("data_43", vEACmpltCrtfcVO.getDesc3()); + modelAndView.addObject("data_44", vEACmpltCrtfcVO.getDesc4()); + + modelAndView.addObject("data_7", "위 사람은 한국저작권위원회에서 진행하는 '"+vEACmpltCrtfcVO.getPrcsNm()+"'을 수료 하였기에 위 교육이수증을 부여 합니다."); + + String s_rd = vEACmpltCrtfcVO.getRd(); + s_rd = s_rd.substring(0,4)+"년 "+s_rd.substring(4,6)+"월 "+s_rd.substring(6,8)+"일"; + modelAndView.addObject("data_d", s_rd); + + }catch(Exception ex) { + ex.printStackTrace(); + } + return modelAndView; 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 46b7be66..543af111 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 @@ -356,6 +356,80 @@ public class ScholInfoController { return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList"; } + /** + * 설문 팝업 리스트 - 실무, 기소 + */ + @RequestMapping("popup/qustnrFndtnPopList.do") + public String qustnrFndtnPopList( + @ModelAttribute("vEEduChasiVO") VEEduChasiVO vEEduChasiVO + , QustnrRespondInfoVO qustnrRespondInfoVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + String s_action = request.getParameter("action"); //insert or select + System.out.println("s_action"); + System.out.println(s_action); + System.out.println(vEEduChasiVO.getQustnrTmplatId()); + System.out.println(vEEduChasiVO.getQestnrId()); + System.out.println(vEEduChasiVO.getQustnrRespondId()); + + + System.out.println(qustnrRespondInfoVO.getQustnrTmplatId()); + System.out.println(qustnrRespondInfoVO.getQestnrId()); + System.out.println(qustnrRespondInfoVO.getQustnrRespondId()); + //차시 정보 + /* + try { + vEEduChasiVO.setInstrDiv(VeConstants.LCTR_DIV_CD_10); //10-청소년 강사, 20-성인강사 VE0001 + + VEEduChasiVO ChasiInfo = vEEduMIXService.selectChasiInfo(vEEduChasiVO); + ChasiInfo.setInstrNm(egovCryptoUtil.decrypt(ChasiInfo.getInstrNm())); + + ChasiInfo.setStrtTm(ChasiInfo.getStrtTm().substring(0,2)+":"+ChasiInfo.getStrtTm().substring(2,4)); + ChasiInfo.setEndTm(ChasiInfo.getEndTm().substring(0,2)+":"+ChasiInfo.getEndTm().substring(2,4)); + + model.addAttribute("chasiInfo", ChasiInfo); + + }catch(Exception ex) { + System.out.println("Exception vEEduAplctOnlnService.updateBulk"); + } +*/ + //참석 답변 정보 + try { + List chasiSrvyList = egovQustnrRespondInfoService.selectChasiSrvyFndtnList202312(qustnrRespondInfoVO); + //model.addAttribute("qestnrRespondent", chasiSrvyList.get(0).getQestnrRespondent()); + //model.addAttribute("qestnrParticipant", chasiSrvyList.get(0).getQestnrParticipant()); + System.out.println("chasiSrvyList.get(0).getPrcsAplctPrdOrd()"); + System.out.println(chasiSrvyList.get(0).getPrcsAplctPrdOrd()); + System.out.println(chasiSrvyList.get(0).getPrcsAplctPrdOrd()); + model.addAttribute("chasiSrvyList", chasiSrvyList); + model.addAttribute("chasiSrvyListCnt", chasiSrvyList.size()); + }catch(Exception ex) { + System.out.println("Exception vEEduAplctOnlnService.updateBulk"); + } + + + //설문 참여 정보 + /* + try { + model = qustnrCommonUtil._qustnrQesItm( + model + , VeConstants.LCTR_DIV_CD_10 //청소년 -10, 성인-20, ...VE0012 + , "10" //10-기본설문, 20-신청자설문, 30-강사설문 VEA012 + , "QTMPLA_0000000000001" + , vEALettnQestnrMIXService + , egovQustnrRespondInfoService + ); + + }catch(Exception ex) { + ex.printStackTrace(); + } + */ + + return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrFndtnPopList"; + } + /** * 설문 출력 팝업 리스트 */ 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 4b5680b9..1a51b9de 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -232,7 +232,8 @@ public class FndtnEnhanceTrnController { vEPrcsDetailVO.setPrcsDiv("10");// 과정구분 VE0015 10-산업종사자, 20-대학생, 30-공무원, 40-일반인, 50-청소년, 60-학부모 } */ - List vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlList(vEPrcsDetailVO); + vEPrcsDetailVO.setSiteId("50"); + List vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlQustnrList(vEPrcsDetailVO); // 현재 날짜를 가져옵니다. LocalDate currentDate = LocalDate.now(); @@ -420,9 +421,10 @@ public class FndtnEnhanceTrnController { if(StringUtil.isEmpty(vEPrcsDetailVO.getPrcsDiv())) { //vEPrcsDetailVO.setPrcsDiv("10");// 과정구분 VE0015 10-산업종사자, 20-대학생, 30-공무원, 40-일반인, 50-청소년, 60-학부모 + vEPrcsDetailVO.setSiteId("50"); } - List vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlList(vEPrcsDetailVO); + List vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlQustnrList(vEPrcsDetailVO); // 현재 날짜를 가져옵니다. diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java index c70393a9..429ea69d 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java @@ -215,7 +215,9 @@ public class SspnIdtmtController { vEPrcsDetailVO.setPrcsDiv("10");// 과정구분 VE0015 10-산업종사자, 20-대학생, 30-공무원, 40-일반인, 50-청소년, 60-학부모 } */ - List vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlList(vEPrcsDetailVO); + vEPrcsDetailVO.setSiteId("50"); + List vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlQustnrList(vEPrcsDetailVO); + //List vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlList(vEPrcsDetailVO); // 현재 날짜를 가져옵니다. LocalDate currentDate = LocalDate.now(); @@ -690,9 +692,11 @@ public class SspnIdtmtController { if(StringUtil.isEmpty(vEPrcsDetailVO.getPrcsDiv())) { //vEPrcsDetailVO.setPrcsDiv("10");// 과정구분 VE0015 10-산업종사자, 20-대학생, 30-공무원, 40-일반인, 50-청소년, 60-학부모 + vEPrcsDetailVO.setSiteId("60"); } - List vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlList(vEPrcsDetailVO); + //List vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlList(vEPrcsDetailVO); + List vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlQustnrList(vEPrcsDetailVO); // 현재 날짜를 가져옵니다. diff --git a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java index 47e1c39e..ba7ac518 100644 --- a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java +++ b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java @@ -1,5 +1,7 @@ package kcc.ve.aplct.tngrVisitEdu.eduEnd.web; +import java.util.ArrayList; +import java.util.Comparator; import java.util.List; import javax.annotation.Resource; @@ -25,6 +27,7 @@ import kcc.com.utl.user.service.CheckFileUtil; import kcc.com.utl.user.service.CheckLoginUtil; import kcc.com.utl.user.service.QustnrCommonUtil; import kcc.let.uat.uia.service.SsoLoginVO; +import kcc.let.uss.notify.service.NotifyManageService; import kcc.let.uss.olp.qri.service.EgovQustnrRespondInfoService; import kcc.let.uss.olp.qri.service.QustnrRespondInfoVO; import kcc.let.uss.olp.qrm.service.EgovQustnrRespondManageService; @@ -39,6 +42,7 @@ 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.VEPrcsAplctPrdService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsCntntVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsMIXService; @@ -147,6 +151,14 @@ public class EduEndTngrController { @Resource(name = "qustnrCommonUtil") private QustnrCommonUtil qustnrCommonUtil; + //과정차시 관리 + @Resource(name = "vEPrcsAplctPrdService") + private VEPrcsAplctPrdService vEPrcsAplctPrdService; + + //알림 서비스 + @Resource(name = "NotifyManageService") + private NotifyManageService notifyManageService; + /* // 교육신청 서비스단 @@ -846,6 +858,205 @@ public class EduEndTngrController { return modelAndView; } + /** + * 교육설문 등록 - 기반, 기소 - 개별 등록 + */ + @RequestMapping(value="/insertNewSrvyFndtnInfoEAAjax.do") + public ModelAndView insertNewSrvyFndtnInfoEAAjax( HttpServletRequest request + , ModelMap model + , VEEduAplctVO veEduAplctVO + , QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + try { + // + /* 로그인 체크는 하지 않는다. + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); + if (loginVO == null) { + modelAndView.addObject("result", "fail"); + modelAndView.addObject("msg", "로그인 해주세요."); + return modelAndView; + } + */ + + //로그인 처리==================================== + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + //step1.응답결과가 저장되어 있는지 확인 한다. + //없는 경우만 개별 설문 저장이 가능하다. + + //차시 정보 + + try { + + VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO(); + vEPrcsDetailVO.setLctrDivCd(veEduAplctVO.getSiteId()); + vEPrcsDetailVO.setSiteId(veEduAplctVO.getSiteId()); + + vEPrcsDetailVO.setEduAplctOrd(veEduAplctVO.getEduAplctOrd()); + + vEPrcsDetailVO.setUserId(loginVO.getUniqId()); + + List vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlQustnrDetailList(vEPrcsDetailVO); + + if (vEPrcsDetailVOList.size()<=0) { + //해당 설문 차시가 없으면 오류 발생 후 정지 + modelAndView.addObject("result", "fail1"); + return modelAndView; + } + + vEPrcsDetailVO = vEPrcsDetailVOList.get(0); + + if (vEPrcsDetailVO.getQestnrId10Cnt()!=null) { + //해당 설문 결과값이 있으면 오류 발생 후 정지 + modelAndView.addObject("result", "fail2"); + return modelAndView; + + } + + + }catch(Exception ex) { + ex.printStackTrace(); + System.out.println("Exception vEEduAplctOnlnService.updateBulk1"); + } + + //step2.응답결과값을 저장한다. + try { + int i_chasiSrvyListSize = Integer.parseInt(request.getParameter("qestmInfoSize")); + String[] a_qustnrQesitmId = request.getParameterValues("qustnrQesitmId"); + + qustnrRespondInfoVO.setFrstRegisterId(loginVO.getUniqId()); + + + System.out.println("a_qustnrQesitmId.length"); + System.out.println(a_qustnrQesitmId.length); + System.out.println(a_qustnrQesitmId.length); + + for (int i=0;i eduAplctOrdList = new ArrayList(); + eduAplctOrdList.add(vEEduAplctVO.getEduAplctOrd()); + vEEduAplctVO.setEduAplctOrdList(eduAplctOrdList); + notifyManageService.insertNotifyAprvlCd5060CmpltForUser( + loginVO + , vEEduAplctVO.getPrcsAplctPrdOrd() + , vEEduAplctVO.getLctrDivCd() + , vEEduAplctVO.getEduAplctOrdList() + , vEEduAplctVO.getAplctStateCd() + ); + + + + modelAndView.addObject("result", "success"); + } catch (Exception e) { + modelAndView.addObject("result", ""); + } + + + + + return modelAndView; + } + /** * 교육설문조사 등록 로직 */ @@ -1314,4 +1525,26 @@ public class EduEndTngrController { return p_paginationInfo; } + + private String cmpltChkAndMakeNmber(String lctrDivCd) throws Exception { + // 현재 년도 + String currentYear = String.valueOf(java.time.Year.now()); + + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + + vEEduAplctVO.setLctrDivCd(lctrDivCd); + + List vEEduAplctVOList = vEEduMIXService.selectEduCmpltCrtfcNmbrList(vEEduAplctVO); + + // 값이 있으면 있는 값에 최대값 구하고 + // 값이 없으면 초기값 설정 + String maxCrtfcNmbr = vEEduAplctVOList.stream() + .map(VEEduAplctVO::getEduCmpltCrtfcNmbr) + .max(Comparator.comparingInt(item -> Integer.parseInt(item.split("-")[1]))) + .orElse( currentYear + "-00000"); // 기본값 설정 + + int nextNumber = Integer.parseInt(maxCrtfcNmbr.split("-")[1]) + 1; + + return currentYear + "-" + String.format("%05d", nextNumber); + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java index f0676dc3..e705ce90 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java @@ -130,11 +130,14 @@ public class VEEduChasiVO extends ComDefaultVO implements Serializable { private String sumScore; //전체점수 private String avgScore; //평균점수 + private String siteId; //설문정보를 위해서 설문지의 대상값을 넣는다. VE0011 10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소 + private String siteIdCd; //사이트ID 구분 10-기본, 20-신청자, 30-강사 private String prcsAplctPrdOrd; //기간과정신청정보 private String eduTrgt; //대상 + private String eduAprvlCd; //교육 신청상태 public String getQustnrQesitmId10Cnt() { @@ -715,5 +718,17 @@ public class VEEduChasiVO extends ComDefaultVO implements Serializable { public void setEduTrgt(String eduTrgt) { this.eduTrgt = eduTrgt; } + public String getSiteId() { + return siteId; + } + public void setSiteId(String siteId) { + this.siteId = siteId; + } + public String getEduAprvlCd() { + return eduAprvlCd; + } + public void setEduAprvlCd(String eduAprvlCd) { + this.eduAprvlCd = eduAprvlCd; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryVO.java index 8d8a78e4..a87ea799 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryVO.java @@ -57,6 +57,10 @@ public class VEInstrDetailActvtHstryVO extends ComDefaultVO implements Serializa private String docuNmbrDp = ""; //문서번호-표시용 + private String cnt = ""; //횟수 + private String chasiSum = ""; //차시 합계 + + public String getInstrDetailActvtHstryOrd() { return instrDetailActvtHstryOrd; @@ -208,6 +212,18 @@ public class VEInstrDetailActvtHstryVO extends ComDefaultVO implements Serializa public void setDocuNmbrDp(String docuNmbrDp) { this.docuNmbrDp = docuNmbrDp; } + public String getCnt() { + return cnt; + } + public void setCnt(String cnt) { + this.cnt = cnt; + } + public String getChasiSum() { + return chasiSum; + } + public void setChasiSum(String chasiSum) { + this.chasiSum = chasiSum; + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java index d779eea6..8e8e72ef 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java @@ -1,65 +1,71 @@ -package kcc.ve.instr.tngrVisitEdu.prcsInfo.service; - -import java.util.List; -import java.util.Map; - -import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; -import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; - -public interface VEPrcsAplctPrdService { - - //C - void insert(VEPrcsDetailVO paramVO) throws Exception; - - //R - VEPrcsDetailVO selectDetail(VEPrcsDetailVO paramVO) throws Exception; - - //U - int update(VEPrcsDetailVO paramVO) throws Exception; - - //D - int delete(VEPrcsDetailVO paramVO) throws Exception; - - //L - List selectList(VEPrcsDetailVO paramVO) throws Exception; - - - List selectList4Fndth(VEPrcsDetailVO paramVO) throws Exception; - - - //Page List - List selectPagingList(VEPrcsDetailVO paramVO) throws Exception; - - //기반강화, 기소유예 - List selectPagingList4Fndth(VEPrcsDetailVO paramVO) throws Exception; - - //R - VEPrcsDetailVO selectDetailNewOne(VEPrcsDetailVO paramVO) throws Exception; - - VEPrcsDetailVO selectDetailNewOne4Fndth(VEPrcsDetailVO paramVO) throws Exception; - - List selectinstrAsgnmPopupPagingList(VEPrcsDetailVO vEPrcsDetailVO); - - List findByAprvlList(VEPrcsDetailVO vEPrcsDetailVO); - - Map findAllDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO); - - VEPrcsDetailVO selectDetailByOrd(VEPrcsDetailVO vEPrcsDetailVO) throws Exception; - - void updateOneColumn(VEPrcsDetailVO vEPrcsDetailVO) throws Exception; - - VEPrcsDetailVO findByCnclInfo(VEPrcsDetailVO vEPrcsDetailVO); - - void etcInsert(VEPrcsDetailVO vEPrcsDetailVO); - - VEPrcsDetailVO selectEtc(String prcsAplctPrdOrd); - - void updateEtc(VEPrcsDetailVO vEPrcsDetailVO); - - List selectSchduleManagerList(VEPrcsDetailVO vEPrcsDetailVO); - - Map findAllSspnldtmtDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO); - - List selectOneDayBeforeTrainingStartDate(VEPrcsDetailVO vEPrcsDetailVO); - -} +package kcc.ve.instr.tngrVisitEdu.prcsInfo.service; + +import java.util.List; +import java.util.Map; + +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; + +public interface VEPrcsAplctPrdService { + + //C + void insert(VEPrcsDetailVO paramVO) throws Exception; + + //R + VEPrcsDetailVO selectDetail(VEPrcsDetailVO paramVO) throws Exception; + + //U + int update(VEPrcsDetailVO paramVO) throws Exception; + + //D + int delete(VEPrcsDetailVO paramVO) throws Exception; + + //L + List selectList(VEPrcsDetailVO paramVO) throws Exception; + + + List selectList4Fndth(VEPrcsDetailVO paramVO) throws Exception; + + + //Page List + List selectPagingList(VEPrcsDetailVO paramVO) throws Exception; + + //기반강화, 기소유예 + List selectPagingList4Fndth(VEPrcsDetailVO paramVO) throws Exception; + + //R + VEPrcsDetailVO selectDetailNewOne(VEPrcsDetailVO paramVO) throws Exception; + + VEPrcsDetailVO selectDetailNewOne4Fndth(VEPrcsDetailVO paramVO) throws Exception; + + List selectinstrAsgnmPopupPagingList(VEPrcsDetailVO vEPrcsDetailVO); + + //신청목록-실무역량강화, 기소유예 old + List findByAprvlList(VEPrcsDetailVO vEPrcsDetailVO); + + //신청목록-실무역량강화, 기소유예 new -설문조사, 이수증 처리용 + List findByAprvlQustnrList(VEPrcsDetailVO vEPrcsDetailVO); + + //신청목록-실무역량강화, 기소유예 new -설문조사, 이수증 처리용 - 상세찾기용 + List findByAprvlQustnrDetailList(VEPrcsDetailVO vEPrcsDetailVO); + + Map findAllDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO); + + VEPrcsDetailVO selectDetailByOrd(VEPrcsDetailVO vEPrcsDetailVO) throws Exception; + + void updateOneColumn(VEPrcsDetailVO vEPrcsDetailVO) throws Exception; + + VEPrcsDetailVO findByCnclInfo(VEPrcsDetailVO vEPrcsDetailVO); + + void etcInsert(VEPrcsDetailVO vEPrcsDetailVO); + + VEPrcsDetailVO selectEtc(String prcsAplctPrdOrd); + + void updateEtc(VEPrcsDetailVO vEPrcsDetailVO); + + List selectSchduleManagerList(VEPrcsDetailVO vEPrcsDetailVO); + + Map findAllSspnldtmtDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO); + + List selectOneDayBeforeTrainingStartDate(VEPrcsDetailVO vEPrcsDetailVO); + +} diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java index b3268882..ece5ee21 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java @@ -204,7 +204,10 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { private String eduPrcsOrd; private String cmmNotifyOrd; // - + private String qestnrId10Cnt; + private String qestnrId20Cnt; + private String qestnrId30Cnt; + public String getEduPrcsOrd() { return eduPrcsOrd; @@ -992,6 +995,24 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { public void setPhone(String phone) { this.phone = phone; } + public String getQestnrId10Cnt() { + return qestnrId10Cnt; + } + public void setQestnrId10Cnt(String qestnrId10Cnt) { + this.qestnrId10Cnt = qestnrId10Cnt; + } + public String getQestnrId20Cnt() { + return qestnrId20Cnt; + } + public void setQestnrId20Cnt(String qestnrId20Cnt) { + this.qestnrId20Cnt = qestnrId20Cnt; + } + public String getQestnrId30Cnt() { + return qestnrId30Cnt; + } + public void setQestnrId30Cnt(String qestnrId30Cnt) { + this.qestnrId30Cnt = qestnrId30Cnt; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java index cf136268..97f2030b 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java @@ -1,136 +1,142 @@ -package kcc.ve.instr.tngrVisitEdu.prcsInfo.service.impl; - -import java.util.List; -import java.util.Map; - -import org.springframework.stereotype.Repository; - -import egovframework.rte.psl.dataaccess.EgovAbstractDAO; -import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; -import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; -import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmVO; -import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; - -@Repository("vEPrcsAplctPrdDAO") -public class VEPrcsAplctPrdDAO extends EgovAbstractDAO { - - /** - * 등록 - C - * @param VELctrDetailVO - * @throws Exception - */ - public void insert(VEPrcsDetailVO paramVO) throws Exception { - insert("VEPrcsAplctPrdDAO.insert", paramVO); - } - - /** - * 상세보기 - R - * @param CndtnTrgtInfoMngVO - * @return - * @throws Exception - */ - public VEPrcsDetailVO selectDetail(VEPrcsDetailVO paramVO) throws Exception { - return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetail", paramVO); - } - - /** - * 수정 - U - * @param CndtnTrgtInfoMngVO - * @return - * @throws Exception - */ - public int update(VEPrcsDetailVO paramVO) throws Exception { - return update("VEPrcsAplctPrdDAO.update", paramVO); - } - - /** - * 삭제 - D - * @param addrAgencyVO - * @return - * @throws Exception - */ - public int delete(VEPrcsDetailVO paramVO) throws Exception { - return delete("VEPrcsAplctPrdDAO.delete", paramVO); - } - - //L - public List selectList(VEPrcsDetailVO paramVO) throws Exception { - List tlist = (List) list("VEPrcsAplctPrdDAO.selectList", paramVO); - return tlist; - } - - public List selectList4Fndth(VEPrcsDetailVO paramVO) throws Exception { - List tlist = (List) list("VEPrcsAplctPrdDAO.selectList4Fndth", paramVO); - return tlist; - } - - - /** - * L - Page - * @param addrVO - * @return - * @throws Exception - */ - public List selectPagingList(VEPrcsDetailVO paramVO) throws Exception { - List tlist = (List) list("VEPrcsAplctPrdDAO.selectPagingList", paramVO); - return tlist; - } - - public List selectPagingList4Fndth(VEPrcsDetailVO paramVO) throws Exception { - List tlist = (List) list("VEPrcsAplctPrdDAO.selectPagingList4Fndth", paramVO); - return tlist; - } - - public VEPrcsDetailVO selectDetailNewOne(VEPrcsDetailVO paramVO) throws Exception { - return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetailNewOne", paramVO); - } - - public VEPrcsDetailVO selectDetailNewOne4Fndth(VEPrcsDetailVO paramVO) throws Exception { - return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetailNewOne4Fndth", paramVO); - } - - public List selectinstrAsgnmPopupPagingList(VEPrcsDetailVO vEPrcsDetailVO) { - return (List) list("VEPrcsAplctPrdDAO.selectinstrAsgnmPopupPagingList", vEPrcsDetailVO); - } - - public List findByAprvlList(VEPrcsDetailVO vEPrcsDetailVO) { - return (List) list("VEPrcsAplctPrdDAO.findByAprvlList", vEPrcsDetailVO); - } - - public Map findAllDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO) { - return (Map) select("VEPrcsAplctPrdDAO.findAllDashboardCnt", vEPrcsDetailVO); - } - - public Map findAllSspnldtmtDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO) { - return (Map) select("VEPrcsAplctPrdDAO.findAllSspnldtmtDashboardCnt", vEPrcsDetailVO); - } - - public VEPrcsDetailVO selectDetailByOrd(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { - return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetailByOrd", vEPrcsDetailVO); - } - - public VEPrcsDetailVO findByCnclInfo(VEPrcsDetailVO paramVO) { - return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.findByCnclInfo", paramVO); - } - - public void etcInsert(VEPrcsDetailVO vEPrcsDetailVO) { - insert("VEPrcsAplctPrdDAO.etcInsert", vEPrcsDetailVO); - } - - public VEPrcsDetailVO selectEtc(String prcsAplctPrdOrd) { - return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectEtc", prcsAplctPrdOrd); - } - - public void updateEtc(VEPrcsDetailVO vEPrcsDetailVO) { - update("VEPrcsAplctPrdDAO.updateEtc", vEPrcsDetailVO); - } - - public List selectSchduleManagerList(VEPrcsDetailVO vEPrcsDetailVO) { - return (List) list("VEPrcsAplctPrdDAO.selectSchduleManagerList", vEPrcsDetailVO); - } - - public List selectOneDayBeforeTrainingStartDate(VEPrcsDetailVO vEPrcsDetailVO) { - return (List) list("VEPrcsAplctPrdDAO.selectOneDayBeforeTrainingStartDate", vEPrcsDetailVO); - } - -} +package kcc.ve.instr.tngrVisitEdu.prcsInfo.service.impl; + +import java.util.List; +import java.util.Map; + +import org.springframework.stereotype.Repository; + +import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; + +@Repository("vEPrcsAplctPrdDAO") +public class VEPrcsAplctPrdDAO extends EgovAbstractDAO { + + /** + * 등록 - C + * @param VELctrDetailVO + * @throws Exception + */ + public void insert(VEPrcsDetailVO paramVO) throws Exception { + insert("VEPrcsAplctPrdDAO.insert", paramVO); + } + + /** + * 상세보기 - R + * @param CndtnTrgtInfoMngVO + * @return + * @throws Exception + */ + public VEPrcsDetailVO selectDetail(VEPrcsDetailVO paramVO) throws Exception { + return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetail", paramVO); + } + + /** + * 수정 - U + * @param CndtnTrgtInfoMngVO + * @return + * @throws Exception + */ + public int update(VEPrcsDetailVO paramVO) throws Exception { + return update("VEPrcsAplctPrdDAO.update", paramVO); + } + + /** + * 삭제 - D + * @param addrAgencyVO + * @return + * @throws Exception + */ + public int delete(VEPrcsDetailVO paramVO) throws Exception { + return delete("VEPrcsAplctPrdDAO.delete", paramVO); + } + + //L + public List selectList(VEPrcsDetailVO paramVO) throws Exception { + List tlist = (List) list("VEPrcsAplctPrdDAO.selectList", paramVO); + return tlist; + } + + public List selectList4Fndth(VEPrcsDetailVO paramVO) throws Exception { + List tlist = (List) list("VEPrcsAplctPrdDAO.selectList4Fndth", paramVO); + return tlist; + } + + + /** + * L - Page + * @param addrVO + * @return + * @throws Exception + */ + public List selectPagingList(VEPrcsDetailVO paramVO) throws Exception { + List tlist = (List) list("VEPrcsAplctPrdDAO.selectPagingList", paramVO); + return tlist; + } + + public List selectPagingList4Fndth(VEPrcsDetailVO paramVO) throws Exception { + List tlist = (List) list("VEPrcsAplctPrdDAO.selectPagingList4Fndth", paramVO); + return tlist; + } + + public VEPrcsDetailVO selectDetailNewOne(VEPrcsDetailVO paramVO) throws Exception { + return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetailNewOne", paramVO); + } + + public VEPrcsDetailVO selectDetailNewOne4Fndth(VEPrcsDetailVO paramVO) throws Exception { + return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetailNewOne4Fndth", paramVO); + } + + public List selectinstrAsgnmPopupPagingList(VEPrcsDetailVO vEPrcsDetailVO) { + return (List) list("VEPrcsAplctPrdDAO.selectinstrAsgnmPopupPagingList", vEPrcsDetailVO); + } + + public List findByAprvlList(VEPrcsDetailVO vEPrcsDetailVO) { + return (List) list("VEPrcsAplctPrdDAO.findByAprvlList", vEPrcsDetailVO); + } + + public List findByAprvlQustnrList(VEPrcsDetailVO vEPrcsDetailVO) { + return (List) list("VEPrcsAplctPrdDAO.findByAprvlQustnrList", vEPrcsDetailVO); + } + + public List findByAprvlQustnrDetailList(VEPrcsDetailVO vEPrcsDetailVO) { + return (List) list("VEPrcsAplctPrdDAO.findByAprvlQustnrDetailList", vEPrcsDetailVO); + } + + public Map findAllDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO) { + return (Map) select("VEPrcsAplctPrdDAO.findAllDashboardCnt", vEPrcsDetailVO); + } + + public Map findAllSspnldtmtDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO) { + return (Map) select("VEPrcsAplctPrdDAO.findAllSspnldtmtDashboardCnt", vEPrcsDetailVO); + } + + public VEPrcsDetailVO selectDetailByOrd(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { + return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetailByOrd", vEPrcsDetailVO); + } + + public VEPrcsDetailVO findByCnclInfo(VEPrcsDetailVO paramVO) { + return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.findByCnclInfo", paramVO); + } + + public void etcInsert(VEPrcsDetailVO vEPrcsDetailVO) { + insert("VEPrcsAplctPrdDAO.etcInsert", vEPrcsDetailVO); + } + + public VEPrcsDetailVO selectEtc(String prcsAplctPrdOrd) { + return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectEtc", prcsAplctPrdOrd); + } + + public void updateEtc(VEPrcsDetailVO vEPrcsDetailVO) { + update("VEPrcsAplctPrdDAO.updateEtc", vEPrcsDetailVO); + } + + public List selectSchduleManagerList(VEPrcsDetailVO vEPrcsDetailVO) { + return (List) list("VEPrcsAplctPrdDAO.selectSchduleManagerList", vEPrcsDetailVO); + } + + public List selectOneDayBeforeTrainingStartDate(VEPrcsDetailVO vEPrcsDetailVO) { + return (List) list("VEPrcsAplctPrdDAO.selectOneDayBeforeTrainingStartDate", vEPrcsDetailVO); + } + +} diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java index 90f5bb97..b3456fdc 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java @@ -1,147 +1,155 @@ -package kcc.ve.instr.tngrVisitEdu.prcsInfo.service.impl; - - -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import egovframework.rte.fdl.idgnr.EgovIdGnrService; -import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; -import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; -import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmVO; -import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsAplctPrdService; -import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; - -@Service("vEPrcsAplctPrdService") -public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService { - - - //과정신청기간순번 - @Resource(name="prcsAplctPrdGnrService") - private EgovIdGnrService prcsAplctPrdGnrService; - - //과정 - @Resource(name="vEPrcsAplctPrdDAO") - private VEPrcsAplctPrdDAO vEPrcsAplctPrdDAO; - - //과정 - @Resource(name="vEPrcsDAO") - private VEPrcsDAO vEPrcsDAO; - - - //C - public void insert(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { - - vEPrcsAplctPrdDAO.insert(vEPrcsDetailVO); - } - - //R - public VEPrcsDetailVO selectDetail(VEPrcsDetailVO paramVO) throws Exception { - return vEPrcsAplctPrdDAO.selectDetail(paramVO); - } - - //U - public int update(VEPrcsDetailVO paramVO) throws Exception{ -// vEPrcsAplctPrdDAO.update(paramVO); -// return vEPrcsDAO.update(paramVO); - return vEPrcsAplctPrdDAO.update(paramVO); - } - - //D - public int delete(VEPrcsDetailVO paramVO) throws Exception{ - return vEPrcsAplctPrdDAO.delete(paramVO); - } - - //List - public List selectList(VEPrcsDetailVO paramVO) throws Exception{ - return vEPrcsAplctPrdDAO.selectList(paramVO); - } - - public List selectList4Fndth(VEPrcsDetailVO paramVO) throws Exception{ - return vEPrcsAplctPrdDAO.selectList4Fndth(paramVO); - } - - //paging List - public List selectPagingList(VEPrcsDetailVO paramVO) throws Exception{ - return vEPrcsAplctPrdDAO.selectPagingList(paramVO); - } - - public List selectPagingList4Fndth(VEPrcsDetailVO paramVO) throws Exception{ - return vEPrcsAplctPrdDAO.selectPagingList4Fndth(paramVO); - } - - //R - public VEPrcsDetailVO selectDetailNewOne(VEPrcsDetailVO paramVO) throws Exception { - return vEPrcsAplctPrdDAO.selectDetailNewOne(paramVO); - } - - public VEPrcsDetailVO selectDetailNewOne4Fndth(VEPrcsDetailVO paramVO) throws Exception { - return vEPrcsAplctPrdDAO.selectDetailNewOne4Fndth(paramVO); - } - - public VEPrcsDetailVO findByCnclInfo(VEPrcsDetailVO paramVO) { - return vEPrcsAplctPrdDAO.findByCnclInfo(paramVO); - } - - @Override - public List selectinstrAsgnmPopupPagingList(VEPrcsDetailVO vEPrcsDetailVO) { - return vEPrcsAplctPrdDAO.selectinstrAsgnmPopupPagingList(vEPrcsDetailVO); - } - - @Override - public List findByAprvlList(VEPrcsDetailVO vEPrcsDetailVO) { - return vEPrcsAplctPrdDAO.findByAprvlList(vEPrcsDetailVO); - } - - @Override - public Map findAllDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO) { - return vEPrcsAplctPrdDAO.findAllDashboardCnt(vEPrcsDetailVO); - } - - @Override - public Map findAllSspnldtmtDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO) { - return vEPrcsAplctPrdDAO.findAllSspnldtmtDashboardCnt(vEPrcsDetailVO); - } - - public VEPrcsDetailVO selectDetailByOrd(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { - return vEPrcsAplctPrdDAO.selectDetailByOrd(vEPrcsDetailVO); - } - - public void updateOneColumn(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { - vEPrcsAplctPrdDAO.update(vEPrcsDetailVO); - } - - @Override - public void etcInsert(VEPrcsDetailVO vEPrcsDetailVO) { - vEPrcsAplctPrdDAO.etcInsert(vEPrcsDetailVO); - } - - @Override - public VEPrcsDetailVO selectEtc(String prcsAplctPrdOrd) { - return vEPrcsAplctPrdDAO.selectEtc(prcsAplctPrdOrd); - } - - @Override - public void updateEtc(VEPrcsDetailVO vEPrcsDetailVO) { - System.out.println(vEPrcsDetailVO.getPrpsCn()); -// System.out.println(vEPrcsDetailVO.getChrctCn()); -// System.out.println(vEPrcsDetailVO.getPrcsAplctPrdOrd()); - - vEPrcsAplctPrdDAO.updateEtc(vEPrcsDetailVO); - } - - @Override - public List selectSchduleManagerList(VEPrcsDetailVO vEPrcsDetailVO) { - return vEPrcsAplctPrdDAO.selectSchduleManagerList(vEPrcsDetailVO); - } - - @Override - public List selectOneDayBeforeTrainingStartDate(VEPrcsDetailVO vEPrcsDetailVO) { - return vEPrcsAplctPrdDAO.selectOneDayBeforeTrainingStartDate(vEPrcsDetailVO); - - } - -} +package kcc.ve.instr.tngrVisitEdu.prcsInfo.service.impl; + + +import java.util.List; +import java.util.Map; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + +import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsAplctPrdService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; + +@Service("vEPrcsAplctPrdService") +public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService { + + + //과정신청기간순번 + @Resource(name="prcsAplctPrdGnrService") + private EgovIdGnrService prcsAplctPrdGnrService; + + //과정 + @Resource(name="vEPrcsAplctPrdDAO") + private VEPrcsAplctPrdDAO vEPrcsAplctPrdDAO; + + //과정 + @Resource(name="vEPrcsDAO") + private VEPrcsDAO vEPrcsDAO; + + + //C + public void insert(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { + + vEPrcsAplctPrdDAO.insert(vEPrcsDetailVO); + } + + //R + public VEPrcsDetailVO selectDetail(VEPrcsDetailVO paramVO) throws Exception { + return vEPrcsAplctPrdDAO.selectDetail(paramVO); + } + + //U + public int update(VEPrcsDetailVO paramVO) throws Exception{ +// vEPrcsAplctPrdDAO.update(paramVO); +// return vEPrcsDAO.update(paramVO); + return vEPrcsAplctPrdDAO.update(paramVO); + } + + //D + public int delete(VEPrcsDetailVO paramVO) throws Exception{ + return vEPrcsAplctPrdDAO.delete(paramVO); + } + + //List + public List selectList(VEPrcsDetailVO paramVO) throws Exception{ + return vEPrcsAplctPrdDAO.selectList(paramVO); + } + + public List selectList4Fndth(VEPrcsDetailVO paramVO) throws Exception{ + return vEPrcsAplctPrdDAO.selectList4Fndth(paramVO); + } + + //paging List + public List selectPagingList(VEPrcsDetailVO paramVO) throws Exception{ + return vEPrcsAplctPrdDAO.selectPagingList(paramVO); + } + + public List selectPagingList4Fndth(VEPrcsDetailVO paramVO) throws Exception{ + return vEPrcsAplctPrdDAO.selectPagingList4Fndth(paramVO); + } + + //R + public VEPrcsDetailVO selectDetailNewOne(VEPrcsDetailVO paramVO) throws Exception { + return vEPrcsAplctPrdDAO.selectDetailNewOne(paramVO); + } + + public VEPrcsDetailVO selectDetailNewOne4Fndth(VEPrcsDetailVO paramVO) throws Exception { + return vEPrcsAplctPrdDAO.selectDetailNewOne4Fndth(paramVO); + } + + public VEPrcsDetailVO findByCnclInfo(VEPrcsDetailVO paramVO) { + return vEPrcsAplctPrdDAO.findByCnclInfo(paramVO); + } + + @Override + public List selectinstrAsgnmPopupPagingList(VEPrcsDetailVO vEPrcsDetailVO) { + return vEPrcsAplctPrdDAO.selectinstrAsgnmPopupPagingList(vEPrcsDetailVO); + } + + @Override + public List findByAprvlList(VEPrcsDetailVO vEPrcsDetailVO) { + return vEPrcsAplctPrdDAO.findByAprvlList(vEPrcsDetailVO); + } + + @Override + public List findByAprvlQustnrList(VEPrcsDetailVO vEPrcsDetailVO) { + return vEPrcsAplctPrdDAO.findByAprvlQustnrList(vEPrcsDetailVO); + } + + @Override + public List findByAprvlQustnrDetailList(VEPrcsDetailVO vEPrcsDetailVO) { + return vEPrcsAplctPrdDAO.findByAprvlQustnrDetailList(vEPrcsDetailVO); + } + + @Override + public Map findAllDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO) { + return vEPrcsAplctPrdDAO.findAllDashboardCnt(vEPrcsDetailVO); + } + + @Override + public Map findAllSspnldtmtDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO) { + return vEPrcsAplctPrdDAO.findAllSspnldtmtDashboardCnt(vEPrcsDetailVO); + } + + public VEPrcsDetailVO selectDetailByOrd(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { + return vEPrcsAplctPrdDAO.selectDetailByOrd(vEPrcsDetailVO); + } + + public void updateOneColumn(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { + vEPrcsAplctPrdDAO.update(vEPrcsDetailVO); + } + + @Override + public void etcInsert(VEPrcsDetailVO vEPrcsDetailVO) { + vEPrcsAplctPrdDAO.etcInsert(vEPrcsDetailVO); + } + + @Override + public VEPrcsDetailVO selectEtc(String prcsAplctPrdOrd) { + return vEPrcsAplctPrdDAO.selectEtc(prcsAplctPrdOrd); + } + + @Override + public void updateEtc(VEPrcsDetailVO vEPrcsDetailVO) { + System.out.println(vEPrcsDetailVO.getPrpsCn()); +// System.out.println(vEPrcsDetailVO.getChrctCn()); +// System.out.println(vEPrcsDetailVO.getPrcsAplctPrdOrd()); + + vEPrcsAplctPrdDAO.updateEtc(vEPrcsDetailVO); + } + + @Override + public List selectSchduleManagerList(VEPrcsDetailVO vEPrcsDetailVO) { + return vEPrcsAplctPrdDAO.selectSchduleManagerList(vEPrcsDetailVO); + } + + @Override + public List selectOneDayBeforeTrainingStartDate(VEPrcsDetailVO vEPrcsDetailVO) { + return vEPrcsAplctPrdDAO.selectOneDayBeforeTrainingStartDate(vEPrcsDetailVO); + + } + +} diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java index f7d2380c..91732f62 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java @@ -994,6 +994,8 @@ public class CndtnPrcsInfoMngController { // 이수 상태라면 if("20".equals(vEEduAplctVO.getAplctStateCd())) { vEEduAplctVO.setEduCmpltCrtfcNmbr(this.cmpltChkAndMakeNmber(vEEduAplctVO.getLctrDivCd())); + }else if("10".equals(vEEduAplctVO.getAplctStateCd())) { + vEEduAplctVO.setEduCmpltCrtfcNmbr("DEL"); } // 신청상세정보 상태값 update diff --git a/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Tibero.xml index 250d7284..1ce6a9d6 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Tibero.xml @@ -728,6 +728,102 @@ ORDER BY a.qestn_sn, A.QUSTNR_QESITM_ID + + 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 be253a6a..1064c782 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 @@ -884,7 +884,7 @@ - AND A.CHRG_NM LIKE '%' || #searchChrgNm# , '%') + AND A.CHRG_NM LIKE '%' || #searchChrgNm# || '%' @@ -3804,7 +3804,8 @@ , A.INSTT_NM AS InsttNm , A.hope_sbjct AS hopeSbjct , A.INSTT_DIV_CD AS insttDivCd - , A.EDU_SLCT_CD AS eduSlctCd + , A.EDU_SLCT_CD AS eduSlctCd + , A.APRVL_CD AS eduAprvlCd , B.EDU_CHASI_ORD AS eduChasiOrd /* , TO_CHAR(B.EDU_HOPE_DT,'YYYY.MM.DD') AS eduHopeDt @@ -6378,9 +6379,27 @@ VALUES , aplct_pnttm = SYSDATE , last_updusr_id = #lastUpdusrId# , last_updt_pnttm = SYSDATE - - , EDU_CMPLT_CRTFC_NMBR = #eduCmpltCrtfcNmbr# - + + + , EDU_CMPLT_CRTFC_NMBR = null + + + + + + , EDU_CMPLT_CRTFC_NMBR = ( + + SELECT NVL(a0.EDU_CMPLT_CRTFC_NMBR,#eduCmpltCrtfcNmbr#) + FROM vea_aplct_detail_info a0 + WHERE + a0.prcs_aplct_prd_ord = #prcsAplctPrdOrd# + AND a0.edu_aplct_ord = #eduAplctOrd# + + ) + + + + WHERE prcs_aplct_prd_ord = #prcsAplctPrdOrd# AND edu_aplct_ord = #eduAplctOrd# diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml index 6168c758..5fe96e69 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml @@ -133,15 +133,38 @@ TO_CHAR(a.state_pnttm, 'YYYY') ||'-'||a.docu_nmbr||'호' AS docuNmbrDp , b.INSTR_NM AS instrNm , + + , c.cnt + , c.chasiSum FROM a JOIN ve_instr_detail b ON a.user_id = b.user_id AND a.instr_detail_ord = b.instr_detail_ord - + left outer join + ( + + SELECT c.USER_ID AS userId + , count(*) AS cnt + , sum(b.chasi) AS chasiSum + FROM ve_edu_aplct a + , ve_edu_chasi b + , ve_edu_chasi_instr_asgnm c + WHERE a.EDU_APLCT_ORD =b.EDU_APLCT_ORD + AND b.EDU_APLCT_ORD =c.EDU_APLCT_ORD + AND b.EDU_CHASI_ORD =c.EDU_CHASI_ORD + AND a.aprvl_cd='60' + AND c.asgnm_aprvl_Cd='30' + GROUP BY c.USER_ID + + )c + on( + a.user_id=c.userId + ) WHERE 1=1 AND a.docu_nmbr IS not null + b.INSTR_NM = #searchKeyword# diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml index 680bc235..fcf76093 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml @@ -1063,10 +1063,12 @@ AND d.use_yn='Y' ) WHERE 1=1 + AND a.use_yn='Y' + AND a00.instrDiv =a.instr_div AND a00.userId =a.user_id - AND a00.instrDetailOrd=a.instr_detail_ord - AND userId IN + AND a00.instrDetailOrd=a.instr_detail_ord + AND a00.userId IN #userIdList[]# diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml index 7c7d5019..ff8da47b 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml @@ -649,7 +649,9 @@ LETTNQESTNRRSLTDETAIL lersltD WHERE lersltD.respond_id = a.USER_ID - AND a.edu_aplct_ord = lersltD.edu_aplct_ord ) THEN 1 + AND a.edu_aplct_ord = lersltD.edu_aplct_ord + AND i.qestnr_id_10 = lersltD.qestnr_id + ) THEN 1 ELSE 0 END AS qestRsltExists @@ -726,7 +728,7 @@ FROM LETTNQESTNRINFO a WHERE - a.SITE_ID = '10' + a.SITE_ID = #siteId# AND a.SITE_ID_CD IN ('10', '20', '30') AND TO_CHAR(SYSDATE, 'YYYY.MM.DD') BETWEEN NVL(a.qustnr_bgnde, @@ -775,7 +777,332 @@ + + + + + + @@ -207,13 +207,18 @@ - + - + --%> @@ -304,6 +312,7 @@ + ${resultInfo.frstRegistPnttm} (${resultInfo.siteIdCd}) diff --git a/src/main/webapp/WEB-INF/jsp/uss/olp/qqm/UserItnQustnrQestnManageRegist.jsp b/src/main/webapp/WEB-INF/jsp/uss/olp/qqm/UserItnQustnrQestnManageRegist.jsp index 36d1967c..ae8e6c42 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/olp/qqm/UserItnQustnrQestnManageRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/olp/qqm/UserItnQustnrQestnManageRegist.jsp @@ -120,6 +120,12 @@ function addRow(){ alert("질문유형이 만족도 평가에서는 문항을 추가 할 수 없습니다."); return ; } + + if (itemTable.rows.length*1>=5){ + alert("5문항까지만 추가가 가능합니다."); + return; + } + var oRow = itemTable.insertRow(); th = document.createElement('th'); th.innerHTML = itemTable.rows.length;; diff --git a/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp b/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp index 5ea4bc87..2d3c4b21 100644 --- a/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp @@ -19,6 +19,8 @@ <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> <%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + + + +
+ + + + +
+ +
+ + + + + + + +
+
+

설문 결과 등록

+
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
평가문항, 매우만족, 만족, 보통, 불만족, 매우 불만족 입력
평가문항
+ ${status1.count}) + + (최대선택건수 ${QestmInfo.mxmmChoiseCo}) + + + + + +
+ + + checked + + + > + ${QestmInfo.answer5} +
+ + + + checked + + + > + ${QestmInfo.answer4} +
+ + + + checked + + + > + ${QestmInfo.answer3} +
+ + + + checked + + + > + ${QestmInfo.answer2} +
+ + + + checked + + + > + ${QestmInfo.answer1} +
+
+
+ +
+
+ + + + + +
+
+
+
+ + + + +
+
+
+
+ + + + + + + +
+
+
+
+ + +
+
+
+
+ + + + + + + + + +
+
+
+
+
+
+
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 df73014e..4d4a0990 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 @@ -49,7 +49,7 @@ $(document).ready(function(){ } } - function linkPage(pageNo){ + function linkPageTop(pageNo){ var listForm = document.listForm ; listForm.pageIndex.value = pageNo ; listForm.action = ""; @@ -65,7 +65,7 @@ $(document).ready(function(){ function fncGoList(){ - linkPage(1); + linkPageTop(1); } function fncReset(thisObj){ @@ -277,7 +277,39 @@ $(document).ready(function(){ }); } - + //설문 팝업 + function fncQustnrList( + id //aplctOrd + , chId //chasiOrd + , p_site_id_cd //10,20,30 + , p_action //select, insert + , p_qustnrTmplatId //select, insert + , p_qestnrId //select, insert + , p_qustnrRespondId //select, insert + ) { + + paramObj = { + "eduAplctOrd" : id + ,"eduChasiOrd" : chId + ,"siteIdCd" : p_site_id_cd + ,"siteId" : "50" //설문정보를 위해서 설문지의 대상값을 넣는다. VE0011 10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소 + + ,"action" : p_action + + ,"qustnrTmplatId" : p_qustnrTmplatId + ,"qestnrId" : p_qestnrId + ,"qustnrRespondId" : p_qustnrRespondId + }; + + commonPopLayeropen( + "${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/qustnrFndtnPopList.do" + , 800 + , 700 + , paramObj + , "Y" + , "QustnrList" + ); + } @@ -375,33 +407,77 @@ $(document).ready(function(){ - - - - + + +<%-- --%> +<%-- --%> +<%-- --%> - - - +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> + + + + + + + + + + + + + + + + 대상설문없음 + + + + + + + + + - + + + + - + + + + - + - 교육완료 + 설문등록 후 발급 - - @@ -426,7 +502,7 @@ $(document).ready(function(){
- +
@@ -523,7 +599,7 @@ $(document).ready(function(){ 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+']' , {clientSidePdf: {embeddedFont: true}}); */ - //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+']'); + //viewer.openFile('cmplt_crtfc_20231030.mrd', '/rf [http://192.168.0.32:3080/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']'); viewer.openFile('cmplt_crtfc_20231030.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']'); } diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp index 64e825d4..c1e39de6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp @@ -185,6 +185,42 @@ }); } + + + //설문 팝업 + function fncQustnrList( + id //aplctOrd + , chId //chasiOrd + , p_site_id_cd //10,20,30 + , p_action //select, insert + , p_qustnrTmplatId //select, insert + , p_qestnrId //select, insert + , p_qustnrRespondId //select, insert + ) { + + paramObj = { + "eduAplctOrd" : id + ,"eduChasiOrd" : chId + ,"siteIdCd" : p_site_id_cd + ,"siteId" : "50" //설문정보를 위해서 설문지의 대상값을 넣는다. VE0011 10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소 + + ,"action" : p_action + + ,"qustnrTmplatId" : p_qustnrTmplatId + ,"qestnrId" : p_qestnrId + ,"qustnrRespondId" : p_qustnrRespondId + }; + + commonPopLayeropen( + //"${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/qustnrPopList.do" + "${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/qustnrFndtnPopList.do" + , 800 + , 700 + , paramObj + , "Y" + , "QustnrList" + ); + } @@ -255,29 +291,31 @@ - - - - - - - - - - - 해당설문없음 - - + + +<%-- --%> +<%-- --%> + + + + + +<%-- --%> +<%-- --%> +<%-- --%> + + + + + +<%-- --%> +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> @@ -293,20 +331,73 @@ <%-- --%> <%-- --%> - - - - - - - - 교육완료 + + + + + + + + + + + + + 대상설문없음 + + + + + + + + + - + + + + - + + + +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> + + + + + + + 설문등록 후 발급 + + + - + + + @@ -470,8 +561,7 @@ - - +
@@ -485,7 +575,11 @@
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp index c2bf5504..5aa470bb 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp @@ -107,6 +107,41 @@ form.submit(); } + + //설문 팝업 + function fncQustnrList( + id //aplctOrd + , chId //chasiOrd + , p_site_id_cd //10,20,30 + , p_action //select, insert + , p_qustnrTmplatId //select, insert + , p_qestnrId //select, insert + , p_qustnrRespondId //select, insert + ) { + + paramObj = { + "eduAplctOrd" : id + ,"eduChasiOrd" : chId + ,"siteIdCd" : p_site_id_cd + ,"siteId" : "60" //설문정보를 위해서 설문지의 대상값을 넣는다. VE0011 10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소 + + ,"action" : p_action + + ,"qustnrTmplatId" : p_qustnrTmplatId + ,"qestnrId" : p_qestnrId + ,"qustnrRespondId" : p_qustnrRespondId + }; + + commonPopLayeropen( + //"${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/qustnrPopList.do" + "${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/qustnrFndtnPopList.do" + , 800 + , 700 + , paramObj + , "Y" + , "QustnrList" + ); + } @@ -149,7 +184,7 @@ - +<%-- --%> @@ -157,7 +192,7 @@ 교육일자 신청결과 설문조사 - 이수증 + @@ -174,18 +209,59 @@ +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> + - - - - - 설문완료 + + + + + + + + + + + + + 대상설문없음 + + + + + + + + + - + + + + - - + + + 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 8aa09fdb..a98aa357 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 @@ -371,7 +371,40 @@ $(document).ready(function(){ } }); } - + + //설문 팝업 + function fncQustnrList( + id //aplctOrd + , chId //chasiOrd + , p_site_id_cd //10,20,30 + , p_action //select, insert + , p_qustnrTmplatId //select, insert + , p_qestnrId //select, insert + , p_qustnrRespondId //select, insert + ) { + + paramObj = { + "eduAplctOrd" : id + ,"eduChasiOrd" : chId + ,"siteIdCd" : p_site_id_cd + ,"siteId" : "60" //설문정보를 위해서 설문지의 대상값을 넣는다. VE0011 10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소 + + ,"action" : p_action + + ,"qustnrTmplatId" : p_qustnrTmplatId + ,"qestnrId" : p_qestnrId + ,"qustnrRespondId" : p_qustnrRespondId + }; + + commonPopLayeropen( + "${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/qustnrFndtnPopList.do" + , 800 + , 700 + , paramObj + , "Y" + , "QustnrList" + ); + } @@ -514,49 +547,62 @@ $(document).ready(function(){ list.aplctStateCd ne 30 list.aprvlCd ne 40 --> - - - - - - - - - - - - - - - - <%-- - - - - - 교육완료 - - - - - - --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> -<%-- --%> - - - + + + + + + + + + + + + + + 대상설문없음 + + + + + + + + + - + + + + + + + - + + +