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/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java index 0e271025..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 @@ -373,6 +373,7 @@ public class ScholInfoController { 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()); @@ -396,10 +397,14 @@ public class ScholInfoController { */ //참석 답변 정보 try { - List chasiSrvyList = egovQustnrRespondInfoService.selectChasiSrvyList202312(qustnrRespondInfoVO); - model.addAttribute("qestnrRespondent", chasiSrvyList.get(0).getQestnrRespondent()); - model.addAttribute("qestnrParticipant", chasiSrvyList.get(0).getQestnrParticipant()); + 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"); } 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 564c536f..e6c0b233 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,7 @@ public class FndtnEnhanceTrnController { vEPrcsDetailVO.setPrcsDiv("10");// 과정구분 VE0015 10-산업종사자, 20-대학생, 30-공무원, 40-일반인, 50-청소년, 60-학부모 } */ - List vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlList(vEPrcsDetailVO); + List vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlQustnrList(vEPrcsDetailVO); // 현재 날짜를 가져옵니다. LocalDate currentDate = LocalDate.now(); @@ -423,7 +423,7 @@ public class FndtnEnhanceTrnController { vEPrcsDetailVO.setSiteId("50"); } - 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/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 + + + + + + + + @@ -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/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrFndtnPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrFndtnPopList.jsp index a6c032cd..044fe766 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrFndtnPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrFndtnPopList.jsp @@ -84,6 +84,7 @@ } function replyCalculation(){ + /* var qestnrParticipant = $("#qestnrParticipant").val(); //참석자 수량 var qestnrRespondent = $("#qestnrRespondent").val(); //응답자 수량 @@ -108,14 +109,19 @@ var responseRateTxt = (Number(qestnrRespondent) / Number(qestnrParticipant)*Number(100)).toFixed(1); $("#responseRate").text(responseRateTxt + "%"); $("#noResponse").text(Number(qestnrParticipant) - Number(qestnrRespondent)); + */ } function popupSrvySendSubmit(){ + - var qestmSize = parseInt($("#qestmInfoSize").val()); //평가문항 수량 - var qestnrParticipant = parseInt($("#qestnrParticipant").val()); //참석자 수량 - var qestnrRespondent = parseInt($("#qestnrRespondent").val()); //응답자 수량 + var v_qestmSize = parseInt('${chasiSrvyListCnt}'); //평가문항 수량 + var v_sum = 0; + //var qestmSize = parseInt($("#qestmInfoSize").val()); //평가문항 수량 + //var qestnrParticipant = parseInt($("#qestnrParticipant").val()); //참석자 수량 + //var qestnrRespondent = parseInt($("#qestnrRespondent").val()); //응답자 수량 + /* if(qestnrParticipant == null || qestnrParticipant == ""){ alert("참석자 수량을 넣어주세요"); $("#qestnrParticipant").focus(); @@ -133,14 +139,21 @@ $("#qestnrRespondent").focus(); return } + */ - for(var i=0; i < qestmSize; i++){ - var verySatisfied = $("#verySatisfied_"+i).val(); - var satisfied = $("#satisfied_"+i).val(); - var neither = $("#neither_"+i).val(); - var dissatisfied = $("#dissatisfied_"+i).val(); - var veryDissatisfied = $("#veryDissatisfied_"+i).val(); + for(var i=0; i < v_qestmSize; i++){ + //var verySatisfied = $("#verySatisfied_"+i).val(); + //var satisfied = $("#satisfied_"+i).val(); + //var neither = $("#neither_"+i).val(); + //var dissatisfied = $("#dissatisfied_"+i).val(); + //var veryDissatisfied = $("#veryDissatisfied_"+i).val(); + + + var radioNumber = $("input:radio[name='resultList["+i+"].responseRadio']:checked").val(); // 체크된 value + + //alert(radioNumber); + /* if(verySatisfied == null || verySatisfied == ""){ alert((i+1)+"번 [매우만족] 만족도를 정확히 넣어주세요"); $("#verySatisfied_"+i).focus(); @@ -166,14 +179,28 @@ $("#veryDissatisfied_"+i).focus(); return } + */ - var sum = Number(verySatisfied) + Number(satisfied) + Number(neither) + Number(dissatisfied) + Number(veryDissatisfied); - - if(qestnrRespondent != sum ){ - alert((i+1)+"문항의 합계가 응답수량과 맞지 않습니다."); - $("#verySatisfied_"+i).focus(); - return + //var sum = Number(verySatisfied) + Number(satisfied) + Number(neither) + Number(dissatisfied) + Number(veryDissatisfied); + + radioNumber = Number(radioNumber); + + if (radioNumber){ + v_sum = v_sum + 1; } + + + } + + //alert(v_sum); + //alert(v_qestmSize); + + + + if(v_qestmSize != v_sum ){ + alert("문항의 합계가 응답수량과 맞지 않습니다."); + $("#verySatisfied_"+i).focus(); + return } if(confirm("설문결과를 등록 하시겠습니까?")){ @@ -182,7 +209,9 @@ $.ajax({ type:"POST" - ,url:"${pageContext.request.contextPath}/web/ve/aplct/tngrVisitEdu/eduEnd/insertNewSrvyInfoAjax.do" + //,url:"${pageContext.request.contextPath}/web/ve/aplct/tngrVisitEdu/eduEnd/insertNewSrvyInfoAjax.do" + ,url:"${pageContext.request.contextPath}/web/ve/aplct/tngrVisitEdu/eduEnd/insertNewSrvyFndtnInfoEAAjax.do" + ,data: data ,dataType:'json' ,async: false @@ -191,8 +220,9 @@ ,cache: false ,success:function(returnData){ if(returnData.result == 'success'){ - alert("설문결과가 등록 되었습니다."); - window.location.reload(); + //alert("설문결과가 등록 되었습니다."); + fn_statusChg(); + //window.location.reload(); }else if(returnData.result == 'fail'){ alert(returnData.msg); location.href="/web/user/login/ssoLogin.do?test=test"; @@ -204,6 +234,37 @@ }); } } + + // 기반 / 기소 공통 + function fn_statusChg(){ + var data = new FormData(document.getElementById("statusChgForm")); + + var url = "${pageContext.request.contextPath}/web/ve/aplct/tngrVisitEdu/eduEnd/updateAplctStateCdAjax.do"; + $.ajax({ + type:"POST", + url: url, + data: data, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success:function(returnData){ + if(returnData.result == "success"){ + alert("설문결과가 등록 되었습니다."); + //alert("변경되었습니다."); + // 새로고침 + window.location.reload(); + } + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + + //event.stopImmediatePropagation(); + + } $(document).ready(function(){ /* @@ -225,22 +286,31 @@ $(document).ready(function(){ }) +
+ + + + +
+
- - + + +