From 9145139408dd1623208f8734a454e3fa8a844d79 Mon Sep 17 00:00:00 2001 From: myname Date: Fri, 5 Jan 2024 18:20:00 +0900 Subject: [PATCH] =?UTF-8?q?2024-01-05=2018:19=20=EA=B8=B0=EC=86=8C?= =?UTF-8?q?=EC=9C=A0=EC=98=88=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/utl/fcc/service/EgovCryptoUtil.java | 49 + .../tngr/stngInfo/service/VEAStngService.java | 4 + .../stngInfo/service/impl/VEAStngDAO.java | 5 + .../service/impl/VEAStngServiceImpl.java | 5 + .../sspnIdtmt/service/SspnIdtmtService.java | 47 +- .../service/impl/SspnIdtmtServiceImpl.java | 62 ++ .../sspnIdtmt/web/SspnIdtmtController.java | 81 +- .../trgtMng/service/CndtnTrgtMngVO.java | 8 + .../trgtMng/service/impl/CndtnTrgtMngDAO.java | 274 ++--- .../trgtMng/web/CndtnTrgtMngController.java | 395 +++++-- .../web/AdvAreaLctrMngTngrController.java | 18 +- .../ve/cndtn/cndtnTrgtInfoMng_SQL_Cubrid.xml | 31 +- .../ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml | 72 +- .../sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml | 4 + .../VEInstrDetailActvtHstry_SQL_Tibero.xml | 2 + .../ve/tngr/VEALctrRndsStng_SQL_Tibero.xml | 25 + src/main/webapp/WEB-INF/decorators.xml | 1 + .../adultVisitEdu/popup/instrAsgnmPopup.jsp | 13 +- .../cndtnEduPrcsAplctCfnMngList.jsp | 3 +- .../cndtnEduPrcsAplctPrdMngList.jsp | 26 +- .../cndtnSspnIdtmt/cndtnEduPrcsMngDetail.jsp | 4 +- .../cndtnSspnIdtmt/cndtnEduPrcsMngList.jsp | 7 +- .../cndtnSspnIdtmt/eduInstrFeeMngList.jsp | 1 + .../oprtn/cndtnSspnIdtmt/trgtCmpltDetail.jsp | 976 ++++++++++-------- .../jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp | 365 ++++++- .../jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp | 88 +- .../oprtn/cndtnSspnIdtmt/trgtMngDetail.jsp | 576 +++++++++++ .../jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp | 114 +- .../fndthEnhanceTrn/fndthEduPrcsMngDetail.jsp | 1 + .../fndthEnhanceTrn/fndthEduPrcsMngList.jsp | 1 + .../popup/advRndsStngMngPopup.jsp | 8 +- .../web/ve/aplct/sspnIdtmt/eduAplctList.jsp | 45 +- .../aplct/sspnIdtmt/popup/eduAplctPopList.jsp | 211 ++++ 33 files changed, 2785 insertions(+), 737 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngDetail.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp diff --git a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java index cc215724..f384baa2 100644 --- a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java +++ b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java @@ -29,6 +29,7 @@ import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrDetailVO; import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrSttsVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; +import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO; import kcc.ve.oprtn.qestnr.service.VEAQestnrVO; /** @@ -531,6 +532,54 @@ public class EgovCryptoUtil { return p_schduleManageVO; } + + ////////////////////////////////////////////////// + // + // VO 별 암/복호화 + // + // 1.CndtnTrgtMngVO + // + + //CndtnTrgtMngVO - 암호화 + public CndtnTrgtMngVO encryptCndtnTrgtMngVOInfo(CndtnTrgtMngVO p_cndtnTrgtInfoMngVO){ + + if (!"".equals(p_cndtnTrgtInfoMngVO.getTrgtNm())) p_cndtnTrgtInfoMngVO.setTrgtNm(this.encrypt(p_cndtnTrgtInfoMngVO.getTrgtNm())); + if (!"".equals(p_cndtnTrgtInfoMngVO.getClphone())) p_cndtnTrgtInfoMngVO.setClphone(this.encrypt(p_cndtnTrgtInfoMngVO.getClphone())); + //if (!"".equals(p_cndtnTrgtInfoMngVO.getPrsctrNm())) p_cndtnTrgtInfoMngVO.setPrsctrNm(this.encrypt(p_cndtnTrgtInfoMngVO.getPrsctrNm())); + + return p_cndtnTrgtInfoMngVO; + } + + //CndtnTrgtMngVO - 복호화 + public CndtnTrgtMngVO decryptCndtnTrgtMngVOInfo(CndtnTrgtMngVO p_cndtnTrgtInfoMngVO){ + + if (!"".equals(p_cndtnTrgtInfoMngVO.getTrgtNm())) p_cndtnTrgtInfoMngVO.setTrgtNm(this.decrypt(p_cndtnTrgtInfoMngVO.getTrgtNm())); + if (!"".equals(p_cndtnTrgtInfoMngVO.getClphone())) p_cndtnTrgtInfoMngVO.setClphone(this.decrypt(p_cndtnTrgtInfoMngVO.getClphone())); + //if (!"".equals(p_cndtnTrgtInfoMngVO.getPrsctrNm())) p_cndtnTrgtInfoMngVO.setPrsctrNm(this.decrypt(p_cndtnTrgtInfoMngVO.getPrsctrNm())); + + return p_cndtnTrgtInfoMngVO; + } + + //CndtnTrgtMngVOList - 복호화 + public List decryptCndtnTrgtMngVOList(List p_cndtnTrgtInfoMngVOList){ + + for (int i=0;i selectList_VEALRS(VEAStngVO paramVO) throws Exception; // LIST List selectPagingList_VEALRS(VEAStngVO paramVO) throws Exception; // Page List + + //etc + //접수기간이 기존 기간과 일치하는지 확인 + List selectList_VEALRS_prdDupCheck(VEAStngVO paramVO) throws Exception; // 접수기간 중복 체크 //VEA_LCTR_PSBL_PRD_STNG - 강의기간설정 void insert_VEALPPS(VEAStngVO paramVO) throws Exception; // C diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngDAO.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngDAO.java index c8bc5794..53b27837 100644 --- a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngDAO.java +++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngDAO.java @@ -67,6 +67,11 @@ public class VEAStngDAO extends EgovAbstractDAO { return tlist; } + public List selectList_VEALRS_prdDupCheck(VEAStngVO paramVO) throws Exception { + List tlist = (List) list("VEALctrRndsStngDAO.selectListPrdDupCheck", paramVO); + return tlist; + } + //VEA_LCTR_PSBL_PRD_STNG - 강의기간설정 public void insert_VEALPPS(VEAStngVO paramVO) throws Exception { diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngServiceImpl.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngServiceImpl.java index a92ab244..e5f493e5 100644 --- a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngServiceImpl.java +++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngServiceImpl.java @@ -91,6 +91,11 @@ public class VEAStngServiceImpl implements VEAStngService { return vEAStngDAO.selectPagingList_VEALRS(paramVO); } + //List + public List selectList_VEALRS_prdDupCheck(VEAStngVO paramVO) throws Exception{ + return vEAStngDAO.selectList_VEALRS_prdDupCheck(paramVO); + } + //VEA_LCTR_PSBL_PRD_STNG - 강의기간설정 //C diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/SspnIdtmtService.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/SspnIdtmtService.java index 06cf6f77..5fba13ac 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/SspnIdtmtService.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/SspnIdtmtService.java @@ -1,21 +1,26 @@ -package kcc.ve.aplct.sspnIdtmt.service; - - -import org.springframework.web.servlet.ModelAndView; - -import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; -import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO; - -public interface SspnIdtmtService { - - void insertVeEduAplct(VEEduAplctVO paramVO); - - void updateAprvlCd(VEEduAplctVO paramVO) throws Exception; - - VEEduAplctVO findByAprvlCd(VEEduAplctVO vEEduAplctReqVO); - -// String findByTrgtNmAndDBirthAndEduStateCd(CndtnTrgtMngVO cndtnTrgtInfoMngVO); - ModelAndView findByTrgtNmAndDBirthAndEduStateCd(CndtnTrgtMngVO cndtnTrgtInfoMngVO); - - -} +package kcc.ve.aplct.sspnIdtmt.service; + + +import org.springframework.web.servlet.ModelAndView; + +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; +import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO; + +public interface SspnIdtmtService { + + void insertVeEduAplct(VEEduAplctVO paramVO); + + void updateAprvlCd(VEEduAplctVO paramVO) throws Exception; + + VEEduAplctVO findByAprvlCd(VEEduAplctVO vEEduAplctReqVO); + +// String findByTrgtNmAndDBirthAndEduStateCd(CndtnTrgtMngVO cndtnTrgtInfoMngVO); + //교육대상자 확인 + ModelAndView findByTrgtNmAndDBirthAndEduStateCd(CndtnTrgtMngVO cndtnTrgtInfoMngVO); + + //교육대상자 확인 - new + ModelAndView checkSspnIdtmt(CndtnTrgtMngVO cndtnTrgtInfoMngVO); + + + +} diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java index f94c44e9..0bd1e35f 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java @@ -1,5 +1,7 @@ package kcc.ve.aplct.sspnIdtmt.service.impl; +import java.util.List; + import javax.annotation.Resource; import org.apache.commons.lang3.StringUtils; @@ -84,6 +86,66 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService { modelAndView.addObject("next", next); + return modelAndView; + } + + @Override + public ModelAndView checkSspnIdtmt(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { + /* + * step1.신청 가능한 대상이 있는지 찾는다. + * 있으면 신청처리 but 2개 이상이면 선택하도록, 1개면 신청 처리 + * step2.대상이 없으면 기존 이력이 있는지 확인 + * 있으면 기존 사유 노출 + * step3.기존 이력이 없으면 관리자에게 문의 하도록 한다. + * */ + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + String result=""; + String msg=""; + String id=""; + String next=""; //? + try { + result=""; +// +// // step1.신청 가능한 대상이 있는지 찾는다. + List cndtnTrgtMngVOList = cndtnTrgtInfoMngDAO.checkSspnIdtmtStep1(cndtnTrgtInfoMngVO); + + if (cndtnTrgtMngVOList.size()>0) { + result = "success"; + msg = ""; + id = ""; + next = Integer.toString(cndtnTrgtMngVOList.size()); + } + + if(StringUtils.isNotEmpty(id)) { + msg = "이미 신청한 대상자 입니다."; + + // 신청한 대상자가 없으면 + // 신청하지 않은 대상자가 있는지 조회 + }else { + + id = cndtnTrgtInfoMngDAO.findByTrgtNmAndDBirthAndUserIdAndEduStateCd(cndtnTrgtInfoMngVO); + msg = "대상자가 없습니다."; + + if(StringUtils.isNotEmpty(id)) { + msg = "확인됐습니다."; + next = "Y"; + } + } + } catch (Exception e) { + result="fail"; + msg = "오류가 발생하였습니다 관리자에게 문의하세요. "; + e.printStackTrace(); + // TODO: handle exception + } + modelAndView.addObject("msg", msg); + modelAndView.addObject("result", result); + modelAndView.addObject("id", id); + modelAndView.addObject("next", next); + + return modelAndView; } } 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 c99e15ac..47a6e75a 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java @@ -27,6 +27,7 @@ import kcc.com.utl.user.service.CheckFileUtil; import kcc.com.utl.user.service.CheckLoginUtil; import kcc.let.uat.uia.service.SsoLoginVO; import kcc.let.uss.notify.service.NotifyManageService; +import kcc.let.uss.olp.qri.service.QustnrRespondInfoVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; import kcc.ve.aplct.adultVisitEdu.eduAplct.service.EduAplctAdultService; import kcc.ve.aplct.fndtnEnhanceTrn.service.FndtnEnhanceTrnService; @@ -36,6 +37,7 @@ import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctOnlnService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiService; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsAplctPrdService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; @@ -328,6 +330,82 @@ public class SspnIdtmtController { return "/web/ve/aplct/sspnIdtmt/eduAplctList"; } + /** + * 설문 팝업 리스트 - 실무, 기소 + */ + @RequestMapping("/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.do") + public String eduAplctPopList( + @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/sspnIdtmt/popup/eduAplctPopList"; + } + /** * 교육신청 목록 화면 */ @@ -609,7 +687,8 @@ public class SspnIdtmtController { modelAndView.addObject("result", "loginFail"); return modelAndView; } - return sspnIdtmtService.findByTrgtNmAndDBirthAndEduStateCd(cndtnTrgtInfoMngVO); + + return sspnIdtmtService.checkSspnIdtmt(cndtnTrgtInfoMngVO); /* try { diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java index f2377c29..fdadd58e 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java @@ -48,6 +48,8 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable { private List searchSelStatusList; private List sspnIdtmtTrgtOrdList; + private String eduAplctOrd; //신청한 교육 순번 + @@ -224,6 +226,12 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable { public void setSspnIdtmtTrgtOrdList(List sspnIdtmtTrgtOrdList) { this.sspnIdtmtTrgtOrdList = sspnIdtmtTrgtOrdList; } + public String getEduAplctOrd() { + return eduAplctOrd; + } + public void setEduAplctOrd(String eduAplctOrd) { + this.eduAplctOrd = eduAplctOrd; + } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java index 9da04cb8..4bfe6c4e 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java @@ -1,137 +1,137 @@ -package kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.impl; - -import java.util.List; - -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; -import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO; - -@Repository("cndtnTrgtInfoMngDAO") -public class CndtnTrgtMngDAO 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 selectPagingList(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { - return (List) list("cndtnTrgtInfoMngDAO.selectPagingList", cndtnTrgtInfoMngVO); - } - - public void insert(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { - insert("cndtnTrgtInfoMngDAO.insert", cndtnTrgtInfoMngVO); - } - - public CndtnTrgtMngVO selectDetail(CndtnTrgtMngVO cndtnTrgtInfoVO) { - return (CndtnTrgtMngVO) select("cndtnTrgtInfoMngDAO.selectDetail", cndtnTrgtInfoVO); - } - - public void update(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { - update("cndtnTrgtInfoMngDAO.update", cndtnTrgtInfoMngVO); - } - - public String findByTrgtNmAndDBirthAndEduStateCd(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { - return (String) select("cndtnTrgtInfoMngDAO.findByTrgtNmAndDBirthAndEduStateCd", cndtnTrgtInfoMngVO); - } - - public void updateUserId(CndtnTrgtMngVO cndtnTrgtMngVO) { - update("cndtnTrgtInfoMngDAO.updateUserId", cndtnTrgtMngVO); - } - - public String findByTrgtNmAndDBirthAndUserIdAndEduStateCd(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { - return (String) select("cndtnTrgtInfoMngDAO.findByTrgtNmAndDBirthAndUserIdAndEduStateCd", cndtnTrgtInfoMngVO); - } - - public int findCntreqNmber(String reqNmbrTemp) { - return (int) select("cndtnTrgtInfoMngDAO.findCntreqNmber", reqNmbrTemp); - } - - public void updateTrgtDuplAjax(CndtnTrgtMngVO cndtnTrgtMngVO) { - update("cndtnTrgtInfoMngDAO.updateTrgtDuplAjax", cndtnTrgtMngVO); - } - - public void updateDel(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { - update("cndtnTrgtInfoMngDAO.updateDel", cndtnTrgtInfoMngVO); - } - - -} +package kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.impl; + +import java.util.List; + +import org.springframework.stereotype.Repository; + +import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO; + +@Repository("cndtnTrgtInfoMngDAO") +public class CndtnTrgtMngDAO 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 selectPagingList(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { + return (List) list("cndtnTrgtInfoMngDAO.selectPagingList", cndtnTrgtInfoMngVO); + } + + public void insert(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { + insert("cndtnTrgtInfoMngDAO.insert", cndtnTrgtInfoMngVO); + } + + public CndtnTrgtMngVO selectDetail(CndtnTrgtMngVO cndtnTrgtInfoVO) { + return (CndtnTrgtMngVO) select("cndtnTrgtInfoMngDAO.selectDetail", cndtnTrgtInfoVO); + } + + public void update(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { + update("cndtnTrgtInfoMngDAO.update", cndtnTrgtInfoMngVO); + } + + public String findByTrgtNmAndDBirthAndEduStateCd(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { + return (String) select("cndtnTrgtInfoMngDAO.findByTrgtNmAndDBirthAndEduStateCd", cndtnTrgtInfoMngVO); + } + + public List checkSspnIdtmtStep1(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { + return (List) select("cndtnTrgtInfoMngDAO.checkSspnIdtmtStep1", cndtnTrgtInfoMngVO); + } + + public void updateUserId(CndtnTrgtMngVO cndtnTrgtMngVO) { + update("cndtnTrgtInfoMngDAO.updateUserId", cndtnTrgtMngVO); + } + + public String findByTrgtNmAndDBirthAndUserIdAndEduStateCd(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { + return (String) select("cndtnTrgtInfoMngDAO.findByTrgtNmAndDBirthAndUserIdAndEduStateCd", cndtnTrgtInfoMngVO); + } + + public int findCntreqNmber(String reqNmbrTemp) { + return (int) select("cndtnTrgtInfoMngDAO.findCntreqNmber", reqNmbrTemp); + } + + public void updateTrgtDuplAjax(CndtnTrgtMngVO cndtnTrgtMngVO) { + update("cndtnTrgtInfoMngDAO.updateTrgtDuplAjax", cndtnTrgtMngVO); + } + + public void updateDel(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { + update("cndtnTrgtInfoMngDAO.updateDel", cndtnTrgtInfoMngVO); + } + + +} diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java index 0e32b4ff..0938e8ae 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java @@ -192,10 +192,9 @@ public class CndtnTrgtMngController { cndtnTrgtInfoMngVO = this.setCndtnPagingStep2(cndtnTrgtInfoMngVO, paginationInfo); //검색 조회 + String selectCondition = ""; + if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeyword())){ - - - String selectCondition = ""; String searchStatus = cndtnTrgtInfoMngVO.getSearchStatus(); selectCondition = "AND a."+searchStatus+" LIKE CONCAT ('%', '" +cndtnTrgtInfoMngVO.getSearchKeyword() + "', '%')"; @@ -203,6 +202,20 @@ public class CndtnTrgtMngController { } + //성명검색 + if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordFrom())){ + selectCondition = " AND a.trgt_nm = '" +cndtnTrgtInfoMngVO.getSearchKeywordFrom() + "' "; + //cndtnTrgtInfoMngVO.setSearchQuery(selectCondition); + } + + //생년월일검색 + if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordTo())){ + selectCondition = " AND a.d_birth ='" +cndtnTrgtInfoMngVO.getSearchKeywordTo() + "' "; + + } + + cndtnTrgtInfoMngVO.setSearchQuery(selectCondition); + // List cndtnTrgtInfoMngVOList = cndtnTrgtInfoMngService.selectPagingList(cndtnTrgtInfoMngVO); List cndtnTrgtInfoMngVOList = null; try { @@ -219,6 +232,9 @@ public class CndtnTrgtMngController { model.addAttribute("paginationInfo", paginationInfo); + //복호화 + cndtnTrgtInfoMngVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoMngVOList); + //대상 리스트, 페이징 정보 전달 model.addAttribute("list", cndtnTrgtInfoMngVOList); @@ -284,11 +300,24 @@ public class CndtnTrgtMngController { String searchStatus = cndtnTrgtInfoMngVO.getSearchStatus(); // selectCondition = "AND a."+searchStatus+" LIKE CONCAT ('%', '" +cndtnTrgtInfoMngVO.getSearchKeyword() + "', '%')"; selectCondition = "AND a."+searchStatus+" LIKE '%" +cndtnTrgtInfoMngVO.getSearchKeyword() + "%'"; - cndtnTrgtInfoMngVO.setSearchQuery(selectCondition); + //cndtnTrgtInfoMngVO.setSearchQuery(selectCondition); } - - System.out.println("cndtnTrgtInfoMngVO.getSearchSelStatus() : "+ cndtnTrgtInfoMngVO.getSearchSelStatus()); - + + //성명검색 + if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordFrom())){ + selectCondition = " AND a.trgt_nm = '" +cndtnTrgtInfoMngVO.getSearchKeywordFrom() + "' "; + //cndtnTrgtInfoMngVO.setSearchQuery(selectCondition); + } + + //생년월일검색 + if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordTo())){ + selectCondition = " AND a.d_birth ='" +cndtnTrgtInfoMngVO.getSearchKeywordTo() + "' "; + + } + + cndtnTrgtInfoMngVO.setSearchQuery(selectCondition); + + if(StringUtils.isNotEmpty(cndtnTrgtInfoMngVO.getSearchSelStatus())) { cndtnTrgtInfoMngVO.setSearchSelStatusToList(cndtnTrgtInfoMngVO.getSearchSelStatus()); @@ -310,6 +339,9 @@ public class CndtnTrgtMngController { model.addAttribute("paginationInfo", paginationInfo); + //복호화 + cndtnTrgtInfoMngVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoMngVOList); + //대상 리스트, 페이징 정보 전달 model.addAttribute("list", cndtnTrgtInfoMngVOList); @@ -382,6 +414,8 @@ public class CndtnTrgtMngController { model.addAttribute("paginationInfo", paginationInfo); + //복호화 + cndtnTrgtInfoMngVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoMngVOList); //대상 리스트, 페이징 정보 전달 model.addAttribute("list", cndtnTrgtInfoMngVOList); @@ -482,7 +516,11 @@ public class CndtnTrgtMngController { cndtnTrgtInfoMngVO.setSspnIdtmtTrgtOrd(trgtOrdService.getNextStringId()); cndtnTrgtInfoMngVO.setAtchFileId(s_scholSealAtchFileId); //학교장직인 첨부파일 - cndtnTrgtInfoMngVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id + cndtnTrgtInfoMngVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id + + //암호화 + cndtnTrgtInfoMngVO = egovCryptoUtil.decryptCndtnTrgtMngVOInfo(cndtnTrgtInfoMngVO); + cndtnTrgtInfoMngService.insert(cndtnTrgtInfoMngVO); }catch(Exception ex) { @@ -624,11 +662,14 @@ public class CndtnTrgtMngController { cndtnTrgtInfoMngVO.setLastUpdusrId(loginVO.getUniqId()); //esntl_id + + //암호화 + cndtnTrgtInfoMngVO = egovCryptoUtil.encryptCndtnTrgtMngVOInfo(cndtnTrgtInfoMngVO); + + //수정 cndtnTrgtInfoMngService.update(cndtnTrgtInfoMngVO); - - modelAndView.addObject("result", "success"); return modelAndView; @@ -654,11 +695,14 @@ public class CndtnTrgtMngController { //과정 조회 CndtnTrgtMngVO cndtnTrgtInfoVO = cndtnTrgtInfoMngService.selectDetail(cndtnTrgtInfoMngVO); + + //복호화 + cndtnTrgtInfoVO = egovCryptoUtil.decryptCndtnTrgtMngVOInfo(cndtnTrgtInfoVO); model.addAttribute("info", cndtnTrgtInfoVO); - + + String userWork = this.getUserWork(request); model.addAttribute("userWork", userWork); - //파일 정보 가져오기 FileVO fileVO = new FileVO(); @@ -667,9 +711,110 @@ public class CndtnTrgtMngController { model.addAttribute("fileList", result); model.addAttribute("fileListCnt", result.size()); + + //병합대상자 검색 + //model = this._getMergeSearchList(model, cndtnTrgtInfoMngVO); + /* + List cndtnTrgtInfoMngVOList = new ArrayList(); + if(StringUtils.isNotEmpty(cndtnTrgtInfoMngVO.getTrgtNm()) || StringUtils.isNotEmpty(cndtnTrgtInfoMngVO.getDBirth())) + { + cndtnTrgtInfoMngVO.setFirstIndex(0); + cndtnTrgtInfoMngVO.setRecordCountPerPage(100000); +// String selectCondition = "AND PRCS_APLCT_PRD_ORD_CMPLT is not null "; +// cndtnTrgtInfoMngVO.setSearchQuery(selectCondition); + cndtnTrgtInfoMngVOList = cndtnTrgtInfoMngService.selectPagingList(cndtnTrgtInfoMngVO); + } + */ + List cndtnTrgtInfoMngVOList = this._getMergeSearchList(model, cndtnTrgtInfoMngVO); + + //복호화 + cndtnTrgtInfoMngVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoMngVOList); + + model.addAttribute("list", cndtnTrgtInfoMngVOList); + + + //병합 대상자 리스트 + /* + List cndtnTrgtInfoMergeVOList = new ArrayList(); + { + cndtnTrgtInfoMngVO.setTrgtNm(""); + + cndtnTrgtInfoMngVO.setFirstIndex(0); + cndtnTrgtInfoMngVO.setRecordCountPerPage(100000); + cndtnTrgtInfoMngVO.setSearchQuery(" AND a.prcs_aplct_prd_ord_cmplt='"+cndtnTrgtInfoMngVO.getSspnIdtmtTrgtOrd()+"' "); + cndtnTrgtInfoMergeVOList = cndtnTrgtInfoMngService.selectPagingList(cndtnTrgtInfoMngVO); + + } + */ + List cndtnTrgtInfoMergeVOList = this._getMergeList(cndtnTrgtInfoMngVO); + + //복호화 + cndtnTrgtInfoMergeVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoMergeVOList); + + model.addAttribute("listMerge", cndtnTrgtInfoMergeVOList); + + return "oprtn/cndtnSspnIdtmt/trgtDetail"; } + /** + * 대상자목록 + */ + @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/trgtMngDetail.do") + public String trgtMngDetail( + @ModelAttribute("cndtnTrgtInfoMngVO") CndtnTrgtMngVO cndtnTrgtInfoMngVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + //로그인 처리==================================== + + //과정 조회 + CndtnTrgtMngVO cndtnTrgtInfoVO = cndtnTrgtInfoMngService.selectDetail(cndtnTrgtInfoMngVO); + + //복호화 + cndtnTrgtInfoVO = egovCryptoUtil.decryptCndtnTrgtMngVOInfo(cndtnTrgtInfoVO); + model.addAttribute("info", cndtnTrgtInfoVO); + + + String userWork = this.getUserWork(request); + model.addAttribute("userWork", userWork); + + //파일 정보 가져오기 + FileVO fileVO = new FileVO(); + fileVO.setAtchFileId(cndtnTrgtInfoVO.getAtchFileId()); + List result = fileService.selectFileInfs(fileVO); + model.addAttribute("fileList", result); + model.addAttribute("fileListCnt", result.size()); + + + //병합대상자 검색 + List cndtnTrgtInfoMngVOList = this._getMergeSearchList(model, cndtnTrgtInfoMngVO); + + //복호화 + cndtnTrgtInfoMngVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoMngVOList); + + model.addAttribute("list", cndtnTrgtInfoMngVOList); + + + //병합 대상자 리스트 + List cndtnTrgtInfoMergeVOList = this._getMergeList(cndtnTrgtInfoMngVO); + + //복호화 + cndtnTrgtInfoMergeVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoMergeVOList); + + model.addAttribute("listMerge", cndtnTrgtInfoMergeVOList); + + + return "oprtn/cndtnSspnIdtmt/trgtMngDetail"; + } + /** * 조건부기소유예과정 등록 */ @@ -715,10 +860,16 @@ public class CndtnTrgtMngController { //과정 조회 CndtnTrgtMngVO cndtnTrgtInfoVO = cndtnTrgtInfoMngService.selectDetail(cndtnTrgtInfoMngVO); + + //복호화 + cndtnTrgtInfoVO = egovCryptoUtil.decryptCndtnTrgtMngVOInfo(cndtnTrgtInfoVO); + model.addAttribute("info", cndtnTrgtInfoVO); //세부과정 목록 조회 + //병합대상자 검색 + /* List cndtnTrgtInfoMngVOList = new ArrayList(); if(StringUtils.isNotEmpty(cndtnTrgtInfoMngVO.getTrgtNm()) || StringUtils.isNotEmpty(cndtnTrgtInfoMngVO.getDBirth())) { @@ -729,7 +880,22 @@ public class CndtnTrgtMngController { cndtnTrgtInfoMngVOList = cndtnTrgtInfoMngService.selectPagingList(cndtnTrgtInfoMngVO); } model.addAttribute("list", cndtnTrgtInfoMngVOList); + */ + List cndtnTrgtInfoMngVOList = this._getMergeSearchList(model, cndtnTrgtInfoMngVO); + //복호화 + cndtnTrgtInfoMngVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoMngVOList); + + model.addAttribute("list", cndtnTrgtInfoMngVOList); + + + //병합 대상자 리스트 + List cndtnTrgtInfoMergeVOList = this._getMergeList(cndtnTrgtInfoMngVO); + + //복호화 + cndtnTrgtInfoMergeVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoMergeVOList); + + model.addAttribute("listMerge", cndtnTrgtInfoMergeVOList); return "oprtn/cndtnSspnIdtmt/trgtCmpltDetail"; } @@ -833,6 +999,9 @@ public class CndtnTrgtMngController { //과정 조회 CndtnTrgtMngVO cndtnTrgtInfoVO = cndtnTrgtInfoMngService.selectDetail(cndtnTrgtInfoMngVO); + + //복호화 + cndtnTrgtInfoVO = egovCryptoUtil.decryptCndtnTrgtMngVOInfo(cndtnTrgtInfoVO); model.addAttribute("info", cndtnTrgtInfoVO); @@ -982,7 +1151,6 @@ public class CndtnTrgtMngController { return modelAndView; } - @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/trgtMngExcel.do") public ModelAndView trgtMngExcel( @ModelAttribute("cndtnTrgtInfoMngVO") CndtnTrgtMngVO cndtnTrgtInfoMngVO @@ -1009,83 +1177,96 @@ public class CndtnTrgtMngController { //로그인 처리==================================== - //1.pageing step1 - PaginationInfo paginationInfo = this.setCndtnPagingStep1(cndtnTrgtInfoMngVO); - - //임시로 페이징 처리를 안하기 위해서 RecordCountPerPage 수를 10000 으로 셋팅함 - //paginationInfo.setRecordCountPerPage(10000); - - //2. pageing step2 - cndtnTrgtInfoMngVO = this.setCndtnPagingStep2(cndtnTrgtInfoMngVO, paginationInfo); - - //검색 조회 - String selectCondition = ""; - if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeyword())){ - String searchStatus = cndtnTrgtInfoMngVO.getSearchStatus(); -// selectCondition = "AND a."+searchStatus+" LIKE CONCAT ('%', '" +cndtnTrgtInfoMngVO.getSearchKeyword() + "', '%')"; - selectCondition = "AND a."+searchStatus+" LIKE '%" +cndtnTrgtInfoMngVO.getSearchKeyword() + "%'"; - cndtnTrgtInfoMngVO.setSearchQuery(selectCondition); - } - - if(StringUtils.isNotEmpty(cndtnTrgtInfoMngVO.getSearchSelStatus())) - { - cndtnTrgtInfoMngVO.setSearchSelStatusToList(cndtnTrgtInfoMngVO.getSearchSelStatus()); - } - List cndtnTrgtInfoMngVOList = null; try { + //1.pageing step1 + PaginationInfo paginationInfo = this.setCndtnPagingStep1(cndtnTrgtInfoMngVO); - cndtnTrgtInfoMngVOList = cndtnTrgtInfoMngService.selectPagingList(cndtnTrgtInfoMngVO); - } catch (Exception e) { - e.printStackTrace(); - // TODO: handle exception - } - - ComDefaultCodeVO vo = new ComDefaultCodeVO(); - - for(CndtnTrgtMngVO tmp : cndtnTrgtInfoMngVOList) { - //의뢰읠 - tmp.setReqPnttm(tmp.getReqPnttm().substring(0, 10)); - //사건번호 - tmp.setVntYear(tmp.getVntYear()+"형제"+tmp.getVntNmbr()); - //관할청 - if(StringUtil.isNotEmpty(tmp.getCmptntAthrt())) { - vo.setCodeId("VEA008"); - vo.setCode(tmp.getCmptntAthrt()); - CmmnDetailCode cmmnDetailCode= egovCmmUseService.selectCmmCodeDetailValue(vo); - tmp.setCmptntAthrt(StringUtil.escapeXml(cmmnDetailCode.getCodeNm())); - } - //생년월일 - if(StringUtil.isNotEmpty(tmp.getdBirth())) { - tmp.setDBirth(tmp.getdBirth()); - } - //성별 - if(StringUtil.isNotEmpty(tmp.getSex())) { - vo.setCodeId("COM014"); - vo.setCode(tmp.getSex()); - CmmnDetailCode cmmnDetailCodeSex= egovCmmUseService.selectCmmCodeDetailValue(vo); - tmp.setSex((StringUtil.escapeXml(cmmnDetailCodeSex.getCodeNm()))); - } - //의뢰상태 - if(StringUtil.isNotEmpty(tmp.getReqStateCd())) { - vo.setCodeId("VEA005"); - vo.setCode(tmp.getReqStateCd()); - CmmnDetailCode cmmnDetailCodeReqState= egovCmmUseService.selectCmmCodeDetailValue(vo); - tmp.setReqStateCd((StringUtil.escapeXml(cmmnDetailCodeReqState.getCodeNm()))); - } - //교육상태 - if(StringUtil.isNotEmpty(tmp.getEduStateCd())) { - vo.setCodeId("VEA002"); - vo.setCode(tmp.getEduStateCd()); - CmmnDetailCode cmmnDetailCodeEduState= egovCmmUseService.selectCmmCodeDetailValue(vo); - tmp.setEduStateCd((StringUtil.escapeXml(cmmnDetailCodeEduState.getCodeNm()))); - } - //주소 - if(StringUtil.isNotEmpty(tmp.getAddr()) && StringUtil.isNotEmpty(tmp.getAddrDetail())) { - tmp.setAddr(tmp.getAddr()+" "+tmp.getAddrDetail()); - } + //임시로 페이징 처리를 안하기 위해서 RecordCountPerPage 수를 10000 으로 셋팅함 + //paginationInfo.setRecordCountPerPage(10000); + + //2. pageing step2 + cndtnTrgtInfoMngVO = this.setCndtnPagingStep2(cndtnTrgtInfoMngVO, paginationInfo); + + //검색 조회 + String selectCondition = ""; + if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeyword())){ + String searchStatus = cndtnTrgtInfoMngVO.getSearchStatus(); +// selectCondition = "AND a."+searchStatus+" LIKE CONCAT ('%', '" +cndtnTrgtInfoMngVO.getSearchKeyword() + "', '%')"; + selectCondition = "AND a."+searchStatus+" LIKE '%" +cndtnTrgtInfoMngVO.getSearchKeyword() + "%'"; + cndtnTrgtInfoMngVO.setSearchQuery(selectCondition); + } + + if(StringUtils.isNotEmpty(cndtnTrgtInfoMngVO.getSearchSelStatus())) + { + cndtnTrgtInfoMngVO.setSearchSelStatusToList(cndtnTrgtInfoMngVO.getSearchSelStatus()); + } + + + + try { + + cndtnTrgtInfoMngVOList = cndtnTrgtInfoMngService.selectPagingList(cndtnTrgtInfoMngVO); + } catch (Exception e) { + e.printStackTrace(); + // TODO: handle exception + } + + ComDefaultCodeVO vo = new ComDefaultCodeVO(); + + for(CndtnTrgtMngVO tmp : cndtnTrgtInfoMngVOList) { + //의뢰읠 + tmp.setReqPnttm(tmp.getReqPnttm().substring(0, 10)); + //사건번호 + tmp.setVntYear(tmp.getVntYear()+"형제"+tmp.getVntNmbr()); + //관할청 + if(StringUtil.isNotEmpty(tmp.getCmptntAthrt())) { + vo.setCodeId("VEA008"); + vo.setCode(tmp.getCmptntAthrt()); + CmmnDetailCode cmmnDetailCode= egovCmmUseService.selectCmmCodeDetailValue(vo); + + if (cmmnDetailCode!=null) tmp.setCmptntAthrt(StringUtil.escapeXml(cmmnDetailCode.getCodeNm())); + } + //생년월일 + if(StringUtil.isNotEmpty(tmp.getdBirth())) { + tmp.setDBirth(tmp.getdBirth()); + } + //성별 + if(StringUtil.isNotEmpty(tmp.getSex())) { + vo.setCodeId("COM014"); + vo.setCode(tmp.getSex()); + CmmnDetailCode cmmnDetailCodeSex= egovCmmUseService.selectCmmCodeDetailValue(vo); + if (cmmnDetailCodeSex!=null) tmp.setSex((StringUtil.escapeXml(cmmnDetailCodeSex.getCodeNm()))); + } + //의뢰상태 + if(StringUtil.isNotEmpty(tmp.getReqStateCd())) { + if (tmp.getPrcsAplctPrdOrdCmplt()==null) { + vo.setCodeId("VEA005"); + vo.setCode(tmp.getReqStateCd()); + CmmnDetailCode cmmnDetailCodeReqState= egovCmmUseService.selectCmmCodeDetailValue(vo); + if (cmmnDetailCodeReqState!=null) tmp.setReqStateCd((StringUtil.escapeXml(cmmnDetailCodeReqState.getCodeNm()))); + }else { + tmp.setReqStateCd("병합처리"); + } + } + //교육상태 + if(StringUtil.isNotEmpty(tmp.getEduStateCd())) { + vo.setCodeId("VEA002"); + vo.setCode(tmp.getEduStateCd()); + CmmnDetailCode cmmnDetailCodeEduState= egovCmmUseService.selectCmmCodeDetailValue(vo); + if (cmmnDetailCodeEduState!=null) tmp.setEduStateCd((StringUtil.escapeXml(cmmnDetailCodeEduState.getCodeNm()))); + } + //주소 + if(StringUtil.isNotEmpty(tmp.getAddr()) && StringUtil.isNotEmpty(tmp.getAddrDetail())) { + tmp.setAddr(tmp.getAddr()+" "+tmp.getAddrDetail()); + } + } + + }catch(Exception ex) { + ex.printStackTrace(); } + int[] width = { 4000, 5000, 5000, 5000, 3000 @@ -1261,4 +1442,48 @@ public class CndtnTrgtMngController { e.printStackTrace(); } } + + //병합 대상자 검색 + private List _getMergeSearchList( + ModelMap p_model + , CndtnTrgtMngVO p_cndtnTrgtInfoMngVO + ) throws Exception { + //병합대상자 검색 + List cndtnTrgtInfoMngVOList = new ArrayList(); + if(StringUtils.isNotEmpty(p_cndtnTrgtInfoMngVO.getTrgtNm()) || StringUtils.isNotEmpty(p_cndtnTrgtInfoMngVO.getDBirth())) + { + p_cndtnTrgtInfoMngVO.setFirstIndex(0); + p_cndtnTrgtInfoMngVO.setRecordCountPerPage(100000); + + //병합 대상자 검색 조건 추가 + String selectCondition = " AND a.prcs_aplct_prd_ord_cmplt IS NULL " //이미 병합 안된 사람 + + " AND 0>=(SELECT count(*) FROM vea_sspn_idmt_trgt WHERE prcs_aplct_prd_ord_cmplt=a.sspn_idtmt_trgt_ord) " //소속 병합이 없어야 함 + + " AND a.sspn_idtmt_trgt_ord!='"+p_cndtnTrgtInfoMngVO.getSspnIdtmtTrgtOrd()+"' "; //본인 제외 + p_cndtnTrgtInfoMngVO.setSearchQuery(selectCondition); + + cndtnTrgtInfoMngVOList = cndtnTrgtInfoMngService.selectPagingList(p_cndtnTrgtInfoMngVO); + } + + return cndtnTrgtInfoMngVOList; + } + + //병합 대상자 + private List _getMergeList( + CndtnTrgtMngVO p_cndtnTrgtInfoMngVO + )throws Exception{ + //병합 대상자 리스트 + List cndtnTrgtInfoMergeVOList = new ArrayList(); + { + p_cndtnTrgtInfoMngVO.setTrgtNm(""); + + p_cndtnTrgtInfoMngVO.setFirstIndex(0); + p_cndtnTrgtInfoMngVO.setRecordCountPerPage(100000); + p_cndtnTrgtInfoMngVO.setSearchQuery(" AND a.prcs_aplct_prd_ord_cmplt='"+p_cndtnTrgtInfoMngVO.getSspnIdtmtTrgtOrd()+"' "); + cndtnTrgtInfoMergeVOList = cndtnTrgtInfoMngService.selectPagingList(p_cndtnTrgtInfoMngVO); + + } + + return cndtnTrgtInfoMergeVOList; + //model.addAttribute("listMerge", cndtnTrgtInfoMergeVOList); + } } diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AdvAreaLctrMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AdvAreaLctrMngTngrController.java index 239882e6..0a3afd96 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AdvAreaLctrMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AdvAreaLctrMngTngrController.java @@ -769,6 +769,14 @@ public class AdvAreaLctrMngTngrController { System.out.println(vEAStngVO.toString()); + //접수기간 중복 체크 + List selectListPrdDupCheck = vEAStngService.selectList_VEALRS_prdDupCheck(vEAStngVO); + + if (!selectListPrdDupCheck.isEmpty()) { + modelAndView.addObject("result", "dup"); + return modelAndView; + } + String s_rnds_ord = rndsOrdGnrService.getNextStringId(); vEAStngVO.setRndsOrd(s_rnds_ord); @@ -836,11 +844,19 @@ public class AdvAreaLctrMngTngrController { //String s_rnds_ord = rndsOrdGnrService.getNextStringId(); + //접수기간 중복 체크 + List selectListPrdDupCheck = vEAStngService.selectList_VEALRS_prdDupCheck(vEAStngVO); + + if (!selectListPrdDupCheck.isEmpty()) { + modelAndView.addObject("result", "dup"); + return modelAndView; + } + List dupList = vEAStngMixService.selectList_VEAALS_2(vEAStngVO); if (dupList.size()>0) { modelAndView.addObject("result", "fail-dup"); - + }else { //vEAStngVO.setRndsOrd(s_rnds_ord); int i_ret=vEAStngService.update_VEALRS(vEAStngVO); diff --git a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Cubrid.xml index 11a7bc70..fb72831a 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Cubrid.xml @@ -34,6 +34,11 @@ , req_nmbr , prsctr_nm , req_state_cd + + , prcs_aplct_prd_ord_cmplt + , vnt_year + , atch_file_id + , edu_aplct_ord @@ -59,7 +64,12 @@ , a.sex AS sex , a.req_nmbr AS reqNmbr , a.prsctr_nm AS prsctrNm - , a.req_state_cd AS reqStateCd + , a.req_state_cd AS reqStateCd + + , a.prcs_aplct_prd_ord_cmplt AS prcsAplctPrdOrdCmplt + , a.vnt_year AS vntYear + , a.atch_file_id AS atchFileId + , a.edu_aplct_ord AS eduAplctOrd @@ -152,6 +162,25 @@ , req_nmbr = #reqNmbr# , prsctr_nm = #prsctrNm# , req_state_cd = #reqStateCd# + + + , prcs_aplct_prd_ord_cmplt = #prcsAplctPrdOrdCmplt# + + + + , vnt_year = #vntYear# + + + + , atch_file_id = #atchFileId# + + + + , edu_aplct_ord = #eduAplctOrd# + + + + WHERE sspn_idtmt_trgt_ord = #sspnIdtmtTrgtOrd# diff --git a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml index 467a7dd0..bd3f822b 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml @@ -36,6 +36,9 @@ , prsctr_nm , req_state_cd , atch_file_id + + , prcs_aplct_prd_ord_cmplt + , edu_aplct_ord @@ -65,6 +68,8 @@ , a.req_state_cd AS reqStateCd , a.atch_file_id AS atchFileId , a.prcs_aplct_prd_ord_cmplt AS prcsAplctPrdOrdCmplt + + , a.edu_aplct_ord AS eduAplctOrd @@ -146,9 +151,25 @@ UPDATE - SET - edu_state_cd = #eduStateCd# - , prcs_aplct_prd_ord_cmplt = #prcsAplctPrdOrdCmplt# + SET + prcs_aplct_prd_ord_cmplt = #prcsAplctPrdOrdCmplt# + + + , edu_state_cd = #eduStateCd# + + + + , vnt_year = #vntYear# + + + + , atch_file_id = #atchFileId# + + + + , edu_aplct_ord = #eduAplctOrd# + + WHERE SSPN_IDTMT_TRGT_ORD IN #sspnIdtmtTrgtOrdList[]# @@ -161,8 +182,12 @@ UPDATE SET - edu_state_cd = #eduStateCd# - , prcs_aplct_prd_ord_cmplt = null + prcs_aplct_prd_ord_cmplt = null + + + , edu_state_cd = #eduStateCd# + + WHERE SSPN_IDTMT_TRGT_ORD = #sspnIdtmtTrgtOrd# @@ -193,7 +218,11 @@ @@ -284,17 +315,36 @@ FROM a WHERE - a.trgt_nm = #trgtNm# - AND a.d_birth = #dBirth# + a.trgt_nm = #trgtNm# + AND a.d_birth = #dBirth# AND ( a.edu_state_cd = '20' OR a.edu_state_cd = '25' - OR a.edu_state_cd = '30' + OR a.edu_state_cd = '30' + ) - + + diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml index aec75fbc..a013908e 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml @@ -170,6 +170,7 @@ + /* VEEduAplctDAO.insert */ INSERT INTO ( @@ -827,6 +828,9 @@ + /* VEEduAplctDAO.update + ve_edu_aplct = aprvl_cd (10-요청, 100-찜하기, 120-선정완료, 140-선정취소, 20-승인, 230-대기, 30-반려, 40-취소, 60-교육확정, 70-수정요청, 80-수정완료, 90-교육미확정) VE0003 + */ UPDATE SET LAST_UPDT_PNTTM = SYSDATE 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 9ab58aef..dcecf8c4 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 @@ -211,6 +211,8 @@ ON e.MBER_ID = d.USER_ID WHERE a.APLCT_STATE_CD ='20' + AND + b.LCTR_DIV_CD !='60' AND a.EDU_CMPLT_CRTFC_NMBR IS NOT null diff --git a/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrRndsStng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrRndsStng_SQL_Tibero.xml index b60c2449..b80de6b1 100644 --- a/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrRndsStng_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrRndsStng_SQL_Tibero.xml @@ -246,6 +246,31 @@ */ OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; + + + + diff --git a/src/main/webapp/WEB-INF/decorators.xml b/src/main/webapp/WEB-INF/decorators.xml index 8bee7f0e..cd1d5b5e 100644 --- a/src/main/webapp/WEB-INF/decorators.xml +++ b/src/main/webapp/WEB-INF/decorators.xml @@ -10,6 +10,7 @@ */sym/mnu/mcm/EgovMenuCreat.jsp */sym/cal/* + */sym/cmm/* diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrAsgnmPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrAsgnmPopup.jsp index 3e5b719b..2d27e2cf 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrAsgnmPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrAsgnmPopup.jsp @@ -132,18 +132,21 @@

강사검색

- + <%-- <%-- selectedText="${vEEduAplctVO.rsdne}" defaultValue='' --%> <%-- defaultText='전체' --%> <%-- /> --%>
- +
+ + +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngList.jsp index 3d222fe8..d5efe438 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngList.jsp @@ -179,8 +179,9 @@
    • -
    • +
    • +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngList.jsp index 6ff347de..7608df9a 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngList.jsp @@ -174,6 +174,28 @@ } + //초기화 + function fncReset(thisObj) { + var targetObj = $(thisObj).closest('.list_top').find('select,input'); + $.each(targetObj, function() { + if ($(this).prop('tagName') == 'SELECT') { + if ($(this).attr('name').indexOf('Month') != -1) { + $(this).val(new Date().getMonth() + 1); + } else if ($(this).attr('name').indexOf('Year') != -1) { + $(this).val(new Date().getFullYear()); + } else { + $(this).prop("selectedIndex", 0); + } + } else { + if ($(this).attr('type') == 'checkbox') { + $(this).prop('checked', false); + } else { + $(this).val(''); + } + } + }); + } + 과정신청기간관리목록 @@ -190,9 +212,9 @@
    • -<%--
    • --%> -
    • +<%--
    • --%>
    • +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngDetail.jsp index b939d004..06b0f4d0 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngDetail.jsp @@ -8,6 +8,7 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%pageContext.setAttribute("crlf", "\r\n"); %> <% /** * @Class Name : fndthEduPrcsMngDetail.jsp @@ -116,7 +117,8 @@ 과정설명 - +<%-- --%> + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngList.jsp index 5be98216..9205cb64 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngList.jsp @@ -11,6 +11,7 @@ <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%pageContext.setAttribute("crlf", "\r\n"); %> <% /** * @Class Name : fndthEduPrcsMngList.jsp @@ -154,8 +155,9 @@
    • -
    • +
    • +
@@ -244,7 +246,8 @@ ');" style="cursor:pointer;"> - +<%-- --%> + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/eduInstrFeeMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/eduInstrFeeMngList.jsp index c8f6dfaa..fa45f067 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/eduInstrFeeMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/eduInstrFeeMngList.jsp @@ -163,6 +163,7 @@ } + //초기화 function fncReset(thisObj) { var targetObj = $(thisObj).closest('.list_top').find('select,input'); $.each(targetObj, function() { diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltDetail.jsp index b02f74aa..cc7ef0f8 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltDetail.jsp @@ -1,431 +1,545 @@ - -<%@ page language="java" contentType="text/html; charset=utf-8" - pageEncoding="utf-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> -<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> -<% - /** - * @Class Name : cndtnEduPrcsMngDetail.jsp - * @Description : 조건부기소유예 상세화면 - * @Modification Information - * @ - * @ 수정일 수정자 수정내용 - * @ ------- -------- --------------------------- - * @ 2021.12.16 조용준 최초 생성 - * @author 조용주 - * @since 2021.12.16 - * @version 1.0 - * @see - * - */ -%> - - -교육과정관리 - - - - - -
- - - -
- - - - - - - - -
-
- - -
-

수료자 상세

-
    -
    • -
  • -

    조건부기소유예관리

    -
    • -
  • 수료자 목록
    • -
  • 수료자 상세
    • -
-
- - -
- -
-

수료자 상세

-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
의뢰일 -
-
- - - -<%-- --%> - -
-
-
사건번호 - -
관할청 - -
성별 - - 연락처 - -
성명 - - 생년월일 - -
의뢰번호 - - 의뢰상태 - -
교육상태 - - 검사명 - -
-

주소

- 		- - -
- - -
-
-
- - - - - - - -
-

중복 대상자 검색

-
- - -
-
-
- - - - - - - - - - - - - - - - - - -<%-- --%> - - -
-
-
- -
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -<%-- ');" style="cursor:pointer;"> --%> - -<%-- - - - - - - - - - - -<%-- --%> - - - - - - - - -
의뢰일사건번호관할청생년월일성명성별의뢰번호의뢰상태교육상태주소검사명
');" style="cursor:pointer;"> --%> -<%-- --%> - - - - - - - - - - - - -<%-- --%> - - - - - - - - - - - - - - - - - - - ${fn:length(fullAddr)> 5 ? fn:substring(fullAddr, 0, 5).concat('...') : ''} - - -
-
- - - -
-
-
-
-
-
- - -
-
-
-
-
- - - + +<%@ page language="java" contentType="text/html; charset=utf-8" + pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<% + /** + * @Class Name : cndtnEduPrcsMngDetail.jsp + * @Description : 조건부기소유예 상세화면 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.12.16 조용준 최초 생성 + * @author 조용주 + * @since 2021.12.16 + * @version 1.0 + * @see + * + */ +%> + + +교육과정관리 + + + + + +
+ + +
+ + + + + + + + +
+
+ + +
+

수료자 상세

+
    +
    • +
  • +

    조건부기소유예관리

    +
    • +
  • 수료자 목록
    • +
  • 수료자 상세
    • +
+
+ + +
+ +
+

수료자 상세

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
의뢰일 +
+
+ + + +<%-- --%> + +
+
+
사건번호 + +
관할청 + +
성별 + + 연락처 + +
성명 + + 생년월일 + +
의뢰번호 + + 의뢰상태 + + + 병합대상 + + + + + +
교육상태 + + 검사명 + +
+

주소

+ 		+ + +
+ + +
+
+
+ + + + + + + + + + +
+
+
+
+
+
+ + +
+
+ +
+

병합 대상자

+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%-- ');" style="cursor:pointer;"> --%> + +<%-- + + + + + + + + + +<%-- --%> + + + + + + + + + +
의뢰일사건번호관할청생년월일성명성별의뢰번호의뢰상태교육상태주소검사명삭제
');" style="cursor:pointer;"> --%> +<%-- --%> + + + + +<%-- --%> + + + + + + + + + + + + + + + + + + + + +<%-- ${fn:length(fullAddr)> 5 ? fn:substring(fullAddr, 0, 5).concat('...') : ''} --%> + + + + +
+
+ + + +
+

병합 대상자 검색

+
+ + +
+
+
+ + + + + + + + + + + + + + + + + + +<%-- --%> + + +
+
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%-- ');" style="cursor:pointer;"> --%> + +<%-- + + + + + + + + + + +<%-- --%> + + + + + + + + +
의뢰일사건번호관할청생년월일성명성별의뢰번호의뢰상태교육상태주소검사명
');" style="cursor:pointer;"> --%> +<%-- --%> + + + + + + + + + + + + +<%-- --%> + + + 형제 + + + + + + + + + + + + + + + + + +<%-- ${fn:length(fullAddr)> 5 ? fn:substring(fullAddr, 0, 5).concat('...') : ''} --%> + + +
+
+ +
+
+
+
+ +
+
+ + +
+
+
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp index 3f357d78..b4a62dd0 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp @@ -34,7 +34,8 @@ function fncGoList(){ var listForm = document.listForm ; - listForm.action = ""; + listForm.action = ""; +// listForm.action = ""; listForm.submit(); } function fncMdfy(){ @@ -48,14 +49,115 @@ detailForm.submit(); } + function fncGoSearch(){ + var form = document.listForm ; + form.trgtNm.value=$('#trgtNm').val(); + form.dBirth.value=$('#dBirth').val(); + form.action = ""; + form.submit(); + } + + // 체크박스O + function fnUpdate(){ + + var sspnIdtmtTrgtOrdList = []; + + // "chk" 이름을 가진 체크박스가 체크된 항목들을 순회 + $("input[name='chk']:checked").each(function() { + var sspnIdtmtTrgtOrd = $(this).val(); + sspnIdtmtTrgtOrdList.push(sspnIdtmtTrgtOrd); + }); + + // 선택된 항목이 없으면 경고 메시지를 표시하고 함수를 종료 + if (sspnIdtmtTrgtOrdList.length === 0) { + alert("선택된 항목이 없습니다. 선택 후 다시 시도하세요."); + return false; + } + + var dataToSend = { + "sspnIdtmtTrgtOrdList": sspnIdtmtTrgtOrdList + //, "eduStateCd" : "20" + //, "prcsAplctPrdOrdCmplt" : $('#prcsAplctPrdOrdCmplt').val() + , "prcsAplctPrdOrdCmplt" : $('#sspnIdtmtTrgtOrd').val() + + }; + + +// var url = ""; + var url = ""; + + if(!confirm("병합처리 진행하시겠습니까?")){ + return false; + } + // AJAX 호출을 통해 서버에 데이터 전송 + $.ajax({ + type:"POST", + url: url, + data: $.param(dataToSend, true), // 직렬화 , 컨트롤러에서 @ModelAttribute로 받을 수 있음 +// contentType : 'application/json', + dataType:'json', + success:function(returnData){ + if(returnData.result == "success"){ + alert("변경 처리 되었습니다."); + window.location.reload(); + }else{ + alert("변경 중 오류가 발생하였습니다."); + } + }, + error: function(jqXHR, textStatus, errorThrown) { + console.error("AJAX Error:", textStatus, errorThrown); + console.error("Response:", jqXHR.responseText); + } + }); + } + + //병합취소 + function fncDel(sspnIdtmtTrgtOrd){ + + var listForm = document.delForm ; + delForm.sspnIdtmtTrgtOrd.value=sspnIdtmtTrgtOrd; + var data = new FormData(document.getElementById("delForm")); + + + if(confirm("병합을 취소하시겠습니까?")){ + var url = ""; + $.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("수정되었습니다."); + window.location.reload(); + } + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + } + + } - +
+ + +
+ + + + - +
@@ -148,8 +250,15 @@ 의뢰상태 - - + + + + 병합대상 + + + + + @@ -211,7 +320,253 @@
+
+ +
+

병합 대상자

+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%-- ');" style="cursor:pointer;"> --%> + +<%-- + + + + + + + + + +<%-- --%> + + + + + + + + + +
의뢰일사건번호관할청생년월일성명성별의뢰번호의뢰상태교육상태주소검사명삭제
');" style="cursor:pointer;"> --%> +<%-- --%> + + + + +<%-- --%> + + + + + + + + + + + + + + + + + + + + +<%-- ${fn:length(fullAddr)> 5 ? fn:substring(fullAddr, 0, 5).concat('...') : ''} --%> + + + + +
+ + + + + +
+

병합 대상자 검색

+
+ + +
+
+
+ + + + + + + + + + + + + + + + + + +<%-- --%> + + +
+
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%-- ');" style="cursor:pointer;"> --%> + +<%-- + + + + + + + + + + +<%-- --%> + + + + + + + + +
의뢰일사건번호관할청생년월일성명성별의뢰번호의뢰상태교육상태주소검사명
');" style="cursor:pointer;"> --%> +<%-- --%> + + + + + + + + + + + + +<%-- --%> + + + 형제 + + + + + + + + + + + + + + + + + +<%-- ${fn:length(fullAddr)> 5 ? fn:substring(fullAddr, 0, 5).concat('...') : ''} --%> + + +
+
+ +
+
+
+
+ +
+
+ + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp index 3e2e12aa..0db58522 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp @@ -39,7 +39,7 @@ $(document).ready(function(){ - searchInit(); + //searchInit(); // 검색 select box $('#searchStatus').change(function(){ @@ -89,7 +89,7 @@ function linkPage(pageNo){ var listForm = document.listForm ; listForm.pageIndex.value = pageNo ; - listForm.searchKeyword.value = $('#searchKeyword').val(); + //listForm.searchKeyword.value = $('#searchKeyword').val(); listForm.action = ""; listForm.submit(); } @@ -183,6 +183,27 @@ } + //초기화 + function fncReset(thisObj) { + var targetObj = $(thisObj).closest('.list_top').find('select,input'); + $.each(targetObj, function() { + if ($(this).prop('tagName') == 'SELECT') { + if ($(this).attr('name').indexOf('Month') != -1) { + $(this).val(new Date().getMonth() + 1); + } else if ($(this).attr('name').indexOf('Year') != -1) { + $(this).val(new Date().getFullYear()); + } else { + $(this).prop("selectedIndex", 0); + } + } else { + if ($(this).attr('type') == 'checkbox') { + $(this).prop('checked', false); + } else { + $(this).val(''); + } + } + }); + } 교육과정관리 @@ -219,19 +240,61 @@
+ + + + + + +<%-- --%> +<%-- --%> +<%-- --%> + + + + +<%-- --%> + + + +<%-- --%> + + +<%-- --%> + + + +

구분1

- - + + + +
+
+ +
+
+

구분2

+
+
+ + + + +
+
+ +
+
+

구분3

+
+
-
+ 의뢰일:
~ @@ -239,13 +302,12 @@
- -
-
+
+
-

구분2

+

구분4

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngDetail.jsp new file mode 100644 index 00000000..ea72e4ea --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngDetail.jsp @@ -0,0 +1,576 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" + pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<% + /** + * @Class Name : cndtnEduPrcsMngDetail.jsp + * @Description : 조건부기소유예 상세화면 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.12.16 조용준 최초 생성 + * @author 조용주 + * @since 2021.12.16 + * @version 1.0 + * @see + * + */ +%> + + +교육과정관리 + + + + + +
+ + +
+ + + + + + + + +
+
+ + +
+

대상자 상세

+
    +
    • +
  • +

    조건부기소유예관리

    +
    • +
  • 대상자 목록
    • +
  • 대상자 상세
    • +
+
+ + +
+ +
+

대상자 상세

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
의뢰일 +
+
+ + + +<%-- --%> + +
+
+
사건번호 + 형제 +
관할청 + +
성별 + + 연락처 + +
성명 + + 생년월일 + +
의뢰번호 + + 의뢰상태 + + + 병합대상 + + + + + +
교육상태 + + 검사명 + +
+

주소

+ 		+ + +
+ + +
+
+

첨부파일

+ 		+ + + + +
+
+ + + +
+
+
+
+
+
+ + + + + + + + + + + + +
+
+ +
+

병합 대상자

+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%-- ');" style="cursor:pointer;"> --%> + +<%-- + + + + + + + + + +<%-- --%> + + + + + + + + + +
의뢰일사건번호관할청생년월일성명성별의뢰번호의뢰상태교육상태주소검사명삭제
');" style="cursor:pointer;"> --%> +<%-- --%> + + + + +<%-- --%> + + + + + + + + + + + + + + + + + + + + +<%-- ${fn:length(fullAddr)> 5 ? fn:substring(fullAddr, 0, 5).concat('...') : ''} --%> + + + + +
+
+ + + + + +
+

병합 대상자 검색

+
+ + +
+
+
+ + + + + + + + + + + + + + + + + + +<%-- --%> + + +
+
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%-- ');" style="cursor:pointer;"> --%> + +<%-- + + + + + + + + + + +<%-- --%> + + + + + + + + +
의뢰일사건번호관할청생년월일성명성별의뢰번호의뢰상태교육상태주소검사명
');" style="cursor:pointer;"> --%> +<%-- --%> + + + + + + + + + + + + +<%-- --%> + + + 형제 + + + + + + + + + + + + + + + + + +<%-- ${fn:length(fullAddr)> 5 ? fn:substring(fullAddr, 0, 5).concat('...') : ''} --%> + + +
+
+ +
+
+
+
+ +
+
+ + + + + +
+
+
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp index 86002f14..6a01df7a 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp @@ -56,7 +56,7 @@ - searchInit(); + //searchInit(); // 검색 select box $('#searchStatus').change(function(){ @@ -121,7 +121,7 @@ var listForm = document.listForm ; listForm.pageIndex.value = pageNo ; - listForm.searchKeyword.value = $('#searchKeyword').val(); + //listForm.searchKeyword.value = $('#searchKeyword').val(); listForm.action = ""; listForm.submit(); } @@ -130,7 +130,7 @@ function fncGoDetail(sspnIdtmtTrgtOrd){ var detailForm = document.detailForm ; detailForm.sspnIdtmtTrgtOrd.value = sspnIdtmtTrgtOrd; - detailForm.action = ""; + detailForm.action = ""; detailForm.submit(); } @@ -222,6 +222,28 @@ listForm.action = ""; listForm.submit(); } + + //초기화 + function fncReset(thisObj) { + var targetObj = $(thisObj).closest('.list_top').find('select,input'); + $.each(targetObj, function() { + if ($(this).prop('tagName') == 'SELECT') { + if ($(this).attr('name').indexOf('Month') != -1) { + $(this).val(new Date().getMonth() + 1); + } else if ($(this).attr('name').indexOf('Year') != -1) { + $(this).val(new Date().getFullYear()); + } else { + $(this).prop("selectedIndex", 0); + } + } else { + if ($(this).attr('type') == 'checkbox') { + $(this).prop('checked', false); + } else { + $(this).val(''); + } + } + }); + } 교육과정관리 @@ -267,19 +289,60 @@
+ + + + + + +<%-- --%> +<%-- --%> +<%-- --%> + + + + +<%-- --%> + + + +<%-- --%> + + +<%-- --%> + + +

구분1

- - + + + +
+
+ +
+
+

구분2

+
+
+ + + + +
+
+ +
+
+

구분3

+
+
-
+ 의뢰일:
~ @@ -287,13 +350,11 @@
- -
-
+
-

구분2

+

구분4

@@ -304,7 +365,7 @@
-

구분3

+

구분5

관할청  

@@ -374,11 +435,22 @@ - ');" style="cursor:pointer;"> + ');" + + + + style="cursor:pointer;" + + + style="cursor:pointer;background-color:lightgray;" + + + > <%-- ');" style="cursor:pointer;"> --%> <%-- --%> - + + <%-- --%> @@ -402,7 +474,13 @@ - + + + + + 병합처리 + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngDetail.jsp index f5037c68..6cb09e49 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngDetail.jsp @@ -8,6 +8,7 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%pageContext.setAttribute("crlf", "\r\n"); %> <% /** * @Class Name : fndthEduPrcsMngDetail.jsp diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngList.jsp index 462a394b..6cd125e3 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngList.jsp @@ -11,6 +11,7 @@ <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%pageContext.setAttribute("crlf", "\r\n"); %> <% /** * @Class Name : fndthEduPrcsMngList.jsp diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advRndsStngMngPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advRndsStngMngPopup.jsp index 1d3dc2b5..501b3048 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advRndsStngMngPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advRndsStngMngPopup.jsp @@ -200,6 +200,9 @@ }else if(returnData.result == "fail-dup"){ alert("동일한 회차명이 있습니다."); + + }else if(returnData.result == "dup"){ + alert("중복된 접수기간이 있습니다."); }else{ alert("변경 중 오류가 발생하였습니다."); @@ -269,7 +272,10 @@ }else if(returnData.result == "fail-dup"){ alert("동일한 회차명이 있습니다."); - + + }else if(returnData.result == "dup"){ + alert("중복된 접수기간이 있습니다."); + }else{ alert("변경 중 오류가 발생하였습니다."); } diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp index a51eee23..90337fa0 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp @@ -77,6 +77,7 @@ $(document).ready(function(){ } // 텍스트가 "접수중"인지 확인 + //if ($thisCell.text().trim() !== "접수중" && $thisCell.text().trim() !== "취소") { if ($thisCell.text().trim() !== "접수중") { $applyButton.prop('disabled', true); // 버튼 비활성화 } @@ -504,7 +505,41 @@ $(document).ready(function(){ return Math.ceil((parseInt(date.substring(6,8))+fd.getDay())/7); } - + //설문 팝업 + function fncAplctPopup( + 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/sspnIdtmt/popup/eduAplctPopList.do" + , 800 + , 700 + , paramObj + , "Y" + , "AplctPopup" + ); + } + @@ -517,6 +552,7 @@ $(document).ready(function(){
+
@@ -637,6 +673,13 @@ $(document).ready(function(){ <%-- --%> + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp new file mode 100644 index 00000000..87ebc5b3 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp @@ -0,0 +1,211 @@ +<%-- + + Class Name : eduAplctPopList.jsp + Description : 신청팝업 + Modification Information + + 1.강의 종류(청소년, 성인 ... VE0011) 및 설문 종류 (10-기본, 20-신청자, 30-강사) 및 상태(등록, 완료) 에 맞는 설문 레이어 팝업을 만든다. + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2021.12.02 조용준 내용 + + author : 조용준 + since : 2021.12.02 + +--%> +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + + + + + + + + +
+ +
+ + + + + + + +
+
+

교육대상자 확인

+
+ +
+
+
+ + + + + + + + + + + + + + + + + + +
성명 + +
주민번호앞자리 +
+ +
+ +
성별 + + +
+ +
+
+
+
+
+ + +
+
+
+
+
+
+
+