diff --git a/src/main/java/kcc/com/cmm/ComDefaultVO.java b/src/main/java/kcc/com/cmm/ComDefaultVO.java index 72df2360..fabc2e78 100644 --- a/src/main/java/kcc/com/cmm/ComDefaultVO.java +++ b/src/main/java/kcc/com/cmm/ComDefaultVO.java @@ -172,6 +172,9 @@ public class ComDefaultVO implements Serializable { private String searchQuery; + private String searchStartRegistPnttm; + private String searchEndRegistPnttm; + public int getBeSort() { return beSort; } @@ -844,4 +847,20 @@ public class ComDefaultVO implements Serializable { this.searchQuery = searchQuery; } + public String getSearchStartRegistPnttm() { + return searchStartRegistPnttm; + } + + public void setSearchStartRegistPnttm(String searchStartRegistPnttm) { + this.searchStartRegistPnttm = searchStartRegistPnttm; + } + + public String getSearchEndRegistPnttm() { + return searchEndRegistPnttm; + } + + public void setSearchEndRegistPnttm(String searchEndRegistPnttm) { + this.searchEndRegistPnttm = searchEndRegistPnttm; + } + } diff --git a/src/main/java/kcc/com/cmm/util/DateUtil.java b/src/main/java/kcc/com/cmm/util/DateUtil.java index 4ae69f21..352ecfe5 100644 --- a/src/main/java/kcc/com/cmm/util/DateUtil.java +++ b/src/main/java/kcc/com/cmm/util/DateUtil.java @@ -222,4 +222,10 @@ public final class DateUtil { LocalDate date = LocalDate.parse(p_date, formatter); return date; } + + public static LocalDate getStringToLocalDateDot(String p_date) { + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd"); + LocalDate date = LocalDate.parse(p_date, formatter); + return date; + } } diff --git a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/service/impl/FndtnEnhanceTrnDAO.java b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/service/impl/FndtnEnhanceTrnDAO.java index cdbe1845..fd61b37b 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/service/impl/FndtnEnhanceTrnDAO.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/service/impl/FndtnEnhanceTrnDAO.java @@ -10,9 +10,9 @@ import kcc.ve.aplct.cpyrgExprnClsrm.exprnClsrmAplct.service.ScholInfoVO; @Repository("fndtnEnhanceTrnDAO") public class FndtnEnhanceTrnDAO extends EgovAbstractDAO { - public void insertIsltn(ScholInfoVO paramVO) throws Exception { +/* public void insertIsltn(ScholInfoVO paramVO) throws Exception { insert("ScholInfoDAO.insertIsltn", paramVO); - } + }*/ /** * L - Page @@ -20,7 +20,7 @@ public class FndtnEnhanceTrnDAO extends EgovAbstractDAO { * @return * @throws Exception */ - public List selectPagingList(ScholInfoVO paramVO) throws Exception { +/* public List selectPagingList(ScholInfoVO paramVO) throws Exception { @SuppressWarnings("unchecked") List list = (List) list("ScholInfoDAO.selectPagingList", paramVO); return list; @@ -56,5 +56,5 @@ public class FndtnEnhanceTrnDAO extends EgovAbstractDAO { public int insertSelectIsltn(ScholInfoVO scholInfoVO) throws Exception { return update("ScholInfoDAO.insertSelectIsltn", scholInfoVO); - } + }*/ } diff --git a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java index 6190625d..36b39242 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -475,6 +475,7 @@ public class FndtnEnhanceTrnController { } + ////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // 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 c8e3b20c..01fe3db5 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/SspnIdtmtService.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/SspnIdtmtService.java @@ -2,6 +2,7 @@ package kcc.ve.aplct.sspnIdtmt.service; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; +import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO; public interface SspnIdtmtService { @@ -9,5 +10,7 @@ public interface SspnIdtmtService { VEEduAplctVO findByAprvlCd(VEEduAplctVO vEEduAplctReqVO); + String findByTrgtNm(CndtnTrgtMngVO cndtnTrgtInfoMngVO); + } diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtDAO.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtDAO.java index 8b40dd30..3dca6b7b 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtDAO.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtDAO.java @@ -6,20 +6,21 @@ import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; import kcc.ve.aplct.cpyrgExprnClsrm.exprnClsrmAplct.service.ScholInfoVO; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; @Repository("sspnIdtmtDAO") public class SspnIdtmtDAO extends EgovAbstractDAO { - - public void insertIsltn(ScholInfoVO paramVO) throws Exception { - insert("ScholInfoDAO.insertIsltn", paramVO); - } - - /** +// +// public void insertIsltn(ScholInfoVO paramVO) throws Exception { +// insert("ScholInfoDAO.insertIsltn", paramVO); +// } + /* + *//** * L - Page * @param scholInfoVO * @return * @throws Exception - */ + *//* public List selectPagingList(ScholInfoVO paramVO) throws Exception { @SuppressWarnings("unchecked") List list = (List) list("ScholInfoDAO.selectPagingList", paramVO); @@ -56,5 +57,9 @@ public class SspnIdtmtDAO extends EgovAbstractDAO { public int insertSelectIsltn(ScholInfoVO scholInfoVO) throws Exception { return update("ScholInfoDAO.insertSelectIsltn", scholInfoVO); - } + }*/ + +// public int findByTrgtNm(VEEduAplctVO vEEduAplctVO) { +// return (int) select("SspnIdtmtDAO.findByTrgtNm", vEEduAplctVO); +// } } 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 8c7607dd..3d4ca594 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 @@ -7,6 +7,8 @@ import org.springframework.stereotype.Service; import kcc.ve.aplct.sspnIdtmt.service.SspnIdtmtService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.impl.VEEduAplctDAO; +import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO; +import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.impl.CndtnTrgtMngDAO; @Service("sspnIdtmtService") public class SspnIdtmtServiceImpl implements SspnIdtmtService { @@ -16,14 +18,23 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService { @Resource(name="vEEduAplctDAO") private VEEduAplctDAO vEEduAplctDAO; + // 기소유예 관련 + @Resource(name="cndtnTrgtInfoMngDAO") + private CndtnTrgtMngDAO cndtnTrgtInfoMngDAO; + + @Override public void insertVeEduAplct(VEEduAplctVO paramVO) { - //C - vEEduAplctDAO.insertVeEduAplct(paramVO); + vEEduAplctDAO.insertVeEduAplct(paramVO); } @Override public VEEduAplctVO findByAprvlCd(VEEduAplctVO vEEduAplctReqVO) { return vEEduAplctDAO.findByAprvlCd(vEEduAplctReqVO); } + + @Override + public String findByTrgtNm(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { + return cndtnTrgtInfoMngDAO.findByTrgtNm(cndtnTrgtInfoMngVO); + } } 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 9f2ac84c..2188d447 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java @@ -40,6 +40,8 @@ import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsMIXService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsOnlnCntntService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsService; +import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngService; +import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO; /** * 교육신청(성인찾아가는교육) @@ -135,6 +137,11 @@ public class SspnIdtmtController { @Resource(name = "eduAplctAdultService") private EduAplctAdultService eduAplctAdultService; + + //과정 관리 + @Resource(name = "cndtnTrgtInfoMngService") + private CndtnTrgtMngService cndtnTrgtInfoMngService; + //코드 @Resource(name="cmmUseDAO") @@ -294,7 +301,7 @@ public class SspnIdtmtController { /** * 교육신청 목록 화면 */ - @RequestMapping("/web/ve/aplct/sspnIdtmt/fndtnEduAplctList.do") + /*@RequestMapping("/web/ve/aplct/sspnIdtmt/fndtnEduAplctList.do") public String fndtnEduAplctList( @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO , ModelMap model @@ -357,7 +364,7 @@ public class SspnIdtmtController { return "/web/ve/aplct/sspnIdtmt/fndtnEduAplctList"; } - /** + *//** * 교육상세 */ @RequestMapping("/web/ve/aplct/sspnIdtmt/eduAplctDetail.do") @@ -399,6 +406,9 @@ public class SspnIdtmtController { //로그인 처리==================================== //로그인 정보 가져오기 + + + String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model); if (!"".equals(s_oprtnLoginCheckNInfo)) { @@ -410,12 +420,12 @@ public class SspnIdtmtController { LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 - + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); vEEduAplctVO.setEduAplctOrd(eduAplctGnrService.getNextStringId()); - vEEduAplctVO.setLctrDivCd("60"); // 기반강화 + vEEduAplctVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_60); // 기소유예 vEEduAplctVO.setAprvlCd("10"); // 승인코드 VE0003 10 - 요청, 20 - 승인, 30 - 반려 // sbmt_pnttm 제출일시 vEEduAplctVO.setSbmtYn("Y"); // 제출여부 @@ -424,15 +434,65 @@ public class SspnIdtmtController { vEEduAplctVO.setUserId(loginVO.getUniqId()); vEEduAplctVO.setPrcsOrd(vEPrcsDetailVO.getPrcsAplctPrdOrd()); - sspnIdtmtService.insertVeEduAplct(vEEduAplctVO); + String result = ""; + try { + + sspnIdtmtService.insertVeEduAplct(vEEduAplctVO); + + + CndtnTrgtMngVO cndtnTrgtMngVO = new CndtnTrgtMngVO(); + + cndtnTrgtMngVO.setUserId(loginVO.getUniqId()); + cndtnTrgtMngVO.setSspnIdtmtTrgtOrd(vEPrcsDetailVO.getSspnIdtmtTrgtOrd()); + + cndtnTrgtInfoMngService.updateUserId(cndtnTrgtMngVO); + + result = "success"; + } catch (Exception e) { + // TODO: handle exception + } + - modelAndView.addObject("result", "success"); + modelAndView.addObject("result", result); return modelAndView; } + /** + * 기반강화연수과정 신청기간 등록 + */ + @RequestMapping("/web/ve/aplct/sspnIdtmt/userConfirmAjax.do") + public ModelAndView userConfirmAjax( + @ModelAttribute("cndtnTrgtInfoMngVO") CndtnTrgtMngVO cndtnTrgtInfoMngVO + , 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; + } + + + String id = sspnIdtmtService.findByTrgtNm(cndtnTrgtInfoMngVO); + + + modelAndView.addObject("result", "success"); + modelAndView.addObject("id", id); + + return modelAndView; + + } + /** * 교육신청 목록 화면 diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java index 989e6585..eb43d708 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java @@ -299,6 +299,10 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { private String unfthYn; //불성실여부 + private String trgtNm; //기소유예 대상자 + + private String vs_clphone; //기소유예 대상자 폰번호 + public String getPrcsAplctPrdOrd() { return prcsAplctPrdOrd; @@ -1523,6 +1527,18 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { public void setNeedTxtbNum(String needTxtbNum) { this.needTxtbNum = needTxtbNum; } + public String getTrgtNm() { + return trgtNm; + } + public void setTrgtNm(String trgtNm) { + this.trgtNm = trgtNm; + } + public String getVs_clphone() { + return vs_clphone; + } + public void setVs_clphone(String vs_clphone) { + this.vs_clphone = vs_clphone; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java index e7723144..cb50d819 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java @@ -5,6 +5,7 @@ import java.util.List; import kcc.let.uss.umt.service.UserManageVO; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduExcelVO; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduSatisfactionExcelVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; public interface VEEduMIXService { @@ -52,4 +53,6 @@ public interface VEEduMIXService { void updateRsltRprtFileId(VEEduAplctVO vEEduAplctVO) throws Exception; //저작권 체험교실 목록 List selectExprnPagingList(VEEduAplctVO paramVO) throws Exception; + + void updateAplctStateCd(VEEduAplctVO vEEduAplctVO); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java index 29e64cd1..3d729714 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java @@ -142,5 +142,9 @@ public class VEEduMIXDAO extends EgovAbstractDAO { @SuppressWarnings("unchecked") List tlist = (List) list("VEEduMIXDAO.selectExprnPagingList", paramVO); return tlist; + } + + public void updateAplctStateCd(VEEduAplctVO vEEduAplctVO) { + update("VEEduMIXDAO.updateAplctStateCd", vEEduAplctVO); } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java index add8b050..bbb06d29 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java @@ -14,6 +14,7 @@ import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduSatisfactionExcelVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; @Service("vEEduMIXService") public class VEEduMIXServiceImpl implements VEEduMIXService { @@ -129,4 +130,9 @@ public class VEEduMIXServiceImpl implements VEEduMIXService { public List selectExprnPagingList(VEEduAplctVO paramVO) throws Exception{ return vEEduMIXDAO.selectExprnPagingList(paramVO); } + + @Override + public void updateAplctStateCd(VEEduAplctVO vEEduAplctVO) { + vEEduMIXDAO.updateAplctStateCd(vEEduAplctVO); + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/web/InstrPrflController.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/web/InstrPrflController.java index b995bf1c..fee9bb03 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/web/InstrPrflController.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/web/InstrPrflController.java @@ -278,7 +278,8 @@ public class InstrPrflController { //강의조사 기간 여부 VELctrDetailVO vELctrDetailVO = new VELctrDetailVO(); - vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATETIME,'yyyymmdd') BETWEEN rsrch_strt_dt and rsrch_end_dt"); + //vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATETIME,'yyyymmdd') BETWEEN rsrch_strt_dt and rsrch_end_dt"); + vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATE,'YYYYMMDD') BETWEEN rsrch_strt_dt and rsrch_end_dt"); vELctrDetailVO = vELctrRsrchMngService.selectDetailWithQuery(vELctrDetailVO); model.addAttribute("vELctrDetailVO", vELctrDetailVO); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/web/lctrTngrInfoStngController.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/web/lctrTngrInfoStngController.java index a827609e..5b137590 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/web/lctrTngrInfoStngController.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/web/lctrTngrInfoStngController.java @@ -154,7 +154,8 @@ public class lctrTngrInfoStngController { //2.오늘이 선택해서 들어온 강의조사의 기간 여부 체크 //날짜 표시 및 제출 버튼 노출 에 사용 VELctrDetailVO vELctrRsrchDetailVO = new VELctrDetailVO(); - vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATETIME,'yyyymmdd') BETWEEN rsrch_strt_dt and rsrch_end_dt " + //vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATETIME,'yyyymmdd') BETWEEN rsrch_strt_dt and rsrch_end_dt " + vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATE,'YYYYMMDD') BETWEEN rsrch_strt_dt and rsrch_end_dt " + " AND rsrch_instr_div='"+vELctrDetailVO.getRsrchInstrDiv()+"' " + " AND stng_yr_mnt='"+vELctrDetailVO.getStngYrMnt()+"' "); //vELctrRsrchDetailVO = vELctrRsrchMngService.selectDetail(vELctrDetailVO); @@ -333,7 +334,8 @@ public class lctrTngrInfoStngController { //2.오늘이 선택해서 들어온 강의조사의 기간 여부 체크 VELctrDetailVO vELctrRsrchDetailVO = new VELctrDetailVO(); - vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATETIME,'yyyymmdd') BETWEEN rsrch_strt_dt and rsrch_end_dt " + //vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATETIME,'yyyymmdd') BETWEEN rsrch_strt_dt and rsrch_end_dt " + vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATE,'YYYYMMDD') BETWEEN rsrch_strt_dt and rsrch_end_dt " + " AND rsrch_instr_div='"+vELctrDetailVO.getRsrchInstrDiv()+"' " + " AND stng_yr_mnt='"+vELctrDetailVO.getStngYrMnt()+"' "); //vELctrRsrchDetailVO = vELctrRsrchMngService.selectDetail(vELctrDetailVO); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmService.java index 08402187..d9708200 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmService.java @@ -17,4 +17,6 @@ public interface VEAPrcsAplctPrdInstrAsgnmService { VEPrcsDetailVO selectAprvlCdEduAplctDetail(VEPrcsDetailVO vEDetailVO); void updateAprvlCdEduAplctDetail(VEPrcsDetailVO vEDetailVO); + + void updateAplctStateCdListAjax(VEPrcsDetailVO vEPrcsDetailVO); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java index b7b946f6..47096603 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 @@ -114,6 +114,7 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { private String eduPlace; //교육장소 private String instrDiv; + private String instrCnt; private String userId; @@ -126,6 +127,8 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { private String dateChk; private Boolean qestRsltExists; + private String trgtNm; + private String sspnIdtmtTrgtOrd; @@ -561,6 +564,12 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { public void setInstrDiv(String instrDiv) { this.instrDiv = instrDiv; } + public String getInstrCnt() { + return instrCnt; + } + public void setInstrCnt(String instrCnt) { + this.instrCnt = instrCnt; + } public String getUserId() { return userId; } @@ -597,6 +606,18 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { public void setQestRsltExists(Boolean qestRsltExists) { this.qestRsltExists = qestRsltExists; } + public String getTrgtNm() { + return trgtNm; + } + public void setTrgtNm(String trgtNm) { + this.trgtNm = trgtNm; + } + public String getSspnIdtmtTrgtOrd() { + return sspnIdtmtTrgtOrd; + } + public void setSspnIdtmtTrgtOrd(String sspnIdtmtTrgtOrd) { + this.sspnIdtmtTrgtOrd = sspnIdtmtTrgtOrd; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java index 7d9c7f0a..e800dde6 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java @@ -36,6 +36,11 @@ public class VEAPrcsAplctPrdInstrAsgnmDAO extends EgovAbstractDAO { public void updateAprvlCdEduAplctDetail(VEPrcsDetailVO vEDetailVO) { delete("VEAPrcsAplctPrdInstrAsgnmDAO.updateAprvlCdEduAplctDetail", vEDetailVO); + } + + public void updateAplctStateCdListAjax(VEPrcsDetailVO vEPrcsDetailVO) { + update("VEAPrcsAplctPrdInstrAsgnmDAO.updateAplctStateCdListAjax", vEPrcsDetailVO); + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java index 3d74ab87..e244db0e 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java @@ -58,4 +58,10 @@ public class VEAPrcsAplctPrdInstrAsgnmServiceImpl implements VEAPrcsAplctPrdInst public void updateAprvlCdEduAplctDetail(VEPrcsDetailVO vEDetailVO) { vEAPrcsAplctPrdInstrAsgnmDAO.updateAprvlCdEduAplctDetail(vEDetailVO); } + + @Override + public void updateAplctStateCdListAjax(VEPrcsDetailVO vEPrcsDetailVO) { + vEAPrcsAplctPrdInstrAsgnmDAO.updateAplctStateCdListAjax(vEPrcsDetailVO); + + } } 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 0d7d858e..1265001f 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,7 @@ package kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service; import java.util.List; + public interface CndtnTrgtMngService { List selectPagingList(CndtnTrgtMngVO cndtnTrgtInfoMngVO); @@ -11,6 +12,8 @@ public interface CndtnTrgtMngService { CndtnTrgtMngVO selectDetail(CndtnTrgtMngVO cndtnTrgtInfoVO); void update(CndtnTrgtMngVO cndtnTrgtInfoMngVO); + + void updateUserId(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 3fd3ad9a..42a7f562 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 @@ -5,6 +5,7 @@ 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; @@ -108,5 +109,13 @@ public class CndtnTrgtMngDAO extends EgovAbstractDAO { update("cndtnTrgtInfoMngDAO.update", cndtnTrgtInfoMngVO); } + public String findByTrgtNm(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { + return (String) select("cndtnTrgtInfoMngDAO.findByTrgtNm", cndtnTrgtInfoMngVO); + } + + public void updateUserId(CndtnTrgtMngVO cndtnTrgtMngVO) { + update("cndtnTrgtInfoMngDAO.updateUserId", cndtnTrgtMngVO); + } + } 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 0b6e9b98..439f1308 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 @@ -8,6 +8,7 @@ import javax.annotation.Resource; import org.springframework.stereotype.Service; import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngService; import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO; @@ -46,6 +47,11 @@ public class CndtnTrgtMngServiceImpl implements CndtnTrgtMngService { cndtnTrgtInfoMngDAO.update(cndtnTrgtInfoMngVO); } + + @Override + public void updateUserId(CndtnTrgtMngVO cndtnTrgtMngVO) { + cndtnTrgtInfoMngDAO.updateUserId(cndtnTrgtMngVO); + } /* //C 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 bb8449d2..eeb85d8b 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java @@ -6,6 +6,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; @@ -612,7 +613,7 @@ public class CndtnPrcsInfoMngController { } /** - * 기반강화연수과정 기간 상세화면 + * 조건부기소유예 기간 상세화면 */ @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.do") public String cndtnEduPrcsAplctPrdMngDetail( @@ -652,7 +653,6 @@ public class CndtnPrcsInfoMngController { List vEPrcsDetailVOList = vEEduMIXService.selectList(paramVO); vEPrcsDetailVOList = egovCryptoUtil.decryptVeEduAplctList(vEPrcsDetailVOList); - System.out.println("===="); //대상 리스트, 페이징 정보 전달 @@ -662,6 +662,7 @@ public class CndtnPrcsInfoMngController { // 강사 배치 정보 { + System.out.println("===="); List vEAPrcsAplctPrdInstrAsgnmList = vEAPrcsAplctPrdInstrAsgnmService.findByPrcsAplctPrdOrd(vEPrcsDetailVO.getPrcsAplctPrdOrd()); List instrAsgnmList = egovCryptoUtil.decryptVEAPrcsAplctPrdInstrAsgnmVOList(vEAPrcsAplctPrdInstrAsgnmList); @@ -670,10 +671,114 @@ public class CndtnPrcsInfoMngController { return "/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail"; } - - + /** - * 기반강화 신청자 상태값 변경 + * 조건부기소유예 기간 상세화면 + */ + @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.do") + public String cndtnEduPrcsAplctCfnMngDetail( + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + + , ModelMap model + , RedirectAttributes redirectAttributes + , HttpSession session + , HttpServletRequest request + ) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + //과정 조회 + VEPrcsDetailVO vEPrcsDetailVODetail = vEPrcsAplctPrdService.selectDetailNewOne4Fndth(vEPrcsDetailVO); + model.addAttribute("info", vEPrcsDetailVODetail); + + //과정 신청자 정보 가져오기 + { + //해당 과정을 제출한 사용자 정보를 가져온다. + VEEduAplctVO paramVO = new VEEduAplctVO(); + paramVO.setPrcsOrd(vEPrcsDetailVO.getPrcsAplctPrdOrd()); + paramVO.setSbmtYn("Y"); + + // 검색 - 날짜 + paramVO.setSearchSmbtStartDt(vEPrcsDetailVO.getSearchSmbtStartDt()); + paramVO.setSearchSmbtEndDt(vEPrcsDetailVO.getSearchSmbtEndDt()); + // 검색 - 검색어 + paramVO.setSearchStatus(vEPrcsDetailVO.getSearchStatus()); + paramVO.setSearchSelStatus(vEPrcsDetailVO.getSearchSelStatus()); + + if(StringUtils.isNotEmpty(vEPrcsDetailVO.getSearchStatus())) { + + String searchQuery = "AND vadi.APLCT_STATE_CD = "+vEPrcsDetailVO.getSearchStatus(); + paramVO.setSearchQuery(searchQuery); + } + + + List vEPrcsDetailVOList = vEEduMIXService.selectList(paramVO); + vEPrcsDetailVOList = egovCryptoUtil.decryptVeEduAplctList(vEPrcsDetailVOList); + + + //대상 리스트, 페이징 정보 전달 + model.addAttribute("listPrcsAplct", vEPrcsDetailVOList); + } + + // 강사 배치 정보 + { + + System.out.println("===="); + List vEAPrcsAplctPrdInstrAsgnmList = vEAPrcsAplctPrdInstrAsgnmService.findByPrcsAplctPrdOrd(vEPrcsDetailVO.getPrcsAplctPrdOrd()); + List instrAsgnmList = egovCryptoUtil.decryptVEAPrcsAplctPrdInstrAsgnmVOList(vEAPrcsAplctPrdInstrAsgnmList); + + model.addAttribute("instrAsgnmList", instrAsgnmList); + } + + return "/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail"; + } + + + /** + * 기소유예 이수 / 미이수 상태 변경 처리 + */ + @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/updateAplctStateCdAjax.do") + public ModelAndView updateAplctStateCdAjax( + @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView("jsonView"); + + //로그인 처리==================================== + //로그인 정보 가져오기 + + String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model); + if (!"".equals(s_oprtnLoginCheckNInfo)) { + modelAndView.addObject("result", "loginFail"); + return modelAndView; + } + + //로그인 처리==================================== + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + try { + + vEEduMIXService.updateAplctStateCd(vEEduAplctVO); + modelAndView.addObject("result", "success"); + } catch (Exception e) { + modelAndView.addObject("result", ""); + } + + + + + return modelAndView; + + } + /** + * 기소유예 신청자 상태값 변경 */ @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/updateEduAplctAprvlCdAjax.do") public ModelAndView updateEduAplctAprvlCd( @@ -718,6 +823,54 @@ public class CndtnPrcsInfoMngController { } + return modelAndView; + + } + + /** + * 기소유예 교육확정상세 > 이수/미이수 체크버튼 처리 + */ + @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/updateAplctStateCdListAjax.do") + public ModelAndView updateAplctStateCdListAjax( + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + , 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(); //권한에 따른 로그인 정보 가져오기 + + try { + // 교육 신청 테이블에 신청자 상태값 update + vEAPrcsAplctPrdInstrAsgnmService.updateAplctStateCdListAjax(vEPrcsDetailVO); + + // 승인 - 승인일 경우 vea_aplct_detail_info TB에 넣어줘야함 + if("20".equals(vEPrcsDetailVO.getAprvlCd())) { + this.aprvlCd20(vEPrcsDetailVO,loginVO.getUniqId()); + } + // 접수취소(반려) - vea_aplct_detail_info TB에 data update + else if("30".equals(vEPrcsDetailVO.getAprvlCd())) + { + this.aprvlCd30(vEPrcsDetailVO); + } + modelAndView.addObject("result", "success"); + + } catch (Exception ex) { + ex.printStackTrace(); + modelAndView.addObject("result", ""); + } + + return modelAndView; } @@ -1037,7 +1190,7 @@ public class CndtnPrcsInfoMngController { @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngList.do") - public String fndthEduPrcsAplctPrdMngList( + public String cndtnEduPrcsAplctPrdMngList( @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO , ModelMap model ) throws Exception { @@ -1094,6 +1247,76 @@ public class CndtnPrcsInfoMngController { return "oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngList"; } + + @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngList.do") + public String cndtnEduPrcsAplctCfnMngList( + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + , ModelMap model + ) 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-조건부 + //교육확정 목록 조회 + vEPrcsDetailVO.setDdlnCd("20"); + + 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-학부모 + + } + List vEPrcsDetailVOList = vEPrcsAplctPrdService.selectPagingList4Fndth(vEPrcsDetailVO); + + //3.pageing step3 + paginationInfo = this.setPagingStep3(vEPrcsDetailVOList, paginationInfo); + + + model.addAttribute("paginationInfo", paginationInfo); + + // 지정된 강사가 있는지 확인 + vEPrcsDetailVOList.stream().forEach(t->{ + + List vEAPrcsAplctPrdInstrAsgnmList = vEAPrcsAplctPrdInstrAsgnmService.findByPrcsAplctPrdOrd(t.getPrcsAplctPrdOrd()); + if(vEAPrcsAplctPrdInstrAsgnmList.size() > 0) { + t.setInstrCnt(Integer.toString(vEAPrcsAplctPrdInstrAsgnmList.size())); + } + + }); + + //대상 리스트, 페이징 정보 전달 + model.addAttribute("list", vEPrcsDetailVOList); + + + return "oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngList"; + } + /** * 기소유예 신청기간 등록 화면 @@ -1156,7 +1379,7 @@ public class CndtnPrcsInfoMngController { /** - * 기반강화연수과정 기간 상세수정화면 + * 조건부기소유예 기간 상세수정화면 */ @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngMdfy.do") public String cndtnEduPrcsAplctPrdMngMdfy( @@ -1219,7 +1442,7 @@ public class CndtnPrcsInfoMngController { /** - * 기반강화연수과정 신청기간 수정 + * 조건부기소유예 신청기간 수정 */ @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngMdfyAjax.do") public ModelAndView cndtnEduPrcsAplctPrdMngMdfyAjax( diff --git a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java index b2e60d5c..7fbc6902 100644 --- a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java +++ b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java @@ -151,6 +151,7 @@ public class OprtnStateMngController { //2. pageing step2 vEEduAplctVO = this.setPagingStep2(vEEduAplctVO, paginationInfo); + vEEduAplctVO.setOrderByQuery("H.LAST_UPDT_PNTTM DESC, A.LAST_UPDT_PNTTM DESC , E.LAST_UPDT_PNTTM DESC"); List vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO); //List복호화 diff --git a/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctMng/web/FndthPrcsAplctMngController.java b/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctMng/web/FndthPrcsAplctMngController.java index 14505cf8..d2401f24 100644 --- a/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctMng/web/FndthPrcsAplctMngController.java +++ b/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctMng/web/FndthPrcsAplctMngController.java @@ -36,6 +36,7 @@ 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.VEAPrcsAplctPrdInstrAsgnmVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsAplctPrdService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsMIXService; @@ -128,66 +129,6 @@ public class FndthPrcsAplctMngController { @Resource(name = "mberManageService") private EgovMberManageService mberManageService; - /** - * 기반강화연수 과정 신청 관리 목록 화면 - */ - @RequestMapping("/kccadr/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctMngList.do") - public String fndthEduPrcsAplctMngList( @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , HttpSession session, ModelMap model ) throws Exception { - - LoginVO user = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; - - //년도 - if(StringUtils.isBlank(vEEduAplctVO.getSearchYear())){ - //vEEduAplctVO.setSearchYear(String.valueOf(LocalDate.now().getYear())); - } - - //월 - if(StringUtils.isBlank(vEEduAplctVO.getSearchMonth())){ - vEEduAplctVO.setSearchMonth(String.valueOf(LocalDate.now().getMonthValue())); - } - if(!"".equals(vEEduAplctVO.getSearchChrgNm())) { - vEEduAplctVO.setSearchChrgNm(egovCryptoUtil.encrypt(vEEduAplctVO.getSearchChrgNm())); - } - - // 요청, 반려건 - //vEEduAplctVO.setSearchNotStatusArr(new String[]{"60"}); - // 청소년 - vEEduAplctVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_50); - //1.pageing step1 - PaginationInfo paginationInfo = this.setPagingStep1(vEEduAplctVO); - - //정렬 - if("".equals(vEEduAplctVO.getSearchSortCnd())){ //최초조회시 최신것 조회List - vEEduAplctVO.setOrderByQuery("A.SBMT_PNTTM DESC"); - }else{ - vEEduAplctVO.setOrderByQuery(vEEduAplctVO.getSearchSortCnd() + " " +vEEduAplctVO.getSearchSortOrd()); - } - - System.out.println("vEEduAplctVO.getOrderByQuery() :: "+ vEEduAplctVO.getOrderByQuery()); - - //2. pageing step2 - vEEduAplctVO = this.setPagingStep2Sub(vEEduAplctVO, paginationInfo); - vEEduAplctVO.setNotiUserId(user.getUniqId()); - vEEduAplctVO.setMenuNo(session.getAttribute("menuNo").toString()); - - - /* - * 리스트 검색에서 교육일자 시작/종료일 입력 없이 검색시 - * 기존 searchEndDt where 조건에 1=2로 되어있어서 리스트 검색이 안되던 것을 - * 저작위 요청사항으로 1=1로 변경하여 날짜 입력이 안되어도 검색이 되도록 수정함 - * 2023-04-28 우영두 - * - * */ - List vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO); - vEEduAplctVOList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduAplctVOList); - vEEduAplctVO.setSearchChrgNm(egovCryptoUtil.decrypt(vEEduAplctVO.getSearchChrgNm())); - //3.pageing step3 - paginationInfo = this.setPagingStep3(vEEduAplctVOList, paginationInfo); - model.addAttribute("paginationInfo", paginationInfo); - //대상 리스트, 페이징 정보 전달 - model.addAttribute("list", vEEduAplctVOList); - return "oprtn/fndthEnhanceTrn/fndthEduPrcsAplctMngList"; - } /** * 기반강화연수 신청 등록 화면 diff --git a/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java b/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java index dfdc7151..384e35f2 100644 --- a/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java +++ b/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java @@ -7,6 +7,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; @@ -240,6 +241,147 @@ public class FndthPrcsAplctPrdMngController { return "oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngList"; ///kccadr/oprtn/fndthEnhanceTrn/fndthEduPrcsMngList.do } + + /** + * 기반강화연수 교육확정관리목록 + */ + @RequestMapping("/kccadr/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngList.do") + public String fndthEduPrcsAplctMngList( @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + , HttpSession session, ModelMap model ) 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("50"); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 + //교육확정 목록 조회 + vEPrcsDetailVO.setDdlnCd("20"); + + 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-학부모 + + } + List vEPrcsDetailVOList = vEPrcsAplctPrdService.selectPagingList4Fndth(vEPrcsDetailVO); + + //3.pageing step3 + paginationInfo = this.setPagingStep3(vEPrcsDetailVOList, paginationInfo); + + + model.addAttribute("paginationInfo", paginationInfo); + + // 지정된 강사가 있는지 확인 + vEPrcsDetailVOList.stream().forEach(t->{ + + List vEAPrcsAplctPrdInstrAsgnmList = vEAPrcsAplctPrdInstrAsgnmService.findByPrcsAplctPrdOrd(t.getPrcsAplctPrdOrd()); + if(vEAPrcsAplctPrdInstrAsgnmList.size() > 0) { + t.setInstrCnt(Integer.toString(vEAPrcsAplctPrdInstrAsgnmList.size())); + } + + }); + + //대상 리스트, 페이징 정보 전달 + model.addAttribute("list", vEPrcsDetailVOList); + + + + + return "oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngList"; + } + + + /** + * 조건부기소유예 기간 상세화면 + */ + @RequestMapping("/kccadr/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.do") + public String cndtnEduPrcsAplctCfnMngDetail( + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + + , ModelMap model + , RedirectAttributes redirectAttributes + , HttpSession session + , HttpServletRequest request + ) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + //과정 조회 + VEPrcsDetailVO vEPrcsDetailVODetail = vEPrcsAplctPrdService.selectDetailNewOne4Fndth(vEPrcsDetailVO); + model.addAttribute("info", vEPrcsDetailVODetail); + + //과정 신청자 정보 가져오기 + { + //해당 과정을 제출한 사용자 정보를 가져온다. + VEEduAplctVO paramVO = new VEEduAplctVO(); + paramVO.setPrcsOrd(vEPrcsDetailVO.getPrcsAplctPrdOrd()); + paramVO.setSbmtYn("Y"); + + if(StringUtils.isNotEmpty(vEPrcsDetailVO.getSearchStatus())) { + + String searchQuery = "AND vadi.APLCT_STATE_CD = "+vEPrcsDetailVO.getSearchStatus(); + paramVO.setSearchQuery(searchQuery); + } + // 검색 - 날짜 + paramVO.setSearchSmbtStartDt(vEPrcsDetailVO.getSearchSmbtStartDt()); + paramVO.setSearchSmbtEndDt(vEPrcsDetailVO.getSearchSmbtEndDt()); + // 검색 - 검색어 + paramVO.setSearchStatus(vEPrcsDetailVO.getSearchStatus()); + + + + List vEPrcsDetailVOList = vEEduMIXService.selectList(paramVO); + vEPrcsDetailVOList = egovCryptoUtil.decryptVeEduAplctList(vEPrcsDetailVOList); + System.out.println("===="); + + + //대상 리스트, 페이징 정보 전달 + model.addAttribute("listPrcsAplct", vEPrcsDetailVOList); + } + + // 강사 배치 정보 + { + + System.out.println("===="); + List vEAPrcsAplctPrdInstrAsgnmList = vEAPrcsAplctPrdInstrAsgnmService.findByPrcsAplctPrdOrd(vEPrcsDetailVO.getPrcsAplctPrdOrd()); + List instrAsgnmList = egovCryptoUtil.decryptVEAPrcsAplctPrdInstrAsgnmVOList(vEAPrcsAplctPrdInstrAsgnmList); + + model.addAttribute("instrAsgnmList", instrAsgnmList); + } + + return "oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail"; + } + /** diff --git a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java index f0a58f79..dbfe0ea4 100644 --- a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java +++ b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java @@ -1735,8 +1735,8 @@ public class OprtnInstrTngrPrflContoller { t_vEInstrDetailVO.setAprvlCd(vEInstrDetailVO.getAprvlCd()); t_vEInstrDetailVO.setFirstIndex(0); - List selectAsgnmInfoT2List = vEInstrMixService.selectAsgnmInfoT2(t_vEInstrDetailVO); - model.addAttribute("asgnmInfoT2List",selectAsgnmInfoT2List); + //List selectAsgnmInfoT2List = vEInstrMixService.selectAsgnmInfoT2(t_vEInstrDetailVO); + //model.addAttribute("asgnmInfoT2List",selectAsgnmInfoT2List); return "/oprtn/tngrVisitEdu/instrMngDetail"; } @@ -1800,7 +1800,8 @@ public class OprtnInstrTngrPrflContoller { //강의조사 기간 여부 VELctrDetailVO vELctrRsrchDetailVO = new VELctrDetailVO(); - vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATETIME,'yyyymmdd') BETWEEN rsrch_strt_dt and rsrch_end_dt " + //vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATETIME,'yyyymmdd') BETWEEN rsrch_strt_dt and rsrch_end_dt " + vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATE,'YYYY.MM.DD') BETWEEN rsrch_strt_dt and rsrch_end_dt " + " AND rsrch_instr_div='"+vELctrDetailVO.getRsrchInstrDiv()+"' " + " AND stng_yr_mnt='"+vELctrDetailVO.getStngYrMnt()+"' "); //vELctrRsrchDetailVO = vELctrRsrchMngService.selectDetail(vELctrDetailVO); @@ -1953,7 +1954,8 @@ public class OprtnInstrTngrPrflContoller { //강의조사 기간 여부 VELctrDetailVO vELctrRsrchDetailVO = new VELctrDetailVO(); - vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATETIME,'yyyymmdd') BETWEEN rsrch_strt_dt and rsrch_end_dt " + //vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATETIME,'yyyymmdd') BETWEEN rsrch_strt_dt and rsrch_end_dt " + vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATE,'YYYYMMDD') BETWEEN rsrch_strt_dt and rsrch_end_dt " + " AND rsrch_instr_div='"+vELctrDetailVO.getRsrchInstrDiv()+"' " + " AND stng_yr_mnt='"+vELctrDetailVO.getStngYrMnt()+"' "); //vELctrRsrchDetailVO = vELctrRsrchMngService.selectDetail(vELctrDetailVO); @@ -2174,7 +2176,8 @@ public class OprtnInstrTngrPrflContoller { //강의조사제출값 저장 try { - vELctrRsrchSbmtService.insert(vELctrDetailVO); + //vELctrRsrchSbmtService.insert(vELctrDetailVO); + vELctrRsrchSbmtService.update(vELctrDetailVO); }catch(Exception ex) { ex.printStackTrace(); } diff --git a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/AdvOprtnLctrRsrchTngrContoller.java b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/AdvOprtnLctrRsrchTngrContoller.java new file mode 100644 index 00000000..be5b78df --- /dev/null +++ b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/AdvOprtnLctrRsrchTngrContoller.java @@ -0,0 +1,234 @@ +package kcc.ve.oprtn.instr.tngrVisitEdu.lctrRsrch.web; + +import java.util.List; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; + +import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import kcc.com.cmm.EgovMessageSource; +import kcc.com.cmm.LoginVO; +import kcc.com.cmm.service.EgovCmmUseService; +import kcc.com.cmm.service.EgovFileMngService; +import kcc.com.cmm.service.EgovFileMngUtil; +import kcc.com.utl.user.service.CheckAdrProcessUtil; +import kcc.com.utl.user.service.CheckFileUtil; +import kcc.com.utl.user.service.CheckLoginUtil; +import kcc.kccadr.accdnt.acd.service.AdjstChangeDateService; +import kcc.kccadr.adjPgrMgr.cclt.service.ConciliatorManageService; +import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; +import kcc.let.utl.fcc.service.EgovCryptoUtil; +import kcc.let.utl.fcc.service.EgovCryptoUtil4VO; +import kcc.let.utl.fcc.service.VEPagingUtil; +import kcc.ve.adv.tngr.stngInfo.service.VEAStngService; +import kcc.ve.adv.tngr.stngInfo.service.VEAStngVO; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailService; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrMixService; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrService; +import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrAreaService; +import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrDetailVO; +import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrMIXService; +import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrPrfrnService; +import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrRsrchMngService; +import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrStngService; +import kcc.ve.instr.tngrVisitEdu.rsdncInfo.service.VERsdncMIXService; + +/** + * OprtnLctrRsrchTngrContoller.java + * 청소년 강의 조사 관리 + * 강의 조사 관리 controller 클래스를 정의한다. + * @author 이지우 + * @since 2021.12.07 + * @version 1.0 + * @see + * + * 
+ * << 개정이력(Modification Information) >>
+ *
+ *   수정일      수정자           수정내용
+ *  -------    --------    ---------------------------
+ *   2021.12.23  이지우          최초 생성
+ *
+ *
+ */ + +@Controller +public class AdvOprtnLctrRsrchTngrContoller { + + private static final Logger LOGGER = LoggerFactory.getLogger(AdvOprtnLctrRsrchTngrContoller.class); + + @Resource(name = "conciliatorManageService") + private ConciliatorManageService conciliatorManageService; + + // eGov 공통 메세지 + @Resource(name = "egovMessageSource") + EgovMessageSource egovMessageSource; + + //로그인 체크 util + @Resource(name = "checkLoginUtil") + private CheckLoginUtil checkLoginUtil; + + //파일 체크 util + @Resource(name = "checkFileUtil") + private CheckFileUtil checkFileUtil; + + //암복호화 유틸 + @Resource(name = "egovCryptoUtil") + EgovCryptoUtil egovCryptoUtil; + + //파일정보의 관리 + @Resource(name = "EgovFileMngService") + private EgovFileMngService fileService; + + //파일 처리 egov + @Resource(name="EgovFileMngUtil") + private EgovFileMngUtil egovFileMngUtil; + + //파일 처리 egov + @Resource(name = "EgovFileMngService") + private EgovFileMngService fileMngService; + + + @Resource(name="adjstChangeDateService") + private AdjstChangeDateService adjstChangeDateService; + + @Resource(name="KccadrMgrUdtService") + private KccadrMgrUdtService kccadrMgrUdtService; + + // 교육신청 서비스단 + @Resource(name = "checkAdrProcessUtil") + private CheckAdrProcessUtil checkAdrProcessUtil; + + //강사 정보 + @Resource(name="vEInstrService") + private VEInstrService vEInstrService; + + //강사상세 정보 + @Resource(name="vEInstrDetailService") + private VEInstrDetailService vEInstrDetailService; + + //강사MIX 정보 + @Resource(name="vEInstrMixService") + private VEInstrMixService vEInstrMixService; + + //강의설정 + @Resource(name = "vELctrStngService") + private VELctrStngService vELctrStngService; + + //강의설정 MIX + @Resource(name = "vELctrMIXService") + private VELctrMIXService vELctrMIXService; + + //강의지역 + @Resource(name = "vELctrAreaService") + private VELctrAreaService vELctrAreaService; + + //강의지역 MIX + @Resource(name = "vERsdncMIXService") + private VERsdncMIXService vERsdncMIXService; + + //강의선호 + @Resource(name = "vELctrPrfrnService") + private VELctrPrfrnService vELctrPrfrnService; + + //VO 암/복호화 + @Resource(name="egovCryptoUtil4VO") + private EgovCryptoUtil4VO egovCryptoUtil4VO; + + // eGov 공통코드 + @Resource(name = "EgovCmmUseService") + private EgovCmmUseService cmmUseService; + + //강의설정 ID + @Resource(name = "lctrStngGnrService") + private EgovIdGnrService lctrStngGnrService; + + //강의지역 ID + @Resource(name = "lctrAreaGnrService") + private EgovIdGnrService lctrAreaGnrService; + + //강의선호 ID + @Resource(name = "prfrnTrgtGnrService") + private EgovIdGnrService prfrnTrgtGnrService; + + //강사신청 임의 ID + @Resource(name = "instrTempGnrService") + private EgovIdGnrService instrTempGnrService; + + // 페이지 유틸 + @Resource(name = "vEPagingUtil") + private VEPagingUtil vEPagingUtil; + + // 강의 조사 + @Resource(name = "vELctrRsrchMngService") + private VELctrRsrchMngService vELctrRsrchMngService; + + //강의설정 관리 + @Resource(name = "vEAStngService") + private VEAStngService vEAStngService; + + /** + * 강의조사관리 기간 설정 팝업 + */ + @RequestMapping("/kccadr/oprtn/tngrVisitEdu/popup/advLctrRsrchStngMngPopup.do") + public String advRndsStngMngPopup( + @ModelAttribute("vEAStngVO") VEAStngVO vEAStngVO + , @ModelAttribute("vELctrDetailVO") VELctrDetailVO vELctrDetailVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + + //String s_userCheckNInfo = checkLoginUtil.userCheckNInfo(model, request); + //if (!"".equals(s_userCheckNInfo)) return s_userCheckNInfo; + + //로그인 처리==================================== + + + try { + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + vEAStngVO.setFrstRegisterId(loginVO.getUniqId()); + + //등록된 해당 년도의 회차리스트 정보 가져오기 + List selectBasicList = vEAStngService.selectList_VEALRS(vEAStngVO); + + model.addAttribute("selectBasicList", selectBasicList); + + + //년도 정보 + //VELctrDetailVO vELctrDetailVO = new VELctrDetailVO(); + List selectStngYrList = vELctrMIXService.selectStngYrList(vELctrDetailVO); + model.addAttribute("selectStngYrList", selectStngYrList); + + //월 정보 + List selectStngMntList = vELctrMIXService.selectStngMntList(vELctrDetailVO); + model.addAttribute("selectStngMntList", selectStngMntList); + + //선택된 조사기간 정보 + //vELctrDetailVO.setStngYrMnt(stngYrMnt); + List selectVELctrDetailVOList = vELctrRsrchMngService.selectList(vELctrDetailVO); + //List selectVELctrDetailVOList = vELctrRsrchMngService.selectPagingList(vELctrDetailVO); + + if (selectVELctrDetailVOList.size()>0) { + model.addAttribute("selectVELctrDetailVO", selectVELctrDetailVOList.get(0)); + } + + }catch(Exception ex) + { + ex.printStackTrace(); + } + + + return "oprtn/tngrVisitEdu/popup/advLctrRsrchStngMngPopup"; + } + +} diff --git a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/OprtnLctrRsrchTngrContoller.java b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/OprtnLctrRsrchTngrContoller.java index 77916b64..241c59a9 100644 --- a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/OprtnLctrRsrchTngrContoller.java +++ b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/OprtnLctrRsrchTngrContoller.java @@ -17,8 +17,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; -import com.ctc.wstx.util.DataUtil; - import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.EgovMessageSource; @@ -219,15 +217,22 @@ public class OprtnLctrRsrchTngrContoller { // 참여현황 참여 카운트 t.setLctrStngOrdSbmt(Long.toString(lctrStngOrdList.stream().filter(s -> StringUtils.isNotEmpty(s)).count())); - LocalDate startDate = DateUtil.getStringToLocalDate(t.getRsrchStrtDt()); - LocalDate endDate = DateUtil.getStringToLocalDate(t.getRsrchEndDt()); + LocalDate startDate = DateUtil.getStringToLocalDateDot(t.getRsrchStrtDt()); + LocalDate endDate = DateUtil.getStringToLocalDateDot(t.getRsrchEndDt()); // 진행중 체크 // 공통 코드 추가 VE0034 01 : 진행전, 02 : 진행중, 03 : 마감 - if(nowDate.isEqual(startDate) || nowDate.isEqual(endDate)) {t.setRsrchState("02");} - else if(nowDate.isBefore(startDate)) {t.setRsrchState("01");} - else if(nowDate.isAfter(endDate)) {t.setRsrchState("03");} + System.out.println("t.getRsrchState()"); + System.out.println(t.getRsrchState()); + System.out.println(t.getRsrchState()); + + if ("".equals(t.getRsrchState()) || t.getRsrchState() ==null) { + if(nowDate.isEqual(startDate) || nowDate.isEqual(endDate)) {t.setRsrchState("02");} + else if(nowDate.isBefore(startDate)) {t.setRsrchState("01");} + else if(nowDate.isAfter(endDate)) {t.setRsrchState("03");} + } + } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -279,12 +284,13 @@ public class OprtnLctrRsrchTngrContoller { //로그인 정보 가져오기 LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa1"); System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa1"+vELctrDetailVO.getStngYrMnt()); System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa1"+vELctrDetailVO.getRsrchStrtDt()); System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa1"); - + /* vELctrDetailVO.setStngYrMnt(vELctrDetailVO.getStngYrMnt().replaceAll("[.]", "")); System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa2"); try { @@ -298,6 +304,7 @@ public class OprtnLctrRsrchTngrContoller { }catch(Exception ex) { ex.printStackTrace(); } + */ System.out.println("aaaaaaaaaaaaaaaaaaaaaaaa3a"); @@ -309,9 +316,12 @@ public class OprtnLctrRsrchTngrContoller { if (selectDupDateCount.getTotCnt()<=0) { //저장 vELctrDetailVO.setFrstRegisterId(loginVO.getUniqId()); - vELctrRsrchMngService.insert(vELctrDetailVO); + int i_ret = vELctrRsrchMngService.update(vELctrDetailVO); - modelAndView.addObject("result", "success"); + if (i_ret>0) modelAndView.addObject("result", "success"); + else modelAndView.addObject("result", "fail"); + + }else { modelAndView.addObject("result", "already"); } @@ -391,5 +401,86 @@ public class OprtnLctrRsrchTngrContoller { return "/oprtn/tngrVisitEdu/lctrRsrchMngDetail"; } + + /** + * 강의조사 요청목록 등록Ajax - + */ + @RequestMapping("lctrRsrchMngDelAjax.do") + public ModelAndView lctrRsrchMngDelAjax( + @ModelAttribute("vELctrDetailVO") VELctrDetailVO vELctrDetailVO + + , ModelMap model + , RedirectAttributes redirectAttributes + , HttpSession session + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + //로그인 처리==================================== + //로그인 정보 가져오기 + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + + + System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa1"); + System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa1"+vELctrDetailVO.getStngYrMnt()); + System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa1"+vELctrDetailVO.getRsrchStrtDt()); + System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa1"); + + //저장 + vELctrDetailVO.setFrstRegisterId(loginVO.getUniqId()); + int i_ret = vELctrRsrchMngService.delete(vELctrDetailVO); + + if (i_ret>0) modelAndView.addObject("result", "success"); + else modelAndView.addObject("result", "fail"); + + + + return modelAndView; + } + /** + * 강의조사 요청목록 상태변경Ajax - + */ + @RequestMapping("lctrRsrchMngChangeAjax.do") + public ModelAndView lctrRsrchMngChangeAjax( + @ModelAttribute("vELctrDetailVO") VELctrDetailVO vELctrDetailVO + + , ModelMap model + , RedirectAttributes redirectAttributes + , HttpSession session + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + //로그인 처리==================================== + //로그인 정보 가져오기 + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + + + System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa1"); + System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa1"+vELctrDetailVO.getStngYrMnt()); + System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa1"+vELctrDetailVO.getRsrchStrtDt()); + System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa1"); + + //저장 + vELctrDetailVO.setFrstRegisterId(loginVO.getUniqId()); + + if ("03".equals(vELctrDetailVO.getRsrchState())) { + vELctrDetailVO.setRsrchState("00");//00-rest, 01-진행전,02-진행중,03-마감 + }else { + vELctrDetailVO.setRsrchState("03");//00-rest, 01-진행전,02-진행중,03-마감 + } + + + int i_ret = vELctrRsrchMngService.update(vELctrDetailVO); + + if (i_ret>0) modelAndView.addObject("result", "success"); + else modelAndView.addObject("result", "fail"); + + + + return modelAndView; + } } diff --git a/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBoard_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBoard_SQL_Tibero.xml index 3974ee9a..d18cf8c4 100644 --- a/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBoard_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBoard_SQL_Tibero.xml @@ -284,19 +284,19 @@ NTCE_ENDDE ) + OR ( TO_CHAR(SYSDATE, 'YYYYMMDDHH24MI') < NTCE_BGNDE OR TO_CHAR(SYSDATE, 'YYYYMMDDHH24MI') > NTCE_ENDDE ) ) ]]> - + - + - + @@ -341,19 +341,19 @@ NTCE_ENDDE ) + OR ( TO_CHAR(SYSDATE, 'YYYYMMDDHH24MI') < NTCE_BGNDE OR TO_CHAR(SYSDATE, 'YYYYMMDDHH24MI') > NTCE_ENDDE ) ) ]]> - + - + - + @@ -519,7 +519,7 @@ SUBSTR(a.NTT_CN, 1, 2000) AS NTT_CN , a.FRST_REGISTER_ID, a.NTCR_NM as FRST_REGISTER_NM, - DATE_FORMAT(a.FRST_REGIST_PNTTM, '%Y-%m-%d') as FRST_REGIST_PNTTM, + TO_CHAR(a.FRST_REGIST_PNTTM, 'YYYY-MM-DD') as FRST_REGIST_PNTTM, a.RDCNT, a.PARNTSCTT_NO, a.ANSWER_AT, @@ -583,13 +583,13 @@ AND a.ANSWER_AT = 'N' /** 답변건 제외 */ ]]> - ( a.NTT_SJ LIKE CONCAT ('%', #searchWrd#,'%') OR a.NTT_CN LIKE CONCAT ('%', #searchWrd#,'%') ) + ( a.NTT_SJ LIKE '%'||#searchWrd#||'%' OR a.NTT_CN LIKE '%'||#searchWrd#||'%' ) - a.NTT_SJ LIKE CONCAT ('%', #searchWrd#,'%') + a.NTT_SJ LIKE '%'||#searchWrd#||'%' - a.NTT_CN LIKE CONCAT ('%', #searchWrd#,'%') + a.NTT_CN LIKE '%'||#searchWrd#||'%' - ( a.NTT_SJ LIKE CONCAT ('%', #searchWrd#,'%') OR a.NTT_CN LIKE CONCAT ('%', #searchWrd#,'%') ) + ( a.NTT_SJ LIKE '%'||#searchWrd#||'%' OR a.NTT_CN LIKE '%'||#searchWrd#||'%' ) - a.NTT_SJ LIKE CONCAT ('%', #searchWrd#,'%') + a.NTT_SJ LIKE '%'||#searchWrd#||'%' - a.NTT_CN LIKE CONCAT ('%', #searchWrd#,'%') + a.NTT_CN LIKE '%'||#searchWrd#||'%' ) A @@ -758,7 +758,7 @@ a.USER_TY_CD, a.USER_POSITION, a.PASSWORD, a.FRST_REGISTER_ID, a.NTCR_NM as FRST_REGISTER_NM, b.OFFM_TELNO, - DATE_FORMAT(a.FRST_REGIST_PNTTM, '%Y-%m-%d %H:%i') as FRST_REGIST_PNTTM, + TO_CHAR(a.FRST_REGIST_PNTTM, 'YYYY-MM-DD HH24:MI') as FRST_REGIST_PNTTM, a.NTCE_BGNDE, a.NTCE_ENDDE, a.RDCNT, a.USE_AT, a.ATCH_FILE_ID, a.BBS_ID, a.NTT_ID, a.PARNTSCTT_NO, a.ANSWER_AT, a.ANSWER_LC, a.SORT_ORDR, @@ -935,9 +935,9 @@ /* BBSManageDAO.getUpDownNttIdNSj */ WHERE 1=1 - + - + - + - + - + - a.NTT_SJ LIKE CONCAT ('%', #searchWrd#,'%') + a.NTT_SJ LIKE '%'||#searchWrd#||'%' - a.NTT_CN LIKE CONCAT ('%', #searchWrd#,'%') + a.NTT_CN LIKE '%'||#searchWrd#||'%' - a.FRST_REGISTER_NM LIKE CONCAT ('%', #searchWrd#,'%') + a.FRST_REGISTER_NM LIKE '%'||#searchWrd#||'%' - a.NTT_ID LIKE CONCAT ('%', #strNttId#,'%') + a.NTT_ID LIKE '%'||#strNttId#||'%' - b.BBS_NM LIKE CONCAT ('%', #bbsNm#,'%') + b.BBS_NM LIKE '%'||#bbsNm#||'%' @@ -1160,7 +1160,7 @@ lettnbbs_a.BBS_ID bbsId, lettnbbs_a.NTT_SJ nttSj, lettnbbs_a.NTT_CN nttCn, - DATE_FORMAT(lettnbbs_a.FRST_REGIST_PNTTM , '%Y-%m-%d') frstRegisterPnttm, + TO_CHAR(lettnbbs_a.FRST_REGIST_PNTTM , 'YYYY-MM-DD') frstRegisterPnttm, 'N' replyAt /* 미답변 */ FROM ( SELECT a.* FROM LETTNBBS a INNER JOIN LETTNBBSMASTER b @@ -1202,7 +1202,7 @@ lettnbbs_b.BBS_ID bbsId, lettnbbs_b.NTT_SJ nttSj, lettnbbs_b.NTT_CN nttCn, - DATE_FORMAT(lettnbbs_b.FRST_REGIST_PNTTM , '%Y-%m-%d') frstRegisterPnttm, + TO_CHAR(lettnbbs_b.FRST_REGIST_PNTTM , 'YYYY-MM-DD') frstRegisterPnttm, 'Y' replyAt /* 답변 */ FROM (SELECT @@ -1313,7 +1313,7 @@ ,a.NTT_CN as nttCn ,a.FRST_REGIST_PNTTM as frstRegisterPnttm ,C.MENU_NM as menuNm ,'' AS menuCours @@ -1347,17 +1347,17 @@ AND b.USE_AT = 'Y' AND b.VIEW_AUTH = 'ROLE_ANONYMOUS' - a.NTT_SJ LIKE CONCAT ('%', #searchWrd#,'%') + a.NTT_SJ LIKE '%'||#searchWrd#||'%' - a.NTT_CN LIKE CONCAT ('%', #searchWrd#,'%') + a.NTT_CN LIKE '%'|| #searchWrd#||'%' - a.NTCR_NM LIKE CONCAT ('%', #searchWrd#,'%') + a.NTCR_NM LIKE '%'|| #searchWrd#||'%' - ( a.NTT_SJ LIKE CONCAT('%' , #searchWrd#, '%') OR - a.NTT_CN LIKE CONCAT('%' , #searchWrd#, '%') ) + ( a.NTT_SJ LIKE '%'|| #searchWrd#|| '%' OR + a.NTT_CN LIKE '%'|| #searchWrd#|| '%' ) /* LIMIT recordCountPerPage OFFSET firstIndex @@ -1398,17 +1398,17 @@ AND b.USE_AT = 'Y' AND b.VIEW_AUTH = 'ROLE_ANONYMOUS' - a.NTT_SJ LIKE CONCAT ('%', #searchWrd#,'%') + a.NTT_SJ LIKE '%'|| #searchWrd#'%' - a.NTT_CN LIKE CONCAT ('%', #searchWrd#,'%') + a.NTT_CN LIKE '%'|| #searchWrd#||'%' - a.NTCR_NM LIKE CONCAT ('%', #searchWrd#,'%') + a.NTCR_NM LIKE '%'||#searchWrd#||'%' - ( a.NTT_SJ LIKE CONCAT('%' , #searchWrd#, '%') OR - a.NTT_CN LIKE CONCAT('%' , #searchWrd#, '%') ) + ( a.NTT_SJ LIKE '%' || #searchWrd#|| '%' OR + a.NTT_CN LIKE '%'|| #searchWrd#|| '%' ) @@ -1444,7 +1444,7 @@ /* BBSManageDAO.selectAdminMainNewBoardCnt */ DATE_FORMAT(SUBDATE(NOW(), INTERVAL 7 DAY) , '%Y-%m-%d') + WHERE TO_CHAR( A.FRST_REGIST_PNTTM , 'YYYY-MM-DD' ) > TO_CHAR(SUBDATE(NOW(), INTERVAL 7 DAY) , '%Y-%m-%d') ]]> @@ -1460,7 +1460,7 @@ a.USER_TY_CD AS userTyCd, a.PASSWORD AS password, a.FRST_REGISTER_ID AS frstRegisterId, - DATE_FORMAT(a.FRST_REGIST_PNTTM, '%Y-%m-%d') as frstRegistPnttm , + TO_CHAR(a.FRST_REGIST_PNTTM, 'YYYY-MM-DD') as frstRegistPnttm , a.RDCNT AS rdCt, a.ATCH_FILE_ID AS atchFileId, a.BBS_ID AS bbsId, diff --git a/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Tibero.xml index 46b3ed34..e57b2ed5 100644 --- a/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Tibero.xml @@ -74,7 +74,7 @@ + /* loginDAO.selectAuthorities */ + /* VEAsgnmMIXDAO.selectList */ SELECT FROM @@ -170,6 +172,7 @@ + /* VEAsgnmMIXDAO.selectAsgnmRqstPagingList */ SELECT COUNT(1) OVER() AS totCnt , userId , @@ -501,49 +505,97 @@ AND AA.cnt = 0 - ORDER BY 1=1 + ORDER BY 1 , AA.eduHopeDt DESC , $orderByQuery$ - LIMIT #recordCountPerPage# OFFSET #firstIndex# + + /* + LIMIT recordCountPerPage OFFSET firstIndex + */ + OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; + /* VEAsgnmMIXDAO.selectAsgnmRqstDetail4 */ SELECT a.edu_hope_dt AS eduHopeDt , a.edu_aplct_ord AS eduAplctOrd , a.edu_chasi_ord AS eduChasiOrd @@ -780,6 +847,7 @@ + /* VEAsgnmMIXDAO.selectAsgnmDetail */ SELECT a.edu_hope_dt AS eduHopeDt , a.edu_aplct_ord AS eduAplctOrd , a.edu_chasi_ord AS eduChasiOrd @@ -3092,7 +3161,7 @@ /* - 온라인 청소년 + 온라인 청소년 VEAsgnmMIXDAO.selectInstrAsgnmOnList_220210 */ SELECT aaaaaa.edu_aplct_ord AS eduAplctOrd , aaaaaa.edu_chasi_ord AS eduChasiOrd @@ -3210,7 +3279,7 @@ /* - 오프라인 청소년 자동배정 + 오프라인 청소년 자동배정 VEAsgnmMIXDAO.selectInstrAsgnmOffList_220210 */ SELECT aaaaaa.edu_aplct_ord AS eduAplctOrd , aaaaaa.edu_chasi_ord AS eduChasiOrd @@ -3326,6 +3395,7 @@ /* - 온라인 청소년 + 온라인 청소년 VEAsgnmMIXDAO.selectInstrAsgnmOnPagingList */ SELECT COUNT(1) OVER() AS totCnt , aaaa.edu_aplct_ord AS eduAplctOrd @@ -3847,13 +3917,16 @@ /* , aaaaaa.lrn_tm_sum/(aaaaaa.mnt_mnmm_tm+1) 9.수업 할당 */ , aaaaaa.lrn_tm_sum /* 9.수업 할당 */ - LIMIT #recordCountPerPage# OFFSET #firstIndex# + /* + LIMIT recordCountPerPage OFFSET firstIndex + */ + OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; @@ -4364,6 +4441,7 @@ + /* VEAsgnmMIXDAO.selectInstrMassAsgnmStep0 */ SELECT b.edu_aplct_ord AS eduAplctOrd , b.edu_chasi_ord AS eduChasiOrd , a.edu_slct_cd AS eduSlctCd /*10-온라인, 20-오프라인*/ @@ -4402,6 +4481,7 @@ + /* VEAsgnmMIXDAO.selectInstrDstncStep1 */ SELECT b.new_addr AS sAddr , d.addr AS iAddr , ifnull(e.oneway_dstnc,'') AS onewayDstnc @@ -4514,6 +4595,7 @@ + /* VEAsgnmMIXDAO.selectInstrDstncStep3 */ SELECT b.new_addr AS sAddr , d.addr AS iAddr , ifnull(e.oneway_dstnc,'') AS onewayDstnc @@ -4688,6 +4771,7 @@ + /* VEAsgnmMIXDAO.selectTtlMntChasiSumDetail */ SELECT aa0.sumMntChasi , bb0.sumMntLctr , CEIL(CAST(aa0.sumMntChasi AS DOUBLE)/bb0.sumMntLctr) AS mxmmChasi @@ -4796,6 +4881,7 @@ + /* VEEduPnltyDAO.selectDetail */ SELECT FROM @@ -103,10 +104,11 @@ + /* VEEduPnltyDAO.selectPagingList */ SELECT COUNT(1) OVER() AS totCnt , @@ -157,7 +160,7 @@ - ORDER BY 1=1 + ORDER BY 1 , a.edu_aplct_ord desc @@ -166,8 +169,10 @@ , $orderByQuery$ - - LIMIT #recordCountPerPage# OFFSET #firstIndex# + /* + LIMIT recordCountPerPage OFFSET firstIndex + */ + OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; 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 7daf7b9b..77fee4fe 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 @@ -109,11 +109,10 @@ /* cndtnTrgtInfoMngDAO.update */ UPDATE - SET - user_id = #userId# - , edu_state_cd = #eduStateCd# - , last_updt_pnttm = SYSDATE - , last_updusr_id = #lastUpdusrId# + SET + edu_state_cd = #eduStateCd# + , last_updt_pnttm = SYSDATE + , last_updusr_id = #lastUpdusrId# , trgt_nm = #trgtNm# , clphone = #clphone# , d_birth = #dBirth# @@ -131,6 +130,18 @@ WHERE sspn_idtmt_trgt_ord = #sspnIdtmtTrgtOrd# + + + + /* cndtnTrgtInfoMngDAO.updateSspnIdtmtTrgtOrd */ + UPDATE + + SET + user_id = #userId# + , req_state_cd = #reqStateCd# + WHERE + sspn_idtmt_trgt_ord = #sspnIdtmtTrgtOrd# + + + + + diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml index cf6c77f0..d5bfb2aa 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml @@ -117,7 +117,7 @@ - + + + + /* 임시.*NOT_SQL_LOG.* VEEduMIXDAO.selectExprnPagingList */ SELECT diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailApptHchkHstry_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailApptHchkHstry_SQL_Tibero.xml index e90efe73..de8b3a1b 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailApptHchkHstry_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailApptHchkHstry_SQL_Tibero.xml @@ -33,7 +33,7 @@ a.hstry_ord AS hstryOrd, a.hstry_cd AS hstryCd, - DATE_FORMAT(a.hstry_pnttm,'%Y-%m-%d') AS hstryPnttm, + TO_CHAR(a.hstry_pnttm,'YYYY-MM-DD') AS hstryPnttm, a.hstry_id AS hstryId, a.hstry_cn AS hstryCn diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml index 729e7710..b3a93969 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml @@ -32,9 +32,9 @@ a.tngr_instr_yn AS tngrInstrYn, a.adult_instr_yn AS adultInstrYn, - DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d') AS frstRegistPnttm, + TO_CHAR(a.frst_regist_pnttm,'YYYY-MM-DD') AS frstRegistPnttm, a.frst_register_id AS frstRegisterId, - DATE_FORMAT(a.last_updt_pnttm,'%Y-%m-%d') AS lastUpdtPnttm, + TO_CHAR(a.last_updt_pnttm,'YYYY-MM-DD') AS lastUpdtPnttm, a.last_updusr_id AS lastUpdusrId @@ -865,8 +865,8 @@ WHERE d.user_id = #userId# AND a.lctr_div_cd = #instrDiv# ORDER BY d.frst_regist_pnttm DESC - - LIMIT 5 OFFSET 0 + + OFFSET 0 ROWS FETCH NEXT 5 ROWS ONLY; @@ -877,7 +877,12 @@ SELECT SUBSTRING(b.edu_hope_dt,1,4) AS eduHopeDt , SUM(b.chasi) chasi , d.yr_mxmm_asgnm_tm AS yrMxmmAsgnmTm - , IF(d.yr_mxmm_asgnm_tm>0, CAST(CAST(SUM(b.chasi) AS DOUBLE)/d.yr_mxmm_asgnm_tm*100 AS DOUBLE),0) AS wCnt + /* + , IF(d.yr_mxmm_asgnm_tm>0, CAST(CAST(SUM(b.chasi) AS NUMBER)/d.yr_mxmm_asgnm_tm*100 AS NUMBER),0) AS wCnt + */ + /* + , CASE WHEN d.yr_mxmm_asgnm_tm>0 THEN CAST(CAST(SUM(b.chasi) AS NUMBER)/d.yr_mxmm_asgnm_tm*100 AS NUMBER) ELSE 0 END AS wCnt + */ FROM ve_lctr_stng d, ve_edu_chasi_instr_asgnm c @@ -896,7 +901,7 @@ /* 배정 대상 년도를 한정 */ - AND SUBSTRING(b.edu_hope_dt,1,4)=DATE_FORMAT(NOW(),'%Y') + AND SUBSTRING(b.edu_hope_dt,1,4)=TO_CHAR(SYSDATE,'YYYY') AND d.use_yn='Y' @@ -907,13 +912,17 @@ AND b.edu_chasi_ord=c.edu_chasi_ord AND b.edu_aplct_ord=a.edu_aplct_ord - AND IFNULL(a.use_yn,'Y')='Y' + AND NVL(a.use_yn,'Y')='Y' /* 청소년 */ AND a.lctr_div_cd='10' /* 교육신청이 확정되고, 강사확정인 경우만 통계 제공 */ AND a.aprvl_cd = '60' AND c.asgnm_aprvl_cd = '30' GROUP BY SUBSTRING(b.edu_hope_dt,1,4) + , d.yr_mxmm_asgnm_tm + /* + , CASE WHEN d.yr_mxmm_asgnm_tm>0 THEN CAST(CAST(SUM(b.chasi) AS NUMBER)/d.yr_mxmm_asgnm_tm*100 AS NUMBER) ELSE 0 END + */ @@ -932,11 +941,15 @@ , aaaa.mntSum , aaaa.instrNm + /* , IF(aaaa.userId IS NOT NULL, CONCAT('(',SUBSTRING(aaaa.userId,INSTR(aaaa.userId,'_')+1)*1,')'),'') AS userIdNum + */ + , CASE WHEN aaaa.userId IS NOT NULL THEN '('||SUBSTRING(aaaa.userId,INSTR(aaaa.userId,'_')+1)*1||')' ELSE '' AS userIdNum , aaaa.yrMxmmAsgnmTm , ROUND(aaaa.achvPer,2) achvPer , aaaa.totCnt + /* , IF(aaaa.asgnmTm1>0,CONCAT(aaaa.asgnmTm1,'(',IFNULL(bbbb.wCntMnt01,aaaa.wCnt),'/',IFNULL(bbbb.areaCnt01,aaaa.areaCnt),')'),aaaa.asgnmTm1) AS asgnmTm1 , IF(aaaa.asgnmTm2>0,CONCAT(aaaa.asgnmTm2,'(',IFNULL(bbbb.wCntMnt02,aaaa.wCnt),'/',IFNULL(bbbb.areaCnt02,aaaa.areaCnt),')'),aaaa.asgnmTm2) AS asgnmTm2 , IF(aaaa.asgnmTm3>0,CONCAT(aaaa.asgnmTm3,'(',IFNULL(bbbb.wCntMnt03,aaaa.wCnt),'/',IFNULL(bbbb.areaCnt03,aaaa.areaCnt),')'),aaaa.asgnmTm3) AS asgnmTm3 @@ -948,7 +961,22 @@ , IF(aaaa.asgnmTm9>0,CONCAT(aaaa.asgnmTm9,'(',IFNULL(bbbb.wCntMnt09,aaaa.wCnt),'/',IFNULL(bbbb.areaCnt09,aaaa.areaCnt),')'),aaaa.asgnmTm9) AS asgnmTm9 , IF(aaaa.asgnmTm10>0,CONCAT(aaaa.asgnmTm10,'(',IFNULL(bbbb.wCntMnt10,aaaa.wCnt),'/',IFNULL(bbbb.areaCnt10,aaaa.areaCnt),')'),aaaa.asgnmTm10) AS asgnmTm10 , IF(aaaa.asgnmTm11>0,CONCAT(aaaa.asgnmTm11,'(',IFNULL(bbbb.wCntMnt11,aaaa.wCnt),'/',IFNULL(bbbb.areaCnt11,aaaa.areaCnt),')'),aaaa.asgnmTm11) AS asgnmTm11 - , IF(aaaa.asgnmTm12>0,CONCAT(aaaa.asgnmTm12,'(',IFNULL(bbbb.wCntMnt12,aaaa.wCnt),'/',IFNULL(bbbb.areaCnt12,aaaa.areaCnt),')'),aaaa.asgnmTm12) AS asgnmTm12 + , IF(aaaa.asgnmTm12>0,CONCAT(aaaa.asgnmTm12,'(',IFNULL(bbbb.wCntMnt12,aaaa.wCnt),'/',IFNULL(bbbb.areaCnt12,aaaa.areaCnt),')'),aaaa.asgnmTm12) AS asgnmTm12 + */ + + , CASE WHEN aaaa.asgnmTm1>0 THEN aaaa.asgnmTm1||'('||NVL(bbbb.wCntMnt01,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt01,aaaa.areaCnt)||')' ELSE aaaa.asgnmTm1 END AS asgnmTm1 + , CASE WHEN aaaa.asgnmTm2>0 THEN aaaa.asgnmTm2||'('||NVL(bbbb.wCntMnt02,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt02,aaaa.areaCnt)||')' ELSE aaaa.asgnmTm2 END AS asgnmTm2 + , CASE WHEN aaaa.asgnmTm3>0 THEN aaaa.asgnmTm3||'('||NVL(bbbb.wCntMnt03,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt03,aaaa.areaCnt)||')' ELSE aaaa.asgnmTm3 END AS asgnmTm3 + , CASE WHEN aaaa.asgnmTm4>0 THEN aaaa.asgnmTm4||'('||NVL(bbbb.wCntMnt04,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt04,aaaa.areaCnt)||')' ELSE aaaa.asgnmTm4 END AS asgnmTm4 + , CASE WHEN aaaa.asgnmTm5>0 THEN aaaa.asgnmTm5||'('||NVL(bbbb.wCntMnt05,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt05,aaaa.areaCnt)||')' ELSE aaaa.asgnmTm5 END AS asgnmTm5 + , CASE WHEN aaaa.asgnmTm6>0 THEN aaaa.asgnmTm6||'('||NVL(bbbb.wCntMnt06,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt06,aaaa.areaCnt)||')' ELSE aaaa.asgnmTm6 END AS asgnmTm6 + , CASE WHEN aaaa.asgnmTm7>0 THEN aaaa.asgnmTm7||'('||NVL(bbbb.wCntMnt07,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt07,aaaa.areaCnt)||')' ELSE aaaa.asgnmTm7 END AS asgnmTm7 + , CASE WHEN aaaa.asgnmTm8>0 THEN aaaa.asgnmTm8||'('||NVL(bbbb.wCntMnt08,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt08,aaaa.areaCnt)||')' ELSE aaaa.asgnmTm8 END AS asgnmTm8 + , CASE WHEN aaaa.asgnmTm9>0 THEN aaaa.asgnmTm9||'('||NVL(bbbb.wCntMnt09,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt09,aaaa.areaCnt)||')' ELSE aaaa.asgnmTm9 END AS asgnmTm9 + , CASE WHEN aaaa.asgnmTm10>0 THEN aaaa.asgnmTm10||'('||NVL(bbbb.wCntMnt10,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt10,aaaa.areaCnt)||')' ELSE aaaa.asgnmTm10 END AS asgnmTm10 + , CASE WHEN aaaa.asgnmTm11>0 THEN aaaa.asgnmTm11||'('||NVL(bbbb.wCntMnt11,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt11,aaaa.areaCnt)||')' ELSE aaaa.asgnmTm11 END AS asgnmTm11 + , CASE WHEN aaaa.asgnmTm12>0 THEN aaaa.asgnmTm12||'('||NVL(bbbb.wCntMnt12,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt12,aaaa.areaCnt)||')' ELSE aaaa.asgnmTm12 END AS asgnmTm12 + FROM ( @@ -956,13 +984,25 @@ , bbb.appt_div AS apptDiv , '' lctrAreaNm , bbb.rsdne + /* , IF (ccc.mon_lctr_yn='Y',1,0) + IF (ccc.tue_lctr_yn='Y',1,0) + IF (ccc.wed_lctr_yn='Y',1,0) + IF (ccc.thu_lctr_yn='Y',1,0) + IF (ccc.fri_lctr_yn='Y',1,0) AS wCnt - , IFNULL(ddd.areaCnt,0) AS areaCnt + */ + , CASE WHEN ccc.mon_lctr_yn='Y' THEN 1 ELSE 0 END + + CASE WHEN ccc.tue_lctr_yn='Y' THEN 1 ELSE 0 END + + CASE WHEN ccc.wed_lctr_yn='Y' THEN 1 ELSE 0 END + + CASE WHEN ccc.thu_lctr_yn='Y' THEN 1 ELSE 0 END + + CASE WHEN ccc.fri_lctr_yn='Y' THEN 1 ELSE 0 END AS wCnt + + , NVL(ddd.areaCnt,0) AS areaCnt , aaa.* , bbb.instr_nm AS instrNm , ccc.yr_mxmm_asgnm_tm AS yrMxmmAsgnmTm + /* , IF (ccc.yr_mxmm_asgnm_tm=0,0,ROUND(CAST(CAST(aaa.mntSum AS DOUBLE)/ifnull(ccc.yr_mxmm_asgnm_tm,1)*100 AS DOUBLE),1)) AS achvPer + */ + , CASE WHEN ccc.yr_mxmm_asgnm_tm=0 THEN 0 + ELSE ROUND(CAST(CAST(aaa.mntSum AS DOUBLE)/NVL(ccc.yr_mxmm_asgnm_tm,1)*100 AS DOUBLE),1) END AS achvPer , COUNT(1) OVER() AS totCnt FROM ( SELECT user_id AS userId , CAST(SUM(IF(mnt='01',chasi,0)) AS INT) AS asgnmTm1 , @@ -1001,7 +1041,7 @@ /* 배정 대상 년도를 한정 */ - AND SUBSTRING(b.edu_hope_dt,1,4)=DATE_FORMAT(NOW(),'%Y') + AND SUBSTRING(b.edu_hope_dt,1,4)=TO_CHAR(SYSDATE,'YYYY') @@ -1122,7 +1162,7 @@ - ORDER BY 1=1 + ORDER BY 1 , aaaa.userId @@ -1130,7 +1170,10 @@ , $orderByQuery$ - LIMIT #recordCountPerPage# OFFSET #firstIndex# + /* + LIMIT recordCountPerPage OFFSET firstIndex + */ + OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_SQL_Tibero.xml index a8ecc6fb..dcaaed4c 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_SQL_Tibero.xml @@ -29,9 +29,9 @@ a.tngr_instr_yn AS tngrInstrYn, a.adult_instr_yn AS adultInstrYn, - DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d') AS frstRegistPnttm, + TO_CHAR(a.frst_regist_pnttm,'YYYY-MM-DD') AS frstRegistPnttm, a.frst_register_id AS frstRegisterId, - DATE_FORMAT(a.last_updt_pnttm,'%Y-%m-%d') AS lastUpdtPnttm, + TO_CHAR(a.last_updt_pnttm,'YYYY-MM-DD') AS lastUpdtPnttm, a.last_updusr_id AS lastUpdusrId diff --git a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrAreaMng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrAreaMng_SQL_Tibero.xml index 6404ae29..888f20fc 100644 --- a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrAreaMng_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrAreaMng_SQL_Tibero.xml @@ -741,7 +741,7 @@ - ORDER BY 1=1 + ORDER BY 1 , a.area_cd desc @@ -750,8 +750,10 @@ , $orderByQuery$ - - LIMIT #recordCountPerPage# OFFSET #firstIndex# + /* + LIMIT recordCountPerPage OFFSET firstIndex + */ + OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; diff --git a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrArea_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrArea_SQL_Tibero.xml index 34044bc8..99829645 100644 --- a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrArea_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrArea_SQL_Tibero.xml @@ -211,7 +211,7 @@ diff --git a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchMng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchMng_SQL_Tibero.xml index af387134..2d32124a 100644 --- a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchMng_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchMng_SQL_Tibero.xml @@ -32,7 +32,9 @@ a.stng_yr_mnt AS stngYrMnt, a.rsrch_strt_dt AS rsrchStrtDt, - a.rsrch_end_dt AS rsrchEndDt, + a.rsrch_end_dt AS rsrchEndDt, + + a.lctr_rsrch_state AS rsrchState, TO_CHAR(a.frst_regist_pnttm,'YYYY-MM-DD') AS frstRegistPnttm, a.frst_register_id AS frstRegisterId, @@ -103,35 +105,65 @@ - - UPDATE - - SET - - last_updt_pnttm=now() - , last_updusr_id=#lastUpdusrId# - - - , rsrch_strt_dt = #rsrchStrtDt# - - - , rsrch_end_dt = #rsrchEndDt# - - + + + /* VELctrRsrchMngDAO.update */ + MERGE INTO + USING DUAL + ON(rsrch_instr_div = #rsrchInstrDiv# + AND stng_yr_mnt = #stngYrMnt#) + WHEN NOT MATCHED THEN + INSERT + ( + + ) + VALUES( + + #rsrchInstrDiv#, + #stngYrMnt#, + + #rsrchStrtDt#, + #rsrchEndDt#, + + + SYSDATE, + #frstRegisterId#, + NULL, + NULL + + ) + WHEN MATCHED THEN + UPDATE + SET last_updt_pnttm = SYSDATE + , last_updusr_id = #frstRegisterId# + + + , rsrch_strt_dt = #rsrchStrtDt# + + + + , rsrch_end_dt = #rsrchEndDt# + + + + + , lctr_rsrch_state = null + + + , lctr_rsrch_state = #rsrchState# + - WHERE - rsrch_instr_div = #rsrchInstrDiv# - AND stng_yr_mnt = #stngYrMnt# + + /* VELctrRsrchMngDAO.delete */ DELETE FROM WHERE rsrch_instr_div = #rsrchInstrDiv# - AND stng_yr = #stngYr# AND stng_yr_mnt = #stngYrMnt# @@ -146,11 +178,16 @@ WHERE 1=1 + + AND a.stng_yr_mnt = #stngYrMnt# + + + $selectPagingListQuery$ - ORDER BY 1=1 + ORDER BY 1 , a.stng_yr_mnt desc @@ -226,13 +263,15 @@ , dddd.instr_div AS instrDiv , dddd.instr_detail_ord AS instrDetailOrd + /* , (SELECT f.one_depth_nm FROM ve_rsdnc f WHERE f.post_id = MAX(eeee.area_cd) GROUP BY f.one_depth_nm ) AS lctrAreaNm - , COUNT(eeee.area_cd) AS lctrAreaCnt + , COUNT(eeee.area_cd) AS lctrAreaCnt + */ FROM ( SELECT aaa.rsrch_instr_div @@ -244,6 +283,7 @@ , aaa.user_id , aaa.qlfct_end_yn , ccc.lctr_stng_ord + /* , IF(NVL(ccc.sun_lctr_yn, ddd.sun_lctr_yn)='Y',1,0) + IF(NVL(ccc.mon_lctr_yn, ddd.mon_lctr_yn)='Y',1,0) + IF(NVL(ccc.tue_lctr_yn, ddd.tue_lctr_yn)='Y',1,0) @@ -251,6 +291,16 @@ + IF(NVL(ccc.thu_lctr_yn, ddd.thu_lctr_yn)='Y',1,0) + IF(NVL(ccc.fri_lctr_yn, ddd.fri_lctr_yn)='Y',1,0) + IF(NVL(ccc.sat_lctr_yn, ddd.sat_lctr_yn)='Y',1,0) AS w_cnt + */ + + , CASE WHEN NVL(ccc.sun_lctr_yn, ddd.sun_lctr_yn)='Y' THEN 1 ELSE 0 END + + CASE WHEN NVL(ccc.mon_lctr_yn, ddd.mon_lctr_yn)='Y' THEN 1 ELSE 0 END + + CASE WHEN NVL(ccc.tue_lctr_yn, ddd.tue_lctr_yn)='Y' THEN 1 ELSE 0 END + + CASE WHEN NVL(ccc.wed_lctr_yn, ddd.wed_lctr_yn)='Y' THEN 1 ELSE 0 END + + CASE WHEN NVL(ccc.thu_lctr_yn, ddd.thu_lctr_yn)='Y' THEN 1 ELSE 0 END + + CASE WHEN NVL(ccc.fri_lctr_yn, ddd.fri_lctr_yn)='Y' THEN 1 ELSE 0 END + + CASE WHEN NVL(ccc.sat_lctr_yn, ddd.sat_lctr_yn)='Y' THEN 1 ELSE 0 END + AS w_cnt , ddd.lctr_stng_ord AS other_lctr_stng_ord , ddd.instr_div , aaa.instr_detail_ord @@ -345,6 +395,7 @@ , dddd.w_cnt , dddd.other_lctr_stng_ord , dddd.instr_div + , dddd.instr_detail_ord diff --git a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchSbmt_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchSbmt_SQL_Tibero.xml index 951e035b..85400307 100644 --- a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchSbmt_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchSbmt_SQL_Tibero.xml @@ -39,9 +39,9 @@ a.lctr_stng_ord AS lctrStngOrd, - DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d') AS frstRegistPnttm, + TO_CHAR(a.frst_regist_pnttm,'YYYY-MM-DD') AS frstRegistPnttm, a.frst_register_id AS frstRegisterId, - DATE_FORMAT(a.last_updt_pnttm,'%Y-%m-%d') AS lastUpdtPnttm, + TO_CHAR(a.last_updt_pnttm,'YYYY-MM-DD') AS lastUpdtPnttm, a.last_updusr_id AS lastUpdusrId, a.strt_dt AS strtDt, @@ -85,7 +85,7 @@ - /* 해당 강의 조사 기간에 대해 강사가 작성한 정보가 있는지 확인 */ + /* 해당 강의 조사 기간에 대해 강사가 작성한 정보가 있는지 확인 VELctrRsrchSbmtDAO.selectDetailNew */ /* 순번데이터 없이 해당 조사 제출을 한 강사 정보가 있는지 확인 하는 것임 since 2023.07.25 */ SELECT @@ -128,27 +128,53 @@ - UPDATE - - SET - - last_updt_pnttm=now() - , last_updusr_id=#lastUpdusrId# - - - , strt_dt = #strtDt# - - - , end_dt = #endDt# - - - - WHERE + /* VELctrRsrchSbmtDAO.update */ + MERGE INTO + USING DUAL + ON( rsrch_instr_div = #rsrchInstrDiv# - AND stng_yr_mnt = #stngYrMnt# + AND stng_yr_mnt = #stngYrMnt# + AND instr_div = #instrDiv# - AND user_id = #userId# - AND lctr_stng_ord = #lctrStngOrd# + AND user_id = #userId# + ) + + WHEN NOT MATCHED THEN + INSERT + ( + + ) + VALUES( + #rsrchInstrDiv#, + #stngYrMnt#, + + #instrDiv#, + #userId#, + #lctrStngOrd#, + + + SYSDATE, + #frstRegisterId#, + NULL, + NULL, + + #strtDt#, + #endDt# + ) + + WHEN MATCHED THEN + UPDATE + SET last_updt_pnttm = SYSDATE + , last_updusr_id = #frstRegisterId# + + + , strt_dt = #strtDt# + + + , end_dt = #endDt# + + + @@ -166,6 +192,7 @@ + /* VELctrRsrchSbmtDAO.selectPagingList */ SELECT COUNT(1) OVER() AS totCnt , diff --git a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrStng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrStng_SQL_Tibero.xml index 21cc882c..6b99d135 100644 --- a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrStng_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrStng_SQL_Tibero.xml @@ -456,6 +456,39 @@ + UPDATE + ( + SELECT cc.use_yn + FROM ve_lctr_stng cc + ,( + SELECT a.instr_div + , a.user_id + , a.lctr_stng_ord + , a.use_yn + FROM ve_lctr_stng a + LEFT OUTER JOIN ve_lctr_stng b + ON( + a.instr_div=b.instr_div + AND a.user_id=b.user_id + AND a.lctr_stng_ord=b.lctr_stng_ord + AND b.instr_div = #instrDiv# + AND b.user_id = #userId# + AND b.lctr_stng_ord = #lctrStngOrd# + ) + WHERE a.instr_div = #instrDiv# + AND a.user_id = #userId# + AND b.lctr_stng_ord IS null + )dd + WHERE cc.instr_div=dd.instr_div + AND cc.user_id=dd.user_id + AND cc.lctr_stng_ord=dd.lctr_stng_ord + )AA + SET AA.use_yn=#useYn# + + + + + UPDATE ve_lctr_stng cc, ( @@ -484,7 +517,6 @@ AND cc.lctr_stng_ord=dd.lctr_stng_ord - DELETE FROM diff --git a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctr_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctr_MIX_SQL_Tibero.xml index b15e1461..2397a518 100644 --- a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctr_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctr_MIX_SQL_Tibero.xml @@ -90,9 +90,9 @@ a.aprvl_id AS aprvlId, a.aprvl_cn AS aprvlCn, - DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d') AS frstRegistPnttm, + TO_CHAR(a.frst_regist_pnttm,'YYYY-MM-DD') AS frstRegistPnttm, a.frst_register_id AS frstRegisterId, - DATE_FORMAT(a.last_updt_pnttm,'%Y-%m-%d') AS lastUpdtPnttm, + TO_CHAR(a.last_updt_pnttm,'YYYY-MM-DD') AS lastUpdtPnttm, a.last_updusr_id AS lastUpdusrId, a.use_yn AS useYn, @@ -229,7 +229,7 @@ - ORDER BY 1=1 + ORDER BY 1 , a.user_id desc @@ -239,7 +239,10 @@ - LIMIT #recordCountPerPage# OFFSET #firstIndex# + /* + LIMIT recordCountPerPage OFFSET firstIndex + */ + OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; @@ -282,7 +285,7 @@ UNION ALL SELECT '12' )bb WHERE 1=1 - AND DATE_FORMAT(DATE_ADD(NOW(), INTERVAL 1 month),'%Y%m')>=CONCAT(aa.stndrd_yr,bb.stndrd_mnt) + AND TO_CHAR(DATE_ADD(SYSDATE, INTERVAL 1 month),'YYYYMM')>=aa.stndrd_yr||bb.stndrd_mnt ORDER BY CONCAT(aa.stndrd_yr,bb.stndrd_mnt) DESC diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml index fee037d4..46fb7a61 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml @@ -116,9 +116,26 @@ + + /* VEAPrcsAplctPrdInstrAsgnmDAO.updateAplctStateCdListAjax */ + UPDATE VE_EDU_APLCT SET aprvl_cd = #aprvlCd# - WHERE edu_aplct_ord IN + WHERE prcs_aplct_prd_ord = #prcsAplctPrdOrd# + AND edu_aplct_ord IN + + #eduAplctOrdList[]# + + + + + + /* VEAPrcsAplctPrdInstrAsgnmDAO.updateAplctStateCdListAjax */ + + UPDATE VEA_APLCT_DETAIL_INFO + SET aplct_state_cd = #aplctStateCd# + WHERE prcs_aplct_prd_ord = #prcsAplctPrdOrd# + AND edu_aplct_ord IN #eduAplctOrdList[]# @@ -126,7 +143,8 @@ /* 강의 지역 - Depth 2 */ SELECT aa.* - , IFNULL(bb.area_cd, 0) cnt + , NVL(bb.area_cd, 0) cnt FROM ( SELECT one_depth_nm AS oneDepthNm /* , a.two_depth_nm AS twoDepthNm */ - , IF(a.two_depth_nm is NULL OR a.two_depth_nm ='',a.three_depth_nm, a.two_depth_nm) AS twoDepthNm + /* + , IF(a.two_depth_nm is NULL OR a.two_depth_nm ='',a.three_depth_nm, a.two_depth_nm) AS twoDepthNm + */ + , CASE WHEN a.two_depth_nm IS NULL OR a.two_depth_nm ='' THEN a.three_depth_nm ELSE a.two_depth_nm END AS twoDepthNm , MAX(post_id) postId FROM ve_rsdnc a WHERE 1=1 @@ -85,13 +88,19 @@ GROUP BY one_depth_nm + /* , IF(a.two_depth_nm is NULL OR a.two_depth_nm ='',a.three_depth_nm, a.two_depth_nm) + */ + , CASE WHEN a.two_depth_nm IS NULL OR a.two_depth_nm ='' THEN a.three_depth_nm ELSE a.two_depth_nm END /* , a.two_depth_nm */ ORDER BY one_depth_nm + /* , IF(a.two_depth_nm is NULL OR a.two_depth_nm ='',a.three_depth_nm, a.two_depth_nm) + */ + , CASE WHEN a.two_depth_nm IS NULL OR a.two_depth_nm ='' THEN a.three_depth_nm ELSE a.two_depth_nm END /* , a.two_depth_nm */ @@ -126,13 +135,16 @@ - /* 강의 지역 - Depth 2 */ + /* 강의 지역 - Depth 2 VERsdncMIXDAO.selectRsdncStep2ListNewAdmin */ SELECT aa.* - , IFNULL(bb.area_cd, 0) cnt + , NVL(bb.area_cd, 0) cnt FROM ( SELECT one_depth_nm AS oneDepthNm /* , a.two_depth_nm AS twoDepthNm */ - , IF(a.two_depth_nm is NULL OR a.two_depth_nm ='',a.three_depth_nm, a.two_depth_nm) AS twoDepthNm + /* + , IF(a.two_depth_nm is NULL OR a.two_depth_nm ='',a.three_depth_nm, a.two_depth_nm) AS twoDepthNm + */ + , CASE WHEN a.two_depth_nm is NULL OR a.two_depth_nm ='' THEN a.three_depth_nm ELSE a.two_depth_nm END AS twoDepthNm , MAX(post_id) postId FROM ve_rsdnc a WHERE 1=1 @@ -219,13 +240,13 @@ GROUP BY one_depth_nm - , IF(a.two_depth_nm is NULL OR a.two_depth_nm ='',a.three_depth_nm, a.two_depth_nm) + , CASE WHEN a.two_depth_nm is NULL OR a.two_depth_nm ='' THEN a.three_depth_nm ELSE a.two_depth_nm END /* , a.two_depth_nm */ ORDER BY one_depth_nm - , IF(a.two_depth_nm is NULL OR a.two_depth_nm ='',a.three_depth_nm, a.two_depth_nm) + , CASE WHEN a.two_depth_nm is NULL OR a.two_depth_nm ='' THEN a.three_depth_nm ELSE a.two_depth_nm END /* , a.two_depth_nm */ diff --git a/src/main/resources/egovframework/sqlmap/ve/tngr/VEAAreaLctrStng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/tngr/VEAAreaLctrStng_SQL_Tibero.xml index 34956a3a..5140ea4b 100644 --- a/src/main/resources/egovframework/sqlmap/ve/tngr/VEAAreaLctrStng_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/tngr/VEAAreaLctrStng_SQL_Tibero.xml @@ -86,8 +86,7 @@ - - + /* VEAAreaLctrStngDAO.update */ MERGE INTO USING DUAL diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp new file mode 100644 index 00000000..0adf6884 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp @@ -0,0 +1,491 @@ + +<%@ 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 : cndtnEduPrcsAplctPrdMngDetail.jsp + * @Description : 기반강화연수 기간 상세화면 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.12.16 조용준 최초 생성 + * @author 조용주 + * @since 2021.12.16 + * @version 1.0 + * @see + * + */ +%> + + +교육과정관리 + + + + + +
+ + +
+
+ + + +
+ + +
+ + + +
+ + + +
+
+ + + +
+

교육확정상세

+
    +
    • +
  • +

    조건부기소유예관리

    +
    • +
  • 교육확정상세
    • +
+
+ + +
+ +
+

교육과정관리

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + + + --%> + +
교육부분 + +
과정 + + +
신청기간 + ~ +
교육장소 + +
교육기간 + ~ +
상세교육과정 + +
정원 + +
상태 + +
+

공개여부(사용여부)

+ 		+ 예 + 아니오 +
+
+ + + +
+
+
+
+
+
+ + +
+
+ + +
+

강사 배치 정보

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
강사명연락처확정여부삭제
+ + + + + + + +
강사 배치 정보가 없습니다.
+
+ + +
+
+
+
+
+
+ +
+
+ + +
+

교육신청자

+
+ + +
+
+
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
신청자(대상자)주민번호 앞자리연락처교육이수여부교육이수상태변경
+ + + () + + + + + + + + + +
데이터가 없습니다.
+
+ + +
+
+
+
+
+
+ + + +
+
+ +
+
+
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngList.jsp new file mode 100644 index 00000000..5dbfd6da --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngList.jsp @@ -0,0 +1,320 @@ + +<%@ 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 : cndtnEduPrcsAplctPrdMngList.jsp + * @Description : 조건부기소유예관리 과정 신청기간관리 목록 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.12.14 조용준 최초 생성 + * @author 조용준 + * @since 2021.12.14 + * @version 1.0 + * @see + * + */ +%> + + + + + + 과정신청기간관리목록 + + + + + " /> + " /> + + + + +
+
+ + +
+

교육확정관리목록

+
    +
    • +
  • +

    조건부기소유예관리

    +
    • +
  • 교육확정관리목록
    • +
+
+ + +
+
+

교육 확정 관리

+
+ +
+
+
+ + +
+ +
+ ~ +
+ +
+ + + +
+
+
+
+

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

+
+ + <%----%> +
+
+ + + + + +
+ + + + + + + + + +<%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + +<%-- --%> + + + + + + + +
NO교육구분코드과정명교육기간신청자/정원상태강사배정
');" style="cursor:pointer;"> + + + + ');" style="cursor:pointer;"> + () + + ~ + + / + + + +<%-- ~ --%> + + + 배정완료 + + + + + +
+
+ + + +
+ +
+ +
+
+
+ + + + + + + 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 fce6bf8e..20883060 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp @@ -115,6 +115,10 @@ + 연락처 + + + 성명 diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMdfy.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMdfy.jsp index 8755741c..3c1b4899 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMdfy.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMdfy.jsp @@ -293,6 +293,10 @@ defaultText='선택' /> + 연락처 + + " /> + 성명 diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp index a930e030..01f57f7b 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp @@ -242,6 +242,10 @@ defaultText='선택' /> + 연락처 + + + 성명 diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngList.jsp index 23941201..984090b7 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngList.jsp @@ -140,7 +140,7 @@
+
+
+

처리상태

+
+
+
+ +
+ ~ +
+ +
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp new file mode 100644 index 00000000..1cefec18 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp @@ -0,0 +1,475 @@ + +<%@ 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 : cndtnEduPrcsAplctPrdMngDetail.jsp + * @Description : 기반강화연수 기간 상세화면 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.12.16 조용준 최초 생성 + * @author 조용주 + * @since 2021.12.16 + * @version 1.0 + * @see + * + */ +%> + + +교육과정관리 + + + + + +
+ + +
+
+ + + +
+ + +
+ + + +
+ + + +
+
+ + + + +
+

교육확정관리상세

+
    +
    • +
  • +

    기반강화연수관리

    +
    • +
  • 교육확정관리상세
    • +
+
+ + +
+ +
+

교육과정관리

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + + + --%> + +
교육부분 + +
과정 + + +
신청기간 + ~ +
교육장소 + +
교육기간 + ~ +
상세교육과정 + +
정원 + +
상태 + +
+

공개여부(사용여부)

+ 		+ 예 + 아니오 +
+
+ + + +
+
+
+
+
+
+ + +
+
+ + +
+

강사 배치 정보

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
강사명연락처확정여부삭제
+ + + + + + + +
강사 배치 정보가 없습니다.
+
+ + +
+
+
+
+
+
+ +
+
+ + +
+

교육신청자

+
+ + +
+
+
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
신청자교육이수여부교육이수상태변경
+ + + + + + + + +
데이터가 없습니다.
+
+ + +
+
+
+
+
+
+ + + +
+
+ +
+
+
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngList.jsp new file mode 100644 index 00000000..077d3a73 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngList.jsp @@ -0,0 +1,320 @@ + +<%@ 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 : cndtnEduPrcsAplctPrdMngList.jsp + * @Description : 조건부기소유예관리 과정 신청기간관리 목록 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.12.14 조용준 최초 생성 + * @author 조용준 + * @since 2021.12.14 + * @version 1.0 + * @see + * + */ +%> + + + + + + 과정신청기간관리목록 + + + + + " /> + " /> + + + + +
+
+ + +
+

교육확정관리목록

+
    +
    • +
  • +

    기반강화연수관리

    +
    • +
  • 교육확정관리목록
    • +
+
+ + +
+
+

교육 확정 관리

+
+ +
+
+
+ + +
+ +
+ ~ +
+ +
+ + + +
+
+
+
+

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

+
+ + <%----%> +
+
+ + + + + +
+ + + + + + + + + +<%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + +<%-- --%> + + + + + + + +
NO교육구분코드과정명교육기간신청자/정원상태강사배정
');" style="cursor:pointer;"> + + + + ');" style="cursor:pointer;"> + () + + ~ + + / + + + +<%-- ~ --%> + + + 배정완료 + + + + + +
+
+ + + +
+ +
+ +
+
+
+ + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp index 78a592f0..f27a9a67 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp @@ -217,7 +217,7 @@
  • -

    조건부기소유예관리

    +

    기반강화연수관리

  • 과정신청기간관리 신청기간 상세
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngDetail.jsp index 198c16e2..c526228b 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngDetail.jsp @@ -319,6 +319,8 @@ --> + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngList.jsp index 7e6613d7..af6fb390 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngList.jsp @@ -132,6 +132,146 @@ }); } } + + //강의조사요청관리 팝업 + function fncLctrRsrchStng() { + //var p_stngYr = $("#stngYr").val(); + + /* + if(p_stngYr==''){ + alert("회차관리 대상 년도를 선택해주세요."); + return false; + } + */ + //document.listForm.yr.value = p_stngYr; + + //document.listForm.authorCode.value = vAuthorCode; + //document.listForm.action = ""; + document.listForm.action = ""; + + window.open("#", "_lctrRsrchPop", "scrollbars = no, top=100px, left=100px, height=800px, width=1000px"); + document.listForm.target = "_lctrRsrchPop"; + document.listForm.submit(); + } + + //강의조사요청관리 팝업 + function fncLctrRsrchDetailStng( + /* + p_stngYr + , p_stngMnt + , p_stngYrMnt + */ + p_stngYrMnt + ) { + + //alert(p_stngYrMnt.substring(0,4)); + //alert(p_stngYrMnt.substring(4,6)); + + //return; + document.listForm.stngYr.value = p_stngYrMnt.substring(0,4); + document.listForm.stngMnt.value = p_stngYrMnt.substring(4,6); + document.listForm.stngYrMnt.value = p_stngYrMnt; + + //document.listForm.authorCode.value = vAuthorCode; + //document.listForm.action = ""; + document.listForm.action = ""; + + window.open("#", "_lctrRsrchPop", "scrollbars = no, top=100px, left=100px, height=800px, width=1000px"); + document.listForm.target = "_lctrRsrchPop"; + document.listForm.submit(); + } + + //강의조사 요청 삭제 + function fncLctrRsrchDelete( + p_instrDiv + , p_stngYrMnt + ){ + + //var p_rgstrPsblTm = $(thisObj).closest("td").find("input[name=rgstrPsblTm]").val(); + //var p_stngYr = $("#stngYr").val(); + //var p_prdDivCd = $("#prdDivCd").val(); + //var p_instrDiv = $("input[name=instrDiv]").val(); + //var p_areaCd = $(thisObj).closest("tr").find("input[name=checkList]").val(); + + //alert(p_areaCd); + + if(confirm("강의조사 일정을 삭제하시겠습니까?")){ + //동일한 값은 업데이트로 수정 + $.ajax({ + type:"POST", + url: "${pageContext.request.contextPath}/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/lctrRsrchMngDelAjax.do", + data:{ + "rsrchInstrDiv" : p_instrDiv, + "stngYrMnt" : p_stngYrMnt, + }, + dataType:'json', + + //async: false, + //processData: false, + //contentType: false, + cache: false, + + success:function(returnData){ + if(returnData.result == "success"){ + alert("삭제 되었습니다."); + location.reload(); + + }else{ + alert("삭제 중 오류가 발생하였습니다."); + } + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + } + } + + //강의조사 마감 처리 + function fncLctrRsrchChgState( + p_instrDiv + , p_stngYrMnt + , p_rsrchState + ){ + + //var p_rgstrPsblTm = $(thisObj).closest("td").find("input[name=rgstrPsblTm]").val(); + //var p_stngYr = $("#stngYr").val(); + //var p_prdDivCd = $("#prdDivCd").val(); + //var p_instrDiv = $("input[name=instrDiv]").val(); + //var p_areaCd = $(thisObj).closest("tr").find("input[name=checkList]").val(); + + //if(confirm("강의조사 일정을 삭제하시겠습니까?")){ + //동일한 값은 업데이트로 수정 + $.ajax({ + type:"POST", + url: "${pageContext.request.contextPath}/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/lctrRsrchMngChangeAjax.do", + data:{ + "rsrchInstrDiv" : p_instrDiv, + "stngYrMnt" : p_stngYrMnt, + "rsrchState" : p_rsrchState, + }, + dataType:'json', + + //async: false, + //processData: false, + //contentType: false, + cache: false, + + success:function(returnData){ + if(returnData.result == "success"){ + alert("처리 되었습니다."); + location.reload(); + + }else{ + alert("처리 중 오류가 발생하였습니다."); + } + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + //} + } 강의조사 요청목록 @@ -141,6 +281,8 @@ " /> " /> + + @@ -162,6 +304,7 @@
+ +
+
+
+
+
+
+ + + + +
+
+
+
- - - - + + + + + @@ -237,23 +400,28 @@ + - ', '');" style="cursor:pointer;"> +<%-- ', '');" style="cursor:pointer;"> --%> + + - +
조사마감일 참여현황 마감여부관리
- - + ${list.stngYrMnt} +<%-- --%> +<%-- --%> - - + ${list.rsrchStrtDt} +<%-- --%> +<%-- --%> - - + ${list.rsrchEndDt} +<%-- --%> +<%-- --%> @@ -263,10 +431,29 @@ +<%-- --%> + + + + + + + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advLctrRsrchStngMngPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advLctrRsrchStngMngPopup.jsp new file mode 100644 index 00000000..23467d69 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advLctrRsrchStngMngPopup.jsp @@ -0,0 +1,548 @@ + +<%@ 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"%> +<% + /** + * @Class Name : advLctrRsrchStngMngPopup.jsp + * @Description : 강의조사관리 팝업 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 김봉호 + * @since 2021.08.21 + * @version 1.0 + * @see + * + */ +%> + + + + + + + + + + + + + + 신청반려팝업 + + + + +
+ + + +
+ + +
+

강의조사요청관리

+
+ + +
+ + +"> +"> +"> +"> +"> +"> + + + + + + + + + + + + + + +
+

필수입력 항목

+

+ + + + + + + +

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
조사시작일조사마감일관리
+
+ 년 + 월 +
+ + 		+
+
+ "> +
+
+ 		+
+ +
+ "> +
+ +
+ 		+
+
+ +
+
+
+ + + + + + + + + +
+
+
+
+ + +
+
+
+
+ +
+ + +
+ + + 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 5dd9892e..23b4d8ed 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 @@ -9,8 +9,8 @@ <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> <% /** - * @Class Name : advRndsStngMngPopup.jsp - * @Description : 강의회차관리 팝업 + * @Class Name : advLctrRsrchStngMngPopup.jsp + * @Description : 강의조사관리 팝업 * @Modification Information * @ * @ 수정일 수정자 수정내용 diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp index 6a65739b..966439da 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp @@ -129,33 +129,25 @@ - + 운영신청 - - 운영승인 - - - 운영반려 - - - 운영취소 - - - 선정완료 - - + 수정요청 - - 수정요청완료 + + 수정완료 - + 운영확정 + + 운영미확정 + - + 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 e9316376..262bd066 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 @@ -69,7 +69,7 @@ $(document).ready(function(){ var data = new FormData(document.getElementById("regForm")); if(confirm("신청하시겠습니까?")){ - var url = "${pageContext.request.contextPath}/web/ve/aplct/sspnIdtmt/eduRegAjax.do"; + var url = "${pageContext.request.contextPath}/web/ve/aplct/fndtnEnhanceTrn/eduRegAjax.do"; console.log(data); $.ajax({ type:"POST", 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 4eb62526..88af2017 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 @@ -67,9 +67,12 @@ $(document).ready(function(){ }); - function fncEduReg(prcsAplctPrdOrd){ - var regForm = document.regForm; - regForm.prcsAplctPrdOrd.value = prcsAplctPrdOrd; + // 대상자 이름, 생년월일, 대상자TB ID + function fncEduReg(trgtNm, dBirth, sspnIdtmtTrgtOrd){ + var form = document.regForm; + form.trgtNm.value = trgtNm; + form.dBirth.value = dBirth; + form.sspnIdtmtTrgtOrd.value = sspnIdtmtTrgtOrd; var data = new FormData(document.getElementById("regForm")); if(confirm("신청하시겠습니까?")){ @@ -85,9 +88,11 @@ $(document).ready(function(){ contentType: false, cache: false, success:function(returnData){ - if(returnData.result == "success"){ + if(returnData.result == "success"){ alert("저장되었습니다."); fncGoList(); + }else{ + alert("교육 신청에 실패하였습니다.\n담당자에게 문의해 주세요."); } }, error:function(request , status, error){ @@ -124,16 +129,61 @@ $(document).ready(function(){ }); } - function fn_eduInquiry(){ - commonPopLayeropen( - "${pageContext.request.contextPath}/web/ve/comm/popup/eduInquiryPopup.do" - , 470 - , 464 -// , data - , "" - , "Y" - , "eduInquiryPopup" - ); + + function fn_confirm(){ + + + var form = document.confirmForm; + var dBirth = $('#dBirth').val().replace(/\./g, ''); + var trgtNm = $('#trgtNm').val(); + + + form.trgtNm.value = trgtNm; + form.dBirth.value = dBirth; + + var data = new FormData(document.getElementById("confirmForm")); + + var url = "${pageContext.request.contextPath}/web/ve/aplct/sspnIdtmt/userConfirmAjax.do"; + $.ajax({ + type:"POST", + url: url, + data: data, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success:function(returnData){ + if(returnData.result == "success"){ + // 대상자 테이블 pk 값 + var sspnIdtmtTrgtOrd = returnData.id; + if(sspnIdtmtTrgtOrd != ''){ + alert("확인되었습니다."); + + // 교육 신청 ajax + // 대상자 이름, 생년월일, 대상자TB ID + fncEduReg(trgtNm, dBirth, sspnIdtmtTrgtOrd); + } else { + alert("대상자에 없습니다."); + } + } + fn_target_confirm_clean(); + + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + + + + + $('#target_confirm_popup-close').click(); + } + + function fn_target_confirm_clean(){ + $('#trgtNm').val(''); + $('#dBirth').val(''); } @@ -141,8 +191,15 @@ $(document).ready(function(){
+
+ + +
+ + +
@@ -248,7 +305,7 @@ $(document).ready(function(){ <%-- --%> - + @@ -278,23 +335,49 @@ $(document).ready(function(){ + +
-
+
-

교육대상자 확인

+

교육대상자 확인

+
-

안녕하세요.
한국저작권위원회입니다.

-
-
-
+
+
+ + + + + + + + + + + + + +
성명 + +
주민번호앞자리 +
+ +
+ +
+
-
- -
-
+
+
+
+
+ + +
+
+
diff --git a/src/main/webapp/innorix/innorix_dev.js b/src/main/webapp/innorix/innorix_dev.js index 3870c665..acc05cad 100644 --- a/src/main/webapp/innorix/innorix_dev.js +++ b/src/main/webapp/innorix/innorix_dev.js @@ -15,7 +15,9 @@ // 운영라이선스 적용 //var INNORIX_LICENSE = "FXA8KvVU99M9Ubbr3Yrz91zCNqyXdWCqUQ/OO1f7lj3nifVZZjuLqJIlHXjosrbPynCFJat5fwEgP/RVXftvXSsXmAHSnTVLYciyf8XmbxH8SLfUdCIEnFo+zL8="; // 개발 라이센스 적용 (만료 23.09.30) -var INNORIX_LICENSE = "SdFY8+dBdt8IY1M4l8fQkBVO1kBmeR6G5LjSUlLcHuYKCGoA14dIM9d5x6nedAJC2YhgbYjAEsedB+RXglSXElTeOto="; +//var INNORIX_LICENSE = "SdFY8+dBdt8IY1M4l8fQkBVO1kBmeR6G5LjSUlLcHuYKCGoA14dIM9d5x6nedAJC2YhgbYjAEsedB+RXglSXElTeOto="; +// 개발 라이센스 적용 (만료 23.12.31) +var INNORIX_LICENSE = "DMhUDOx/+RoGojh0ECXphlfh5DGpLolyCxk7xMuNCAeJ0nqF8SQtKjJdL0jvHs4dgrMIaHrcSeNY+U28a3WFA5No4Pc="; var INNORIX_VERSION = '1.1.3.458'; var INNORIX_WIN_VERSION = '1.1.3.458';