diff --git a/src/main/java/kcc/let/my/web/MyPageController.java b/src/main/java/kcc/let/my/web/MyPageController.java index 9edb1c16..f0dda77a 100644 --- a/src/main/java/kcc/let/my/web/MyPageController.java +++ b/src/main/java/kcc/let/my/web/MyPageController.java @@ -381,12 +381,27 @@ public class MyPageController { , ModelMap model ) throws Exception { - LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); // 권한에 따른 로그인 정보 가져오기 +// try { + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + if (loginVO == null || ssoLoginVO == null) { + //이전 url 처리(beforeSiteUrl)_이준호_220228추가 + return checkLoginUtil.getUserLoginPage(model, request); //로그인 정보가 없으면 로그인 페이지로 이동한다. +// return checkLoginUtil.getUserLoginPage(model); //로그인 정보가 없으면 로그인 페이지로 이동한다. + } + + notifyManageService.updateM7DaysUseYnN(); + + //1.pageing step1 PaginationInfo paginationInfo = this.setNotiPagingStep1(notifyManageVO); //2. pageing step2 notifyManageVO = this.setNotiPagingStep2(notifyManageVO, paginationInfo); // + + notifyManageVO.setToUserId(loginVO.getUniqId()); @@ -412,7 +427,10 @@ public class MyPageController { //대상 리스트, 페이징 정보 전달 model.addAttribute("list", notifyManageVOList); - +// } catch (Exception e) { +// e.printStackTrace(); +// // TODO: handle exception +// } // return "web/my/myQnaMngList"; return "web/my/myNotifyMngList"; } diff --git a/src/main/java/kcc/let/uss/notify/service/NotifyManageService.java b/src/main/java/kcc/let/uss/notify/service/NotifyManageService.java index c0a945b4..1e95bc60 100644 --- a/src/main/java/kcc/let/uss/notify/service/NotifyManageService.java +++ b/src/main/java/kcc/let/uss/notify/service/NotifyManageService.java @@ -59,6 +59,8 @@ public interface NotifyManageService { int selectNotifyCnt(String uniqId); + void updateM7DaysUseYnN(); + } diff --git a/src/main/java/kcc/let/uss/notify/service/NotifyManageVO.java b/src/main/java/kcc/let/uss/notify/service/NotifyManageVO.java index 0fa2b6d0..81a71248 100644 --- a/src/main/java/kcc/let/uss/notify/service/NotifyManageVO.java +++ b/src/main/java/kcc/let/uss/notify/service/NotifyManageVO.java @@ -1,150 +1,152 @@ -package kcc.let.uss.notify.service; - -import java.io.Serializable; - -import kcc.com.cmm.ComDefaultVO; - -/** - * - * 알림 관리자 관리 - * @author 이호영 - * @since 2023.12.14 - * @version 1.0 - * @see - * - *
- * << 개정이력(Modification Information) >>
- *
- *   수정일      수정자           수정내용
- *  -------    --------    ---------------------------
- *   2023.12.14  이호영          최초 생성
- *   
- *
- * 
- */ -public class NotifyManageVO extends ComDefaultVO implements Serializable { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = 1L; - - private String cmmNotifyOrd; - private String toUserId; - private String notifyCn; - private String notifyChk; - private String lctrDivCd; - private String notifyPath; - private String eduAplctOrd; - private String eduChasiOrd; - private String frstRegistPnttm; - private String frstRegisterId; - private String lastUpdtPnttm; - private String lastUpdusrId; - private String cmmNotifyMngOrd; - private String useYn; - private String mngUserId; - private String mngUserNm; - public String getCmmNotifyOrd() { - return cmmNotifyOrd; - } - public void setCmmNotifyOrd(String cmmNotifyOrd) { - this.cmmNotifyOrd = cmmNotifyOrd; - } - public String getToUserId() { - return toUserId; - } - public void setToUserId(String toUserId) { - this.toUserId = toUserId; - } - public String getNotifyCn() { - return notifyCn; - } - public void setNotifyCn(String notifyCn) { - this.notifyCn = notifyCn; - } - public String getNotifyChk() { - return notifyChk; - } - public void setNotifyChk(String notifyChk) { - this.notifyChk = notifyChk; - } - public String getLctrDivCd() { - return lctrDivCd; - } - public void setLctrDivCd(String lctrDivCd) { - this.lctrDivCd = lctrDivCd; - } - public String getNotifyPath() { - return notifyPath; - } - public void setNotifyPath(String notifyPath) { - this.notifyPath = notifyPath; - } - public String getEduAplctOrd() { - return eduAplctOrd; - } - public void setEduAplctOrd(String eduAplctOrd) { - this.eduAplctOrd = eduAplctOrd; - } - public String getEduChasiOrd() { - return eduChasiOrd; - } - public void setEduChasiOrd(String eduChasiOrd) { - this.eduChasiOrd = eduChasiOrd; - } - public String getFrstRegistPnttm() { - return frstRegistPnttm; - } - public void setFrstRegistPnttm(String frstRegistPnttm) { - this.frstRegistPnttm = frstRegistPnttm; - } - public String getFrstRegisterId() { - return frstRegisterId; - } - public void setFrstRegisterId(String frstRegisterId) { - this.frstRegisterId = frstRegisterId; - } - public String getLastUpdtPnttm() { - return lastUpdtPnttm; - } - public void setLastUpdtPnttm(String lastUpdtPnttm) { - this.lastUpdtPnttm = lastUpdtPnttm; - } - public String getLastUpdusrId() { - return lastUpdusrId; - } - public void setLastUpdusrId(String lastUpdusrId) { - this.lastUpdusrId = lastUpdusrId; - } - public String getCmmNotifyMngOrd() { - return cmmNotifyMngOrd; - } - public void setCmmNotifyMngOrd(String cmmNotifyMngOrd) { - this.cmmNotifyMngOrd = cmmNotifyMngOrd; - } - public String getUseYn() { - return useYn; - } - public void setUseYn(String useYn) { - this.useYn = useYn; - } - public String getMngUserId() { - return mngUserId; - } - public void setMngUserId(String mngUserId) { - this.mngUserId = mngUserId; - } - public String getMngUserNm() { - return mngUserNm; - } - public void setMngUserNm(String mngUserNm) { - this.mngUserNm = mngUserNm; - } - - - - - - -} +package kcc.let.uss.notify.service; + +import java.io.Serializable; + +import kcc.com.cmm.ComDefaultVO; + +/** + * + * 알림 관리자 관리 + * @author 이호영 + * @since 2023.12.14 + * @version 1.0 + * @see + * + *
+ * << 개정이력(Modification Information) >>
+ *
+ *   수정일      수정자           수정내용
+ *  -------    --------    ---------------------------
+ *   2023.12.14  이호영          최초 생성
+ *   
+ *
+ * 
+ */ +public class NotifyManageVO extends ComDefaultVO implements Serializable { + + /** + * serialVersionUID + */ + private static final long serialVersionUID = 1L; + + private String cmmNotifyOrd; + private String toUserId; + private String notifyCn; + private String notifyChk; + private String lctrDivCd; + private String notifyPath; + private String eduAplctOrd; + private String eduChasiOrd; + private String frstRegistPnttm; + private String frstRegisterId; + private String lastUpdtPnttm; + private String lastUpdusrId; + private String cmmNotifyMngOrd; + private String useYn; + private String mngUserId; + private String mngUserNm; + + + public String getCmmNotifyOrd() { + return cmmNotifyOrd; + } + public void setCmmNotifyOrd(String cmmNotifyOrd) { + this.cmmNotifyOrd = cmmNotifyOrd; + } + public String getToUserId() { + return toUserId; + } + public void setToUserId(String toUserId) { + this.toUserId = toUserId; + } + public String getNotifyCn() { + return notifyCn; + } + public void setNotifyCn(String notifyCn) { + this.notifyCn = notifyCn; + } + public String getNotifyChk() { + return notifyChk; + } + public void setNotifyChk(String notifyChk) { + this.notifyChk = notifyChk; + } + public String getLctrDivCd() { + return lctrDivCd; + } + public void setLctrDivCd(String lctrDivCd) { + this.lctrDivCd = lctrDivCd; + } + public String getNotifyPath() { + return notifyPath; + } + public void setNotifyPath(String notifyPath) { + this.notifyPath = notifyPath; + } + public String getEduAplctOrd() { + return eduAplctOrd; + } + public void setEduAplctOrd(String eduAplctOrd) { + this.eduAplctOrd = eduAplctOrd; + } + public String getEduChasiOrd() { + return eduChasiOrd; + } + public void setEduChasiOrd(String eduChasiOrd) { + this.eduChasiOrd = eduChasiOrd; + } + public String getFrstRegistPnttm() { + return frstRegistPnttm; + } + public void setFrstRegistPnttm(String frstRegistPnttm) { + this.frstRegistPnttm = frstRegistPnttm; + } + public String getFrstRegisterId() { + return frstRegisterId; + } + public void setFrstRegisterId(String frstRegisterId) { + this.frstRegisterId = frstRegisterId; + } + public String getLastUpdtPnttm() { + return lastUpdtPnttm; + } + public void setLastUpdtPnttm(String lastUpdtPnttm) { + this.lastUpdtPnttm = lastUpdtPnttm; + } + public String getLastUpdusrId() { + return lastUpdusrId; + } + public void setLastUpdusrId(String lastUpdusrId) { + this.lastUpdusrId = lastUpdusrId; + } + public String getCmmNotifyMngOrd() { + return cmmNotifyMngOrd; + } + public void setCmmNotifyMngOrd(String cmmNotifyMngOrd) { + this.cmmNotifyMngOrd = cmmNotifyMngOrd; + } + public String getUseYn() { + return useYn; + } + public void setUseYn(String useYn) { + this.useYn = useYn; + } + public String getMngUserId() { + return mngUserId; + } + public void setMngUserId(String mngUserId) { + this.mngUserId = mngUserId; + } + public String getMngUserNm() { + return mngUserNm; + } + public void setMngUserNm(String mngUserNm) { + this.mngUserNm = mngUserNm; + } + + + + + + +} diff --git a/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageDAO.java b/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageDAO.java index a6d89fd0..9938ac02 100644 --- a/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageDAO.java +++ b/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageDAO.java @@ -82,5 +82,9 @@ public class NotifyManageDAO extends EgovAbstractDAO { return (int) select("VEANotifyDAO.selectNotifyCnt", uniqId); } + public void updateM7DaysUseYnN() { + update("VEANotifyDAO.updateM7DaysUseYnN"); + } + } diff --git a/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java b/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java index 81038897..42ff852e 100644 --- a/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java +++ b/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java @@ -386,4 +386,10 @@ public class NotifyManageServiceImpl extends EgovAbstractServiceImpl implements public int selectNotifyCnt(String uniqId) { return notifyManageDAO.selectNotifyCnt(uniqId); } + + @Override + public void updateM7DaysUseYnN() { + notifyManageDAO.updateM7DaysUseYnN(); + + } } 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 9fcba00c..11298875 100644 --- a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java +++ b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java @@ -642,8 +642,12 @@ public class EgovCryptoUtil { public List decryptVeEduAplctList(List vEPrcsDetailVOList) { for(VEEduAplctVO vo : vEPrcsDetailVOList) { + vo.setEmail(this.decrypt(vo.getEmail())); vo.setChrgNm(this.decrypt(vo.getChrgNm())); vo.setUserNm(this.decrypt(vo.getUserNm())); + vo.setUserId(this.decrypt(vo.getUserId())); + vo.setPhone(this.decrypt(vo.getPhone())); + vo.setPhone(this.decrypt(vo.getPhone())); vo.setPhone(this.decrypt(vo.getPhone())); if (StringUtils.isNotEmpty( vo.getTrgtNm()) ) vo.setTrgtNm(this.decrypt(vo.getTrgtNm().trim())); // } 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 65e2ddc3..88500ec5 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java @@ -532,6 +532,11 @@ public class SspnIdtmtController { public ModelAndView fndthEduPrcsAplctPrdMngRegAjax( @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO , ModelMap model + + + + +// ㄴㅇㄹㄴㅇㄹㄴㅇㄹ , HttpServletRequest request ) throws Exception { 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 8692cc21..0b73f333 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 @@ -30,6 +30,7 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { private String lastUpdusrId; // 수정자 private String sndFlag; + private String popup; //ve_prcs_aplct_prd private String prcsAplctPrdOrd; //과정신청기간순번 @@ -50,7 +51,7 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { //ve_edu_aplct private String eduAplctOrd; //교육신청순번 private List eduAplctOrdList; //교육신청순번 - private List sspnIdtmtTrgtOrdList; //교육신청순번 + private List sspnIdtmtTrgtOrdList; private String eduChasiOrd; //교육차시순번 private String cnt; @@ -949,6 +950,12 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { public void setSndFlag(String sndFlag) { this.sndFlag = sndFlag; } + public String getPopup() { + return popup; + } + public void setPopup(String popup) { + this.popup = popup; + } public String getFeeSbmtYn() { return feeSbmtYn; } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java index e016d451..2dc21b24 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java @@ -2,6 +2,8 @@ package kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service; import java.util.List; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; + public interface CndtnTrgtMngService { @@ -27,6 +29,8 @@ public interface CndtnTrgtMngService { //비공개메모 update int memoUpdate(CndtnTrgtMngVO cndtnTrgtInfoMngVO) throws Exception; + + void updateEduStateCdAndReqStateCdAjax(CndtnTrgtMngVO cndtnTrgtMngVO); 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 c1bc3060..b20f5575 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 @@ -152,5 +152,9 @@ public class CndtnTrgtMngDAO extends EgovAbstractDAO { public int memoUpdate(CndtnTrgtMngVO cndtnTrgtInfoMngVO) throws Exception { return update("cndtnTrgtInfoMngDAO.memoUpdate", cndtnTrgtInfoMngVO); } + + public void updateEduStateCdAndReqStateCdAjax(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { + update("cndtnTrgtInfoMngDAO.updateEduStateCdAndReqStateCdAjax", cndtnTrgtInfoMngVO); + } } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java index 60647a3e..9a661b70 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java @@ -77,6 +77,11 @@ public class CndtnTrgtMngServiceImpl implements CndtnTrgtMngService { public void bulkInsert(List trgtExcelVOList) { cndtnTrgtInfoMngDAO.bulkInsert(trgtExcelVOList); } + + @Override + public void updateEduStateCdAndReqStateCdAjax(CndtnTrgtMngVO cndtnTrgtMngVO) { + cndtnTrgtInfoMngDAO.updateEduStateCdAndReqStateCdAjax(cndtnTrgtMngVO); + } //비공개메모 update @Override @@ -84,4 +89,6 @@ public class CndtnTrgtMngServiceImpl implements CndtnTrgtMngService { return cndtnTrgtInfoMngDAO.memoUpdate(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 813c8a12..875d8798 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 @@ -255,6 +255,47 @@ public class CndtnTrgtMngController { return "oprtn/cndtnSspnIdtmt/trgtList"; } + + @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/updateEduStateCdAndReqStateCdAjax.do") + public ModelAndView updateEduStateCdAndReqStateCdAjax( + @ModelAttribute("vEPrcsDetailVO") CndtnTrgtMngVO cndtnTrgtMngVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + //로그인 처리==================================== + //로그인 정보 가져오기 + String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model); + if (!"".equals(s_oprtnLoginCheckNInfo)) { + modelAndView.addObject("result", "loginFail"); + return modelAndView; + } + //로그인 처리==================================== + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + cndtnTrgtMngVO.setLastUpdusrId(loginVO.getUniqId()); + try { + + + cndtnTrgtInfoMngService.updateEduStateCdAndReqStateCdAjax(cndtnTrgtMngVO); + + + modelAndView.addObject("result", "success"); + + } catch (Exception ex) { + ex.printStackTrace(); + modelAndView.addObject("result", ""); + } + + + return modelAndView; + + } + + + /** * @methodName : getUserWork * @author : 이호영 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 961c66bd..67b5c8fc 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java @@ -1154,6 +1154,9 @@ public class CndtnPrcsInfoMngController { "lctrDivCd" : $("#lctrDivCd").val() }; */ + + + // 알림 notifyManageService.insertNotifyAprvlCd5060ForUser( loginVO , vEPrcsDetailVO.getPrcsAplctPrdOrd() @@ -1186,6 +1189,7 @@ public class CndtnPrcsInfoMngController { return modelAndView; } + /** * 기소유예 교육확정상세 > 이수/미이수 체크버튼 처리 @@ -1464,6 +1468,86 @@ public class CndtnPrcsInfoMngController { } + + /** + * @methodName : fndthInstrAsgnmPopup + * @author : 이호영 + * @date : 2024.01.11 + * @description : 대상자목록에서 강제 배정하는 popup + * @param vEPrcsDetailVO + * @param model + * @param redirectAttributes + * @param session + * @param request + * @return + * @throws Exception + */ + @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/popup/cndtnEduAsgnmPopup.do") + public String cndtnEduAsgnmPopup( +// @ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + + , ModelMap model + , RedirectAttributes redirectAttributes + , HttpSession session + , HttpServletRequest request + ) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + + String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model); + if (!"".equals(s_oprtnLoginCheckNInfo)) return s_oprtnLoginCheckNInfo; + + //로그인 처리==================================== + + //1.pageing step1 + PaginationInfo paginationInfo = this.setPagingStep1(vEPrcsDetailVO); + + //임시로 페이징 처리를 안하기 위해서 RecordCountPerPage 수를 10000 으로 셋팅함 + //paginationInfo.setRecordCountPerPage(10000); + + //2. pageing step2 + vEPrcsDetailVO = this.setPagingStep2(vEPrcsDetailVO, paginationInfo); + + //기반강화 조회 + vEPrcsDetailVO.setLctrDivCd(LCTR_DIV_CD); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 + + if(StringUtil.isNotEmpty(vEPrcsDetailVO.getSearchKeyword())){ + String selectCondition = "AND b.PRCS_NM LIKE CONCAT ('%', '" +vEPrcsDetailVO.getSearchKeyword() + "', '%')"; + vEPrcsDetailVO.setSelectPagingListQuery(selectCondition); + + } + + if(StringUtil.isNotEmpty(vEPrcsDetailVO.getPrcsKind())){ + String[] splited = vEPrcsDetailVO.getPrcsKind().split(","); + vEPrcsDetailVO.setSearchStatusArr(splited); + } + + if(StringUtil.isEmpty(vEPrcsDetailVO.getPrcsDiv())) { + + //vEPrcsDetailVO.setPrcsDiv("10");// 과정구분 VE0015 10-산업종사자, 20-대학생, 30-공무원, 40-일반인, 50-청소년, 60-학부모 + + } + + // 값만 존재하면됨 + // popup일떄 접수중인것만 표시 + vEPrcsDetailVO.setPopup("true"); + List vEPrcsDetailVOList = vEPrcsAplctPrdService.selectPagingList4Fndth(vEPrcsDetailVO); + + //3.pageing step3 + paginationInfo = this.setPagingStep3(vEPrcsDetailVOList, paginationInfo); + + + model.addAttribute("paginationInfo", paginationInfo); + + + //대상 리스트, 페이징 정보 전달 + model.addAttribute("list", vEPrcsDetailVOList); + + return "/oprtn/cndtnSspnIdtmt/popup/cndtnEduAsgnmPopup"; + } + /** * 1.기반강화 강사배치 팝업 function @@ -2003,7 +2087,10 @@ public class CndtnPrcsInfoMngController { // 데이터가 있으면 삭제 if(vEDetail_DVO != null) { - vEDetailVO.setAplctStateCd("30"); + // 이호영 20240112 + // 반려값 추가 (VEA003 - 50:반려) +// vEDetailVO.setAplctStateCd("30"); + vEDetailVO.setAplctStateCd("50"); vEAPrcsAplctPrdInstrAsgnmService.updateAprvlCdEduAplctDetail(vEDetailVO); } diff --git a/src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_SQL_Tibero.xml index a29a3f0a..93155c2f 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_SQL_Tibero.xml @@ -27,6 +27,7 @@ , FRST_REGISTER_ID , LAST_UPDT_PNTTM , LAST_UPDUSR_ID + , USE_YN @@ -43,7 +44,8 @@ a.FRST_REGIST_PNTTM as frstRegistPnttm , a.FRST_REGISTER_ID as frstRegisterId , a.LAST_UPDT_PNTTM as lastUpdtPnttm , - a.LAST_UPDUSR_ID as lastUpdusrId + a.LAST_UPDUSR_ID as lastUpdusrId , + a.USE_YN as useYn @@ -56,6 +58,7 @@ a WHERE a.TO_USER_ID = #toUserId# + and a.USE_YN = 'Y' ORDER BY a.NOTIFY_CHK , a.FRST_REGIST_PNTTM desc @@ -80,6 +83,7 @@ , #frstRegisterId# , '' , '' + , 'Y' ) @@ -155,5 +159,10 @@ + + UPDATE VEA_CMM_NOTIFY + SET USE_YN = 'N' + WHERE FRST_REGIST_PNTTM SYSDATE - 7; + \ No newline at end of file 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 e0b72f68..e2d16500 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 @@ -332,7 +332,6 @@ - - + /* cndtnTrgtInfoMngDAO.memoUpdate */ UPDATE SET @@ -464,4 +463,19 @@ ,RMRKS = #rmrks# WHERE SSPN_IDTMT_TRGT_ORD = #sspnIdtmtTrgtOrd# + + + + /* cndtnTrgtInfoMngDAO.memoUpdate */ + UPDATE + SET + REQ_STATE_CD = #reqStateCd# + , EDU_STATE_CD = #eduStateCd# + , LAST_UPDT_PNTTM = SYSDATE + , LAST_UPDUSR_ID = #lastUpdusrId# + WHERE SSPN_IDTMT_TRGT_ORD IN + + #sspnIdtmtTrgtOrdList[]# + + diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml index 416c42c5..892399ae 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml @@ -408,7 +408,12 @@ AND b.prcs_nm LIKE '%'|| #searchKeyword# ||'%' - + + + AND a.DDLN_CD IS null + AND TO_DATE(a.STRT_PNTTM , 'YYYY.MM.DD') TO_DATE(SYSDATE , 'YYYY.MM.DD') + AND TO_DATE(a.END_PNTTM , 'YYYY.MM.DD') >= TO_DATE(SYSDATE , 'YYYY.MM.DD') + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp index 56edb82b..6d931c75 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp @@ -507,11 +507,11 @@ - - - - + + + + @@ -534,14 +534,14 @@ diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cndtnEduAsgnmPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cndtnEduAsgnmPopup.jsp new file mode 100644 index 00000000..8280140e --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cndtnEduAsgnmPopup.jsp @@ -0,0 +1,245 @@ + +<%@ 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="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<% + /** + * @Class Name : instrAsgnmPopup.jsp + * @Description : 강사배치 팝업 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 안주영 + * @since 2022.1.8 + * @version 1.0 + * @see + * + */ +%> + + + + +<%-- --%> + + + 강사배치 팝업 + + + + +
+
+ + + + + + + " /> + + + + + + + +
+
+ + <%--
+
+
+

강사검색

+
+ +
+ + +
+
+
--%> +
+

교육목록

+
+ +
+

건의 접수가 검색되었습니다.

+
+ + <%----%> +
+
+
+ +
- - +<%-- --%> +<%-- --%> - - - - +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> @@ -569,15 +569,19 @@ - - +<%-- --%> +<%-- --%> - - - - - +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%>
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NO대면구분과정명신청기간교육일자신청자/정원
+ + + + + + + () + + ~ + +<%-- ~ --%> + + + / +
+ + + + +
+ +
+ +
+
+
+
+ + +
+
+
+
+ + + + + + + + + + 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 3ef057f4..33171bc9 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp @@ -239,10 +239,211 @@ $(".memoTr").fadeIn(); } } + + function chkAll(obj) { + // 모든 체크박스의 상태를 헤더 체크박스의 상태와 동일하게 설정 + $("input[name='chk']").prop('checked', $(obj).prop('checked')); + } + + + // 대상자 의뢰취소 + function fn_updateReqStatus(p_eduStateCd, p_reqStateCd) { + + var sspnIdtmtTrgtOrdList = []; + + + console.log('Start'); + var chk = false; + // "chk" 이름을 가진 체크박스가 체크된 항목들을 순회 + $("input[name='chk']:checked").each(function() { + var sspnIdtmtTrgtOrdValue = $(this).val(); + sspnIdtmtTrgtOrdList.push(sspnIdtmtTrgtOrdValue); + + // 교육상태가 대기/ 연기 인지 확인 + // 그 외에 값이면 loop 나온 뒤 경고 alert 실행 후 function 종료 + if($(this).data('eduinfo') != 10 + && $(this).data('eduinfo') != 50 + ){ + chk = true; + return; + } + }); + + if(chk){ + alert("교육상태가 '교육대기','연기' 외에 다른 상태값이 있습니다."); + // 초기화 + sspnIdtmtTrgtOrdList = []; + return; + } + + + // 선택된 항목이 없으면 경고 메시지를 표시하고 함수를 종료 + if (sspnIdtmtTrgtOrdList.length === 0) { + alert("선택된 항목이 없습니다. 선택 후 다시 시도하세요."); + return false; + } + + + var dataToSend = { + "sspnIdtmtTrgtOrdList" : sspnIdtmtTrgtOrdList, + "eduStateCd" : p_eduStateCd, + "reqStateCd" : p_reqStateCd + }; + + + if(!confirm("의뢰취소를 하시겠습니까?")){ + return; + } + // AJAX 호출을 통해 서버에 데이터 전송 + this.fn_cmmAjax(dataToSend); + + } + + // 대상자 의뢰취소 - 취소에 취소 (복구) + function fn_updateCancelReqStatus(p_eduStateCd, p_reqStateCd) { + + var sspnIdtmtTrgtOrdList = []; + + + console.log('Start'); + var chk = false; + // "chk" 이름을 가진 체크박스가 체크된 항목들을 순회 + $("input[name='chk']:checked").each(function() { + var sspnIdtmtTrgtOrdValue = $(this).val(); + sspnIdtmtTrgtOrdList.push(sspnIdtmtTrgtOrdValue); + + // 교육상태가 대기/ 연기 인지 확인 + // 그 외에 값이면 loop 나온 뒤 경고 alert 실행 후 function 종료 + if($(this).data('eduinfo') != 60 + ){ + chk = true; + return; + } + }); + + if(chk){ + alert("교육상태가 '교육취소'외에 다른 상태값이 있습니다."); + // 초기화 + sspnIdtmtTrgtOrdList = []; + return; + } + + + // 선택된 항목이 없으면 경고 메시지를 표시하고 함수를 종료 + if (sspnIdtmtTrgtOrdList.length === 0) { + alert("선택된 항목이 없습니다. 선택 후 다시 시도하세요."); + return false; + } + + var dataToSend = { + "sspnIdtmtTrgtOrdList" : sspnIdtmtTrgtOrdList, + "eduStateCd" : p_eduStateCd, + "reqStateCd" : p_reqStateCd + }; + + if(!confirm("의뢰취소복구를 하시겠습니까?")){ + return; + } + this.fn_cmmAjax(dataToSend); + + } + + function fn_cmmAjax(dataToSend){ + + + + var url = ""; + + // 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 fn_eduAsgnm(prcsAplctPrdOrd) { + + + + var sspnIdtmtTrgtOrdList = []; + + + var chk = false; + // "chk" 이름을 가진 체크박스가 체크된 항목들을 순회 + $("input[name='chk']:checked").each(function() { + var sspnIdtmtTrgtOrdValue = $(this).val(); + sspnIdtmtTrgtOrdList.push(sspnIdtmtTrgtOrdValue); + + // 교육상태가 대기/ 연기 인지 확인 + // 그 외에 값이면 loop 나온 뒤 경고 alert 실행 후 function 종료 + if($(this).data('eduinfo') != 10 + ){ + chk = true; + return; + } + }); + + if(chk){ + alert("교육상태가 '교육대기'외에 다른 상태값이 있습니다."); + // 초기화 + sspnIdtmtTrgtOrdList = []; + return; + } + + + // 선택된 항목이 없으면 경고 메시지를 표시하고 함수를 종료 + if (sspnIdtmtTrgtOrdList.length === 0) { + alert("선택된 항목이 없습니다. 선택 후 다시 시도하세요."); + return false; + } + + var dataToSend = { + "sspnIdtmtTrgtOrdList" : sspnIdtmtTrgtOrdList + }; + + + var form = document.popForm; + + form.sspnIdtmtTrgtOrdList.value = sspnIdtmtTrgtOrdList; + +// form.action = ""; + form.action = ""; + + window.open("#", "_securityPop", "scrollbars = no, top=100px, left=100px, height=750px, width=950px"); + form.target = "_securityPop"; + form.submit(); + } + + + + + + 교육과정관리 +
+ +
@@ -374,6 +575,7 @@
+ @@ -388,6 +590,7 @@ + @@ -403,34 +606,37 @@ - ');" style="cursor:pointer;"> -<%-- + + - - - - - - - - ')"> + ')" + tabindex="0" onkeypress="if(event.keyCode == 13){goAdultDetail('')}"> @@ -368,7 +369,7 @@ - + @@ -461,10 +462,10 @@ - - - -
의뢰일 사건번호 관할청
');" style="cursor:pointer;"> --%> -<%-- --%> - +
+ + ');" style="cursor:pointer;"> <%-- --%> + ');" style="cursor:pointer;"> 형제 + ');" style="cursor:pointer;"> + ');" style="cursor:pointer;"> + ');" style="cursor:pointer;"> + ');" style="cursor:pointer;"> + ');" style="cursor:pointer;"> + ');" style="cursor:pointer;"> @@ -473,6 +679,9 @@
+ + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp b/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp index 12c917ad..a9e273c4 100644 --- a/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp @@ -283,7 +283,8 @@
${list.eduHopeDt}
- + @@ -408,7 +409,7 @@
');" style="cursor:pointer;"> + ');" style="cursor:pointer;" tabindex="0" onkeypress="if(event.keyCode == 13){qnaGoDetail('');}"> ');" style="cursor:pointer;"> + ');" style="cursor:pointer;" tabindex="0" onkeypress="if(event.keyCode == 13){qnaGoDetail('');}"> diff --git a/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngList.jsp b/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngList.jsp index 1ce93fbd..0f2c5f78 100644 --- a/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngList.jsp @@ -94,10 +94,10 @@ function fncGoDetail(p_pk){
');" style="cursor:pointer;"> + ');" style="cursor:pointer;" tabindex="0" onkeypress="if(event.keyCode == 13){fncGoDetail('');}"> ');" style="cursor:pointer;"> + ');" style="cursor:pointer;" tabindex="0" onkeypress="if(event.keyCode == 13){fncGoDetail('');}"> diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp index b5919b0a..65c8df14 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp @@ -128,7 +128,7 @@
- + @@ -209,6 +209,7 @@
운영신청 상세 (th 명)을 보여주는 표운영신청 상세 : 신청일, 처리상태 등의 정보제공
+ diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp index 97100822..36b02330 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp @@ -445,7 +445,7 @@ $(document).ready(function(){ -
신청자 정보 : 학교(기관)명, 학교지역특성, 교사명, 성별, 휴대폰, 전화, 이메일, 주소, 담당교과, 생년월일, 체험교실운영여부, 신청경로 등의 정보제공
');" style="cursor:pointer;"> + ');" style="cursor:pointer;" tabindex="0" onkeypress="if(event.keyCode == 13){fncGoDetail('');}"> () diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/popup/eduAplctPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/popup/eduAplctPop.jsp index 44f0251a..33e6f61e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/popup/eduAplctPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/popup/eduAplctPop.jsp @@ -164,7 +164,7 @@ $(document).ready(function(){