diff --git a/src/main/java/kcc/let/sym/log/clg/service/impl/EgovLoginLogServiceImpl.java b/src/main/java/kcc/let/sym/log/clg/service/impl/EgovLoginLogServiceImpl.java index 0e7fb58f..066655b2 100644 --- a/src/main/java/kcc/let/sym/log/clg/service/impl/EgovLoginLogServiceImpl.java +++ b/src/main/java/kcc/let/sym/log/clg/service/impl/EgovLoginLogServiceImpl.java @@ -86,7 +86,7 @@ public class EgovLoginLogServiceImpl extends EgovAbstractServiceImpl implements int i=loginLogDAO.logInsertWebLoginLogNewStep1(loinLog); //사용자 페이지의 로그만 남김(메뉴에 등록된 페이지만 남김) - System.out.println("=====i====="); + System.out.println("=====i===1=="); System.out.println(i); System.out.println(i); @@ -98,19 +98,22 @@ public class EgovLoginLogServiceImpl extends EgovAbstractServiceImpl implements if (i<=0) { //LETTNADMINMETHOD 테이블에 추가하기 loginLogDAO.logInsertWebLoginLogNewStep3(loinLog); + System.out.println("=====i===11=="); //다시 남기기 i=loginLogDAO.logInsertWebLoginLogNewStep1(loinLog); //사용자 페이지의 로그만 남김(메뉴에 등록된 페이지만 남김) + System.out.println("=====i===12=="); //lettnloginlog 에 남기기 i=loginLogDAO.logInsertWebLoginLogNewStep2(loinLog); //사용자 페이지의 로그만 남김(메뉴에 등록된 페이지만 남김) + System.out.println("=====i===13=="); } }catch(Exception ex) { ex.printStackTrace(); } - System.out.println("=====i====="); + System.out.println("=====i===2=="); System.out.println(i); System.out.println(i); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java index d2b425f2..8c96a704 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java @@ -15,8 +15,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; -import com.dreamsecurity.magicline.util.Log; - import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.EgovMessageSource; import kcc.com.cmm.LoginVO; @@ -451,6 +449,8 @@ public class VEAsgnmController { //대상 리스트, 페이징 정보 전달 model.addAttribute("info", vEInstrAsgnmVOInfo); + System.out.println("+++++++++++++++++++++++++++1111111++++++"); + // 강사 상세정보 VEInstrDetailVO vEInstrDetailVOInfo = new VEInstrDetailVO(); vEInstrDetailVOInfo.setInstrDiv("10"); @@ -459,6 +459,7 @@ public class VEAsgnmController { vEInstrDetailVOInfo = vEInstrDetailService.selectDetail(vEInstrDetailVOInfo); vEInstrDetailVOInfo = egovCryptoUtil.decryptVEInstrDetailVO(vEInstrDetailVOInfo); model.addAttribute("instrInfo", vEInstrDetailVOInfo); + System.out.println("+++++++++++++++++++++++++++1111111+++++2+"); //강사료 상세정보 VEInstrFeeAcmdtVO vEInstrFeeAcmdtVO = new VEInstrFeeAcmdtVO(); @@ -466,6 +467,7 @@ public class VEAsgnmController { vEInstrFeeAcmdtVO.setEduChasiOrd(vEInstrAsgnmVO.getEduChasiOrd()); vEInstrFeeAcmdtVO = vEInstrFeeService.selectDetail(vEInstrFeeAcmdtVO); model.addAttribute("instrFee", vEInstrFeeAcmdtVO); + System.out.println("+++++++++++++++++++++++++++1111111++++3++"); //숙박 VEInstrFeeAcmdtVO acmdtAplct = new VEInstrFeeAcmdtVO(); @@ -486,6 +488,7 @@ public class VEAsgnmController { System.out.println("=========================================== "); + System.out.println("+++++++++++++++++++++++++++1111111++++444++"); String acmdtAplctCheck = "N"; // if(StringUtils.isNotEmpty(acmdtAplct.getAcmdtAplctOrd())) { @@ -501,16 +504,30 @@ public class VEAsgnmController { vEPrcsDetailVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_10); List vEPrcsDetailVOList = vEPrcsService.selectTngrPrcsList(vEPrcsDetailVO); model.addAttribute("eduList", vEPrcsDetailVOList); + System.out.println("+++++++++++++++++++++++++++1111111++++555++"); //전날숙박 조회 VEInstrFeeAcmdtVO acmdtAplctYesterday = new VEInstrFeeAcmdtVO(); acmdtAplctYesterday.setFrstRegisterId(loginVO.getUniqId()); acmdtAplctYesterday.setInstrDiv("10"); - acmdtAplctYesterday.setYesterdayAcmdt(acmdtAplct.getEduHopeDt());//희망교육일 + try { + acmdtAplctYesterday.setYesterdayAcmdt(acmdtAplct.getEduHopeDt());//희망교육일 + + System.out.println("+++++++++++++++++++++++++++1111111++++6666++"); + + + acmdtAplctYesterday = vEAcmdtAplctService.selectDcmdtAplctYesterday(acmdtAplctYesterday); + + model.addAttribute("acmdtAplctYesterday", acmdtAplctYesterday); + + System.out.println("+++++++++++++++++++++++++++1111111+++++77777+"); + + }catch(Exception ex) { + ex.printStackTrace(); + + } - acmdtAplctYesterday = vEAcmdtAplctService.selectDcmdtAplctYesterday(acmdtAplctYesterday); - - model.addAttribute("acmdtAplctYesterday", acmdtAplctYesterday); + //20220222 우영두 추가 //강의내역 NOTI 입력 @@ -527,10 +544,13 @@ public class VEAsgnmController { ex.printStackTrace(); } + System.out.println("+++++++++++++++++++++++++++1111111+++++8888+"); + vEAsgnmNotiVO.setUrlPath(IpUtil.getRequestURI(request)); vEAsgnmNotiService.insertAsgnmNotiInfo(vEAsgnmNotiVO); + System.out.println("+++++++++++++++++++++++++++1111111++++99999++"); }catch(Exception ex) { ex.printStackTrace(); 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 eeb85d8b..0da65eff 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java @@ -1108,7 +1108,7 @@ public class CndtnPrcsInfoMngController { comDefaultVO.setSearchKeyword(vEPrcsDetailVO.getSearchKeyword()); comDefaultVO = egovCryptoUtil.encryptComDefaultVO(comDefaultVO); vEPrcsDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); - selectCondition += "AND a.instr_nm LIKE CONCAT ('%', '" +vEPrcsDetailVO.getSearchKeyword() + "', '%')"; + selectCondition += "AND a.instr_nm LIKE '%'|| '" +vEPrcsDetailVO.getSearchKeyword() + "'|| '%'"; comDefaultVO = egovCryptoUtil.decryptComDefaultVO(comDefaultVO); vEPrcsDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); } 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 384e35f2..f07ce232 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 @@ -1,6 +1,5 @@ package kcc.ve.oprtn.fndtnEnhanceTrn.prcsAplctPrdMng.web; -import java.util.ArrayList; import java.util.List; import javax.annotation.Resource; @@ -13,9 +12,7 @@ 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.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; @@ -25,7 +22,6 @@ import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.ComDefaultCodeVO; import kcc.com.cmm.ComDefaultVO; import kcc.com.cmm.LoginVO; -import kcc.com.cmm.service.CmmnDetailCode; import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.EgovFileMngUtil; import kcc.com.cmm.service.impl.CmmUseDAO; @@ -33,14 +29,11 @@ import kcc.com.cmm.util.StringUtil; import kcc.com.utl.user.service.CheckLoginUtil; import kcc.let.uat.uia.service.SsoLoginVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; -import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrAsgnmVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiService; -import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; -import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsAplctPrdService; @@ -771,7 +764,7 @@ public class FndthPrcsAplctPrdMngController { comDefaultVO.setSearchKeyword(vEPrcsDetailVO.getSearchKeyword()); comDefaultVO = egovCryptoUtil.encryptComDefaultVO(comDefaultVO); vEPrcsDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); - selectCondition += "AND a.instr_nm LIKE CONCAT ('%', '" +vEPrcsDetailVO.getSearchKeyword() + "', '%')"; + selectCondition += "AND a.instr_nm LIKE '%'|| '" +vEPrcsDetailVO.getSearchKeyword() + "'|| '%'"; comDefaultVO = egovCryptoUtil.decryptComDefaultVO(comDefaultVO); vEPrcsDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); } diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java index 94cb7175..0cf9e09c 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java @@ -795,19 +795,24 @@ public class EduAplctMngTngrController { , ModelMap model , HttpServletRequest request ) throws Exception { - //샘플소스 - cntManageVO.setCntId("CNT_000000000000"); - cntManageVO.setCntDtId("CNTDT_0000000000"); + try { + //샘플소스 + cntManageVO.setCntId("CNT_000000000000"); + cntManageVO.setCntDtId("CNTDT_0000000000"); + + cntManageVO = egovCntManageService.selectCntDtDetail(cntManageVO); + model.addAttribute("cntManageVO", cntManageVO); + + //본문적용소스 + cntManageVO.setCntId("CNT_000000000001"); + cntManageVO.setCntDtId("CNTDT_0000000001"); + + cntManageVO = egovCntManageService.selectCntDtDetail(cntManageVO); + model.addAttribute("cntManageVO2", cntManageVO); + }catch(Exception ex) { + ex.printStackTrace(); + } - cntManageVO = egovCntManageService.selectCntDtDetail(cntManageVO); - model.addAttribute("cntManageVO", cntManageVO); - - //본문적용소스 - cntManageVO.setCntId("CNT_000000000001"); - cntManageVO.setCntDtId("CNTDT_0000000001"); - - cntManageVO = egovCntManageService.selectCntDtDetail(cntManageVO); - model.addAttribute("cntManageVO2", cntManageVO); return "oprtn/tngrVisitEdu/eduAplctMailDetail"; } diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngTngrController.java index c8ce4e2d..78f78731 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngTngrController.java @@ -966,7 +966,7 @@ public class EduAsgnmCnfrmMngTngrController { , ModelMap model ) throws Exception { - LoginVO user = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + //LoginVO user = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; //설정 년월 리스트 @@ -975,44 +975,49 @@ public class EduAsgnmCnfrmMngTngrController { model.addAttribute("selectStngYrMntList", selectStngYrMntList); */ - List selectStngYrList = vELctrMIXService.selectStngYrList(vELctrDetailVO); - model.addAttribute("selectStngYrList", selectStngYrList); + try{ + List selectStngYrList = vELctrMIXService.selectStngYrList(vELctrDetailVO); + model.addAttribute("selectStngYrList", selectStngYrList); + + + //1.pageing step1 + //vEInstrDetailVODetail.setPageUnit(10); + System.out.println(vELctrDetailVO.getPageUnit()); + System.out.println(vELctrDetailVO.getPageUnit()); + System.out.println(vELctrDetailVO.getPageUnit()); + System.out.println(vEInstrDetailVODetail.getPageUnit()); + System.out.println(vEInstrDetailVODetail.getPageUnit()); + System.out.println(vEInstrDetailVODetail.getPageUnit()); + System.out.println(vEInstrDetailVODetail.getRecordCountPerPage()); + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo = vEPagingUtil.setPagingStep1_VEInstrDetailVO(paginationInfo, vEInstrDetailVODetail); + + + //2. pageing step2 + vEInstrDetailVODetail = vEPagingUtil.setPagingStep2_VEInstrDetailVO(vEInstrDetailVODetail, paginationInfo); + + + //누계정보2 + vEInstrDetailVODetail.setInstrNm(vEInstrDetailVODetail.getSearchKeyword()); + vEInstrDetailVODetail = egovCryptoUtil.encryptVEInstrDetailVO(vEInstrDetailVODetail); + List selectAsgnmInfoT2List = vEInstrMixService.selectAsgnmInfoT2(vEInstrDetailVODetail); + + //복호화 + selectAsgnmInfoT2List = egovCryptoUtil.decryptVELctrDetailVOList(selectAsgnmInfoT2List); + + + model.addAttribute("list",selectAsgnmInfoT2List); + + + //3.pageing step3 + paginationInfo = vEPagingUtil.setPagingStep3_VELctrDetailVO(selectAsgnmInfoT2List, paginationInfo); + + model.addAttribute("paginationInfo", paginationInfo); + }catch(Exception ex) { + ex.printStackTrace(); + } - //1.pageing step1 - //vEInstrDetailVODetail.setPageUnit(10); - System.out.println(vELctrDetailVO.getPageUnit()); - System.out.println(vELctrDetailVO.getPageUnit()); - System.out.println(vELctrDetailVO.getPageUnit()); - System.out.println(vEInstrDetailVODetail.getPageUnit()); - System.out.println(vEInstrDetailVODetail.getPageUnit()); - System.out.println(vEInstrDetailVODetail.getPageUnit()); - System.out.println(vEInstrDetailVODetail.getRecordCountPerPage()); - PaginationInfo paginationInfo = new PaginationInfo(); - paginationInfo = vEPagingUtil.setPagingStep1_VEInstrDetailVO(paginationInfo, vEInstrDetailVODetail); - - - //2. pageing step2 - vEInstrDetailVODetail = vEPagingUtil.setPagingStep2_VEInstrDetailVO(vEInstrDetailVODetail, paginationInfo); - - - //누계정보2 - vEInstrDetailVODetail.setInstrNm(vEInstrDetailVODetail.getSearchKeyword()); - vEInstrDetailVODetail = egovCryptoUtil.encryptVEInstrDetailVO(vEInstrDetailVODetail); - List selectAsgnmInfoT2List = vEInstrMixService.selectAsgnmInfoT2(vEInstrDetailVODetail); - - //복호화 - selectAsgnmInfoT2List = egovCryptoUtil.decryptVELctrDetailVOList(selectAsgnmInfoT2List); - - - model.addAttribute("list",selectAsgnmInfoT2List); - - - //3.pageing step3 - paginationInfo = vEPagingUtil.setPagingStep3_VELctrDetailVO(selectAsgnmInfoT2List, paginationInfo); - - model.addAttribute("paginationInfo", paginationInfo); - return "oprtn/tngrVisitEdu/mntInstrAsgnmMngList"; 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 d18cf8c4..cb5dc196 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 @@ -890,7 +890,7 @@ - + /* EgovArticleCommentDAO.selectArticleCommentListAll */ SELECT a.ANSWER_NO, a.NTT_ID, a.BBS_ID, - IF(a.MBL_DN = '', '0', '1') AS MBL_DN, + DECODE(a.MBL_DN , '', '0', '1') AS MBL_DN, a.WRTER_NM, a.WRTER_ID, a.PASSWORD, a.ANSWER, a.USE_AT, - DATE_FORMAT(a.FRST_REGIST_PNTTM, '%Y-%m-%d %H:%i:%S') + TO_CHAR(a.FRST_REGIST_PNTTM, 'YYYY-MM-DD HH24:MI:SS') as FRST_REGIST_PNTTM, b.USER_NM as FRST_REGISTER_ID FROM @@ -64,12 +64,12 @@ diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Tibero.xml index af2fcba6..f2546405 100644 --- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Tibero.xml @@ -161,6 +161,7 @@ diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml index 90715494..4cc6b940 100644 --- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml @@ -893,6 +893,82 @@ + + + - + UPDATE diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplctSndHstry_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplctSndHstry_SQL_Tibero.xml index 8444a2a3..10d18a26 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplctSndHstry_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplctSndHstry_SQL_Tibero.xml @@ -28,7 +28,7 @@ a.snd_hstry_ord AS sndHstryOrd, a.snd_cd AS sndCd, - DATE_FORMAT(a.snd_pnttm,'%Y-%m-%d') AS sndPnttm, + TO_CHAR(a.snd_pnttm,'YYYY-MM-DD') AS sndPnttm, a.snd_id AS sndId, a.snd_cn AS sndCn @@ -39,29 +39,55 @@ - INSERT INTO ( - - - )VALUES( - #eduAplctOrd#, - - #sndHstryOrd#, - - #sndCd#, - NOW(), - #sndId#, - #sndCn# + /* VEEduAplctSndHstryDAO.insert */ + + MERGE INTO + USING DUAL + ON( + EDU_APLCT_ORD = #eduAplctOrd# + AND SND_HSTRY_ORD = #sndHstryOrd# ) - ON DUPLICATE KEY UPDATE - snd_pnttm =NOW() - - - , snd_cd = #sndCd# - - , snd_id = #sndId# - - , snd_cn = #sndCn# - + + WHEN NOT MATCHED THEN + INSERT + ( + + ) + VALUES( + #eduAplctOrd#, + + #sndHstryOrd#, + + #sndCd#, + SYSDATE, + #sndId#, + SUBSTR(#sndCn#,0,950) + + /* + sndCn + */ + + + + ) + WHEN MATCHED THEN + UPDATE + SET + snd_pnttm = SYSDATE + + + , snd_cd = #sndCd# + + + , snd_id = #sndId# + + + /* + , snd_cn = sndCn + */ + , snd_cn = SUBSTR(#sndCn#,0,950) + + diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplctUnqIsues_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplctUnqIsues_SQL_Tibero.xml index 76d796eb..0c054b97 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplctUnqIsues_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplctUnqIsues_SQL_Tibero.xml @@ -34,10 +34,10 @@ a.unq_isues_cn AS unqIsuesCn, - 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, (SELECT user_nm FROM lettnemplyrinfo b WHERE a.frst_register_id = b.esntl_id) AS frstRegisterNm, - 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/instr/VEInstr_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml index 8c1aa097..1474316b 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 @@ -439,7 +439,7 @@ ,ccccc.lrn_tm_sum_yr AS lrnTmSumYr ,d.yr_mxmm_asgnm_tm AS yrMxmmAsgnmTm - ,IF(d.yr_mxmm_asgnm_tm>0,round(CAST(ccccc.lrn_tm_sum_yr as double)/CAST(d.yr_mxmm_asgnm_tm as double)*100,0),0) AS yrPer + ,IF(d.yr_mxmm_asgnm_tm>0,round(CAST(ccccc.lrn_tm_sum_yr as NUMBER)/CAST(d.yr_mxmm_asgnm_tm as NUMBER)*100,0),0) AS yrPer FROM ve_instr a @@ -944,7 +944,7 @@ /* , IF(aaaa.userId IS NOT NULL, CONCAT('(',SUBSTR(aaaa.userId,INSTR(aaaa.userId,'_')+1)*1,')'),'') AS userIdNum */ - , CASE WHEN aaaa.userId IS NOT NULL THEN '('||SUBSTR(aaaa.userId,INSTR(aaaa.userId,'_')+1)*1||')' ELSE '' AS userIdNum + , CASE WHEN aaaa.userId IS NOT NULL THEN '('||SUBSTR(aaaa.userId,INSTR(aaaa.userId,'_')+1)*1||')' ELSE '' END AS userIdNum , aaaa.yrMxmmAsgnmTm , ROUND(aaaa.achvPer,2) achvPer , aaaa.totCnt @@ -964,18 +964,18 @@ , 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 + , CASE WHEN aaaa.asgnmTm1>0 THEN TO_CHAR(aaaa.asgnmTm1)||'('||NVL(bbbb.wCntMnt01,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt01,aaaa.areaCnt)||')' ELSE TO_CHAR(aaaa.asgnmTm1) END AS asgnmTm1 + , CASE WHEN aaaa.asgnmTm2>0 THEN TO_CHAR(aaaa.asgnmTm2)||'('||NVL(bbbb.wCntMnt02,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt02,aaaa.areaCnt)||')' ELSE TO_CHAR(aaaa.asgnmTm2) END AS asgnmTm2 + , CASE WHEN aaaa.asgnmTm3>0 THEN TO_CHAR(aaaa.asgnmTm3)||'('||NVL(bbbb.wCntMnt03,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt03,aaaa.areaCnt)||')' ELSE TO_CHAR(aaaa.asgnmTm3) END AS asgnmTm3 + , CASE WHEN aaaa.asgnmTm4>0 THEN TO_CHAR(aaaa.asgnmTm4)||'('||NVL(bbbb.wCntMnt04,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt04,aaaa.areaCnt)||')' ELSE TO_CHAR(aaaa.asgnmTm4) END AS asgnmTm4 + , CASE WHEN aaaa.asgnmTm5>0 THEN TO_CHAR(aaaa.asgnmTm5)||'('||NVL(bbbb.wCntMnt05,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt05,aaaa.areaCnt)||')' ELSE TO_CHAR(aaaa.asgnmTm5) END AS asgnmTm5 + , CASE WHEN aaaa.asgnmTm6>0 THEN TO_CHAR(aaaa.asgnmTm6)||'('||NVL(bbbb.wCntMnt06,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt06,aaaa.areaCnt)||')' ELSE TO_CHAR(aaaa.asgnmTm6) END AS asgnmTm6 + , CASE WHEN aaaa.asgnmTm7>0 THEN TO_CHAR(aaaa.asgnmTm7)||'('||NVL(bbbb.wCntMnt07,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt07,aaaa.areaCnt)||')' ELSE TO_CHAR(aaaa.asgnmTm7) END AS asgnmTm7 + , CASE WHEN aaaa.asgnmTm8>0 THEN TO_CHAR(aaaa.asgnmTm8)||'('||NVL(bbbb.wCntMnt08,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt08,aaaa.areaCnt)||')' ELSE TO_CHAR(aaaa.asgnmTm8) END AS asgnmTm8 + , CASE WHEN aaaa.asgnmTm9>0 THEN TO_CHAR(aaaa.asgnmTm9)||'('||NVL(bbbb.wCntMnt09,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt09,aaaa.areaCnt)||')' ELSE TO_CHAR(aaaa.asgnmTm9) END AS asgnmTm9 + , CASE WHEN aaaa.asgnmTm10>0 THEN TO_CHAR(aaaa.asgnmTm10)||'('||NVL(bbbb.wCntMnt10,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt10,aaaa.areaCnt)||')' ELSE TO_CHAR(aaaa.asgnmTm10) END AS asgnmTm10 + , CASE WHEN aaaa.asgnmTm11>0 THEN TO_CHAR(aaaa.asgnmTm11)||'('||NVL(bbbb.wCntMnt11,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt11,aaaa.areaCnt)||')' ELSE TO_CHAR(aaaa.asgnmTm11) END AS asgnmTm11 + , CASE WHEN aaaa.asgnmTm12>0 THEN TO_CHAR(aaaa.asgnmTm12)||'('||NVL(bbbb.wCntMnt12,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt12,aaaa.areaCnt)||')' ELSE TO_CHAR(aaaa.asgnmTm12) END AS asgnmTm12 @@ -1002,27 +1002,27 @@ , 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 + ELSE ROUND(CAST(CAST(aaa.mntSum AS NUMBER)/NVL(ccc.yr_mxmm_asgnm_tm,1)*100 AS NUMBER),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 , - CAST(SUM(IF(mnt='02',chasi,0)) AS INT) AS asgnmTm2 , - CAST(SUM(IF(mnt='03',chasi,0)) AS INT) AS asgnmTm3 , - CAST(SUM(IF(mnt='04',chasi,0)) AS INT) AS asgnmTm4 , - CAST(SUM(IF(mnt='05',chasi,0)) AS INT) AS asgnmTm5 , - CAST(SUM(IF(mnt='06',chasi,0)) AS INT) AS asgnmTm6 , - CAST(SUM(IF(mnt='07',chasi,0)) AS INT) AS asgnmTm7 , - CAST(SUM(IF(mnt='08',chasi,0)) AS INT) AS asgnmTm8 , - CAST(SUM(IF(mnt='09',chasi,0)) AS INT) AS asgnmTm9 , - CAST(SUM(IF(mnt='10',chasi,0)) AS INT) AS asgnmTm10 , - CAST(SUM(IF(mnt='11',chasi,0)) AS INT) AS asgnmTm11 , - CAST(SUM(IF(mnt='12',chasi,0)) AS INT) AS asgnmTm12 , - CAST(SUM(IF(mnt='01',chasi,0)) +SUM(IF(mnt='02',chasi,0)) +SUM(IF(mnt='03',chasi,0)) - +SUM(IF(mnt='04',chasi,0)) +SUM(IF(mnt='05',chasi,0)) +SUM(IF(mnt='06',chasi,0)) - +SUM(IF(mnt='07',chasi,0)) +SUM(IF(mnt='08',chasi,0)) +SUM(IF(mnt='09',chasi,0)) - +SUM(IF(mnt='10',chasi,0)) +SUM(IF(mnt='11',chasi,0)) +SUM(IF(mnt='12',chasi,0)) AS INT) AS mntSum + CAST(SUM(DECODE(mnt,'01',chasi,0)) AS INT) AS asgnmTm1 , + CAST(SUM(DECODE(mnt,'02',chasi,0)) AS INT) AS asgnmTm2 , + CAST(SUM(DECODE(mnt,'03',chasi,0)) AS INT) AS asgnmTm3 , + CAST(SUM(DECODE(mnt,'04',chasi,0)) AS INT) AS asgnmTm4 , + CAST(SUM(DECODE(mnt,'05',chasi,0)) AS INT) AS asgnmTm5 , + CAST(SUM(DECODE(mnt,'06',chasi,0)) AS INT) AS asgnmTm6 , + CAST(SUM(DECODE(mnt,'07',chasi,0)) AS INT) AS asgnmTm7 , + CAST(SUM(DECODE(mnt,'08',chasi,0)) AS INT) AS asgnmTm8 , + CAST(SUM(DECODE(mnt,'09',chasi,0)) AS INT) AS asgnmTm9 , + CAST(SUM(DECODE(mnt,'10',chasi,0)) AS INT) AS asgnmTm10 , + CAST(SUM(DECODE(mnt,'11',chasi,0)) AS INT) AS asgnmTm11 , + CAST(SUM(DECODE(mnt,'12',chasi,0)) AS INT) AS asgnmTm12 , + CAST(SUM(DECODE(mnt,'01',chasi,0)) +SUM(DECODE(mnt,'02',chasi,0)) +SUM(DECODE(mnt,'03',chasi,0)) + +SUM(DECODE(mnt,'04',chasi,0)) +SUM(DECODE(mnt,'05',chasi,0)) +SUM(DECODE(mnt,'06',chasi,0)) + +SUM(DECODE(mnt,'07',chasi,0)) +SUM(DECODE(mnt,'08',chasi,0)) +SUM(DECODE(mnt,'09',chasi,0)) + +SUM(DECODE(mnt,'10',chasi,0)) +SUM(DECODE(mnt,'11',chasi,0)) +SUM(DECODE(mnt,'12',chasi,0)) AS INT) AS mntSum FROM ( SELECT d.user_id - , SUBSTR(b.edu_hope_dt,5,2) AS mnt + , SUBSTR(b.edu_hope_dt,6,2) AS mnt , SUM(b.chasi) chasi FROM ve_lctr_stng d, ve_edu_chasi_instr_asgnm c , @@ -1051,13 +1051,13 @@ AND b.edu_aplct_ord =c.edu_aplct_ord 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 d.user_id, - SUBSTR(b.edu_hope_dt,5,2) + SUBSTR(b.edu_hope_dt,6,2) ) aa GROUP BY user_id @@ -1094,40 +1094,47 @@ SELECT aa.user_id - , SUM(IF(aa.stngYrMnt='01',areaCnt,null)) AS areaCnt01 - , SUM(IF(aa.stngYrMnt='02',areaCnt,null)) AS areaCnt02 - , SUM(IF(aa.stngYrMnt='03',areaCnt,null)) AS areaCnt03 - , SUM(IF(aa.stngYrMnt='04',areaCnt,null)) AS areaCnt04 - , SUM(IF(aa.stngYrMnt='05',areaCnt,null)) AS areaCnt05 - , SUM(IF(aa.stngYrMnt='06',areaCnt,null)) AS areaCnt06 - , SUM(IF(aa.stngYrMnt='07',areaCnt,null)) AS areaCnt07 - , SUM(IF(aa.stngYrMnt='08',areaCnt,null)) AS areaCnt08 - , SUM(IF(aa.stngYrMnt='09',areaCnt,null)) AS areaCnt09 - , SUM(IF(aa.stngYrMnt='10',areaCnt,null)) AS areaCnt10 - , SUM(IF(aa.stngYrMnt='11',areaCnt,null)) AS areaCnt11 - , SUM(IF(aa.stngYrMnt='12',areaCnt,null)) AS areaCnt12 + , SUM(DECODE(aa.stngYrMnt,'01',areaCnt,null)) AS areaCnt01 + , SUM(DECODE(aa.stngYrMnt,'02',areaCnt,null)) AS areaCnt02 + , SUM(DECODE(aa.stngYrMnt,'03',areaCnt,null)) AS areaCnt03 + , SUM(DECODE(aa.stngYrMnt,'04',areaCnt,null)) AS areaCnt04 + , SUM(DECODE(aa.stngYrMnt,'05',areaCnt,null)) AS areaCnt05 + , SUM(DECODE(aa.stngYrMnt,'06',areaCnt,null)) AS areaCnt06 + , SUM(DECODE(aa.stngYrMnt,'07',areaCnt,null)) AS areaCnt07 + , SUM(DECODE(aa.stngYrMnt,'08',areaCnt,null)) AS areaCnt08 + , SUM(DECODE(aa.stngYrMnt,'09',areaCnt,null)) AS areaCnt09 + , SUM(DECODE(aa.stngYrMnt,'10',areaCnt,null)) AS areaCnt10 + , SUM(DECODE(aa.stngYrMnt,'11',areaCnt,null)) AS areaCnt11 + , SUM(DECODE(aa.stngYrMnt,'12',areaCnt,null)) AS areaCnt12 - , SUM(IF(aa.stngYrMnt='01',wCntMnt,null)) AS wCntMnt01 - , SUM(IF(aa.stngYrMnt='02',wCntMnt,null)) AS wCntMnt02 - , SUM(IF(aa.stngYrMnt='03',wCntMnt,null)) AS wCntMnt03 - , SUM(IF(aa.stngYrMnt='04',wCntMnt,null)) AS wCntMnt04 - , SUM(IF(aa.stngYrMnt='05',wCntMnt,null)) AS wCntMnt05 - , SUM(IF(aa.stngYrMnt='06',wCntMnt,null)) AS wCntMnt06 - , SUM(IF(aa.stngYrMnt='07',wCntMnt,null)) AS wCntMnt07 - , SUM(IF(aa.stngYrMnt='08',wCntMnt,null)) AS wCntMnt08 - , SUM(IF(aa.stngYrMnt='09',wCntMnt,null)) AS wCntMnt09 - , SUM(IF(aa.stngYrMnt='10',wCntMnt,null)) AS wCntMnt10 - , SUM(IF(aa.stngYrMnt='11',wCntMnt,null)) AS wCntMnt11 - , SUM(IF(aa.stngYrMnt='12',wCntMnt,null)) AS wCntMnt12 + , SUM(DECODE(aa.stngYrMnt,'01',wCntMnt,null)) AS wCntMnt01 + , SUM(DECODE(aa.stngYrMnt,'02',wCntMnt,null)) AS wCntMnt02 + , SUM(DECODE(aa.stngYrMnt,'03',wCntMnt,null)) AS wCntMnt03 + , SUM(DECODE(aa.stngYrMnt,'04',wCntMnt,null)) AS wCntMnt04 + , SUM(DECODE(aa.stngYrMnt,'05',wCntMnt,null)) AS wCntMnt05 + , SUM(DECODE(aa.stngYrMnt,'06',wCntMnt,null)) AS wCntMnt06 + , SUM(DECODE(aa.stngYrMnt,'07',wCntMnt,null)) AS wCntMnt07 + , SUM(DECODE(aa.stngYrMnt,'08',wCntMnt,null)) AS wCntMnt08 + , SUM(DECODE(aa.stngYrMnt,'09',wCntMnt,null)) AS wCntMnt09 + , SUM(DECODE(aa.stngYrMnt,'10',wCntMnt,null)) AS wCntMnt10 + , SUM(DECODE(aa.stngYrMnt,'11',wCntMnt,null)) AS wCntMnt11 + , SUM(DECODE(aa.stngYrMnt,'12',wCntMnt,null)) AS wCntMnt12 FROM ( SELECT a.rsrch_instr_div , - SUBSTR(a.stng_yr_mnt,5,2) AS stngYrMnt , + SUBSTR(a.stng_yr_mnt,6,2) AS stngYrMnt , a.instr_div , a.user_id , a.lctr_stng_ord , COUNT(*) AS areaCnt , - MIN(IF(b.sun_lctr_yn='Y',1,0)) + MIN(IF(b.mon_lctr_yn='Y',1,0)) + MIN(IF(b.tue_lctr_yn='Y',1,0)) + MIN(IF(b.wed_lctr_yn='Y',1,0)) + MIN(IF(b.thu_lctr_yn='Y',1,0)) + MIN(IF(b.fri_lctr_yn='Y',1,0)) + MIN(IF(b.sat_lctr_yn='Y',1,0)) AS wCntMnt + MIN(DECODE(b.sun_lctr_yn,'Y',1,0)) + + MIN(DECODE(b.mon_lctr_yn,'Y',1,0)) + + MIN(DECODE(b.tue_lctr_yn,'Y',1,0)) + + MIN(DECODE(b.wed_lctr_yn,'Y',1,0)) + + MIN(DECODE(b.thu_lctr_yn,'Y',1,0)) + + MIN(DECODE(b.fri_lctr_yn,'Y',1,0)) + + MIN(DECODE(b.sat_lctr_yn,'Y',1,0)) + AS wCntMnt FROM ve_lctr_rsrch_sbmt a , ve_lctr_stng b , ve_lctr_area c @@ -1144,7 +1151,7 @@ GROUP BY a.rsrch_instr_div , - SUBSTR(a.stng_yr_mnt,5,2) , + SUBSTR(a.stng_yr_mnt,6,2) , a.instr_div , a.user_id , a.lctr_stng_ord @@ -2565,7 +2572,7 @@ AND b.edu_aplct_ord =c.edu_aplct_ord 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' @@ -2615,7 +2622,7 @@ AND bbbb.edu_chasi_ord =cccc.edu_chasi_ord AND SUBSTR(cccc.edu_hope_dt,1,4)=#mngNmbrYr# AND dddd.edu_aplct_ord =bbbb.edu_aplct_ord - AND IFNULL(dddd.use_yn,'Y') ='Y' + AND NVL(dddd.use_yn,'Y') ='Y' AND dddd.lctr_div_cd ='10' AND dddd.aprvl_cd = '60' AND eeee.stndrd_schol_cd =dddd.stndrd_schol_cd @@ -2675,7 +2682,7 @@ AND b.edu_aplct_ord =c.edu_aplct_ord 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' @@ -2725,7 +2732,7 @@ AND bbbb.edu_chasi_ord =cccc.edu_chasi_ord AND SUBSTR(cccc.edu_hope_dt,1,4)=mngNmbrYr AND dddd.edu_aplct_ord =bbbb.edu_aplct_ord - AND IFNULL(dddd.use_yn,'Y') ='Y' + AND NVL(dddd.use_yn,'Y') ='Y' AND dddd.lctr_div_cd ='10' AND dddd.aprvl_cd = '60' AND eeee.stndrd_schol_cd =dddd.stndrd_schol_cd diff --git a/src/main/resources/egovframework/sqlmap/ve/schol/ScholInfo_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/schol/ScholInfo_SQL_Tibero.xml index b199a452..cbd12b42 100644 --- a/src/main/resources/egovframework/sqlmap/ve/schol/ScholInfo_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/schol/ScholInfo_SQL_Tibero.xml @@ -48,6 +48,19 @@ ,ESTBS_DT ,SCHOL_ANVSRY ,LAST_UPDT_PNTTM + + ,isltn_yn + ,isltn2_yn + ,isltn3_yn + + ,ppltn_reduc_area_yn + + /* + 도서지역여부 + 벽지지역여부 + 접적지역여부 + 인구감소지역여부 + */ @@ -129,7 +142,13 @@ #dnDvisnNm#, #estbsDt#, #scholAnvsry#, - #lastUpdtPnttm# + #lastUpdtPnttm# + + ,#isltnYn# + ,#isltn2Yn# + ,#isltn3Yn# + + ,#ppltnReducAreaYn# ) @@ -193,7 +212,17 @@ ,SCHOL_ANVSRY = #scholAnvsry# ,LAST_UPDT_PNTTM = #lastUpdtPnttm# - + + + ,ISLTN_YN = #isltnYn# + + ,ISLTN2_YN = #isltn2Yn# + + ,ISLTN3_YN = #isltn3Yn# + + + ,PPLTN_REDUC_AREA_YN = #ppltnReducAreaYn# + WHERE @@ -282,10 +311,8 @@ /* ScholInfoDAO.selectDetail */ SELECT - , IF(b.stndrd_schol_cd IS null,'N','Y') AS isltnScholYn FROM a - LEFT OUTER JOIN ve_schol_isltn b ON(a.schol_id=b.schol_id) WHERE 1=1 AND a.SCHOL_ID = #scholId# diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMailDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMailDetail.jsp index 31f394e0..0b22c471 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMailDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMailDetail.jsp @@ -198,14 +198,19 @@ - +
----------하기는 메일 발송 계정 관련 내용임(테스트용)-----------------------------------------------------------------------
- - - + sndFlag: +
ID: +
PWD:
-
+ + +
//1. sndFlag = 메뉴 구분 +
// C -> 기존계정 발송 +
// UR -> 입력한 ID/PWD로 발송 + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/scholMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/scholMngDetail.jsp index 064604ce..7d36f539 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/scholMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/scholMngDetail.jsp @@ -141,10 +141,34 @@ -

도서벽지학교구분

+

도서학교구분

- + + + + + +

벽지학교구분

+ + + + + + + +

접적학교구분

+ + + + + + + +

인구감소지역여부

+ + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmList.jsp index a2c5a1c4..39427c72 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmList.jsp @@ -102,7 +102,7 @@ - + @@ -155,7 +155,7 @@
- +
    ', '');">
  • 번호 diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp index b02590f6..c45d3ef2 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp @@ -111,7 +111,7 @@ - + ', '');" style="cursor:pointer;"> @@ -130,7 +130,7 @@

    -

    ${fn:substring(list.eduHopeDt,0,4)}-${fn:substring(list.eduHopeDt,4,6)}-${fn:substring(list.eduHopeDt,6,8)}

    +

    ${list.eduHopeDt}

    @@ -181,7 +181,7 @@

    - +
      ', '');">
    • 번호 diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndList.jsp index 1574c7b6..4523f2d5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndList.jsp @@ -115,7 +115,7 @@ - + @@ -171,7 +171,7 @@
      - +
        ', '');">
      • 번호 diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp index d35559e2..95d9a5c5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp @@ -102,7 +102,7 @@ - + @@ -166,7 +166,7 @@
        - +
          ', '');">
        • 번호 diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndList.jsp index ad7e538d..f019a57d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndList.jsp @@ -110,7 +110,7 @@ - + @@ -154,7 +154,7 @@
          - +
            ', '');">
          • 번호