From 2c7d7e258f995b366372991e56a937cd274d6921 Mon Sep 17 00:00:00 2001 From: myname Date: Fri, 13 Oct 2023 09:21:34 +0900 Subject: [PATCH] =?UTF-8?q?2023-10-13=2009:21=20=EC=B2=AD=EC=86=8C?= =?UTF-8?q?=EB=85=84/=EC=84=B1=EC=9D=B8=20=EA=B4=80=EB=A6=AC=EC=9E=90=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sch/service/SchduleManageService.java | 3 + .../sch/service/impl/SchduleManageDAO.java | 6 + .../impl/SchduleManageServiceImpl.java | 5 + .../sch/web/SchduleManageController.java | 6 +- .../ve/aplct/comweb/CommonWebController.java | 4 +- src/main/java/kcc/ve/cmm/VeInstrFeeMng.java | 13 +- .../service/VEAsgnmMIX2023Service.java | 33 + .../asgnmInfo/service/VEInstrAsgnmVO.java | 17 + .../service/impl/VEAsgnmMIX2023DAO.java | 56 + .../impl/VEAsgnmMIX2023ServiceImpl.java | 56 + .../impl/VELctrAreaMngServiceImpl.java | 2 +- .../web/AreaLctrMngAdultController.java | 11 +- .../impl/EduAplctMngAdultServiceImpl.java | 13 +- .../web/EduAplctMngAdultController.java | 2 +- .../web/EduCnfrmMngAdultController.java | 11 +- .../web/AreaLctrMngTngrController.java | 14 + .../web/EduAplctMngTngrController.java | 2 +- .../web/EduCnfrmMngTngrController.java | 15 +- .../web/EduRsltMngTngrController.java | 100 +- .../spring/com/context-idgen.xml | 19 +- .../tibero/sql-map-config-tibero-ve.xml | 1 + .../kccadr/sch/SchduleManage_SQL_Tibero.xml | 153 ++- .../ve/asgnm/VEAcmdtAplct_SQL_Tibero.xml | 3 +- .../ve/asgnm/VEAsgnm_MIX_2023_SQL_Tibero.xml | 787 ++++++++++++++ .../ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml | 2 +- .../asgnm/VEEduChasiInstrAsgnm_SQL_Tibero.xml | 30 +- .../sqlmap/ve/asgnm/VEEduPnlty_SQL_Tibero.xml | 37 +- .../sqlmap/ve/asgnm/VEInstrFee_SQL_Tibero.xml | 30 +- .../ve/edu/VEEduInstrDstnc_SQL_Tibero.xml | 64 +- .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 41 +- .../ve/instr/VEInstr_MIX_SQL_Tibero.xml | 961 +++++++++--------- .../oprtn/adultVisitEdu/eduAplctMngReg.jsp | 1 + .../oprtn/adultVisitEdu/eduCnfrmMngList.jsp | 2 +- .../oprtn/adultVisitEdu/eduRsltMngList.jsp | 2 +- .../oprtn/tngrVisitEdu/eduInstrFeeMngList.jsp | 5 +- .../jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp | 2 +- .../tngrVisitEdu/popup/instrCostPopup.jsp | 1 + .../asgnmInfo/instrAsgnmRqstList.jsp | 4 +- 38 files changed, 1857 insertions(+), 657 deletions(-) create mode 100644 src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAsgnmMIX2023Service.java create mode 100644 src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIX2023DAO.java create mode 100644 src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIX2023ServiceImpl.java create mode 100644 src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_2023_SQL_Tibero.xml diff --git a/src/main/java/kcc/kccadr/sch/service/SchduleManageService.java b/src/main/java/kcc/kccadr/sch/service/SchduleManageService.java index b069797d..b8714006 100644 --- a/src/main/java/kcc/kccadr/sch/service/SchduleManageService.java +++ b/src/main/java/kcc/kccadr/sch/service/SchduleManageService.java @@ -18,6 +18,9 @@ public interface SchduleManageService { int updateSchManage(SchduleManageVO schduleManageVO) throws Exception; List selectSchManageStatusList(SchduleManageVO schduleManageVO) throws Exception; + + //관리자 일정 페이지 + List selectSchManageStatusAdminList(SchduleManageVO schduleManageVO) throws Exception; } diff --git a/src/main/java/kcc/kccadr/sch/service/impl/SchduleManageDAO.java b/src/main/java/kcc/kccadr/sch/service/impl/SchduleManageDAO.java index 1b4f1153..f1e5f4d2 100644 --- a/src/main/java/kcc/kccadr/sch/service/impl/SchduleManageDAO.java +++ b/src/main/java/kcc/kccadr/sch/service/impl/SchduleManageDAO.java @@ -24,6 +24,12 @@ public class SchduleManageDAO extends EgovAbstractDAO { return (List)list("schduleManageDAO.selectSchManageStatusList" , schduleManageVO); } + //교육확정된 차시 리스트-강사배정 있거나, 또는 없거나 + @SuppressWarnings("unchecked") + public List selectSchManageStatusAdminList(SchduleManageVO schduleManageVO)throws Exception{ + return (List)list("schduleManageDAO.selectSchManageStatusAdminList" , schduleManageVO); + } + public SchduleManageVO selectSchManageDetail(SchduleManageVO schduleManageVO)throws Exception{ return (SchduleManageVO) select("schduleManageDAO.selectSchManageDetail" , schduleManageVO); } diff --git a/src/main/java/kcc/kccadr/sch/service/impl/SchduleManageServiceImpl.java b/src/main/java/kcc/kccadr/sch/service/impl/SchduleManageServiceImpl.java index 9356ceb5..7fecf3e7 100644 --- a/src/main/java/kcc/kccadr/sch/service/impl/SchduleManageServiceImpl.java +++ b/src/main/java/kcc/kccadr/sch/service/impl/SchduleManageServiceImpl.java @@ -49,4 +49,9 @@ public class SchduleManageServiceImpl implements SchduleManageService { public List selectSchManageStatusList(SchduleManageVO schduleManageVO) throws Exception { return schduleManageDAO.selectSchManageStatusList(schduleManageVO); } + + @Override + public List selectSchManageStatusAdminList(SchduleManageVO schduleManageVO) throws Exception { + return schduleManageDAO.selectSchManageStatusAdminList(schduleManageVO); + } } diff --git a/src/main/java/kcc/kccadr/sch/web/SchduleManageController.java b/src/main/java/kcc/kccadr/sch/web/SchduleManageController.java index 241ad1d1..a86d78f1 100644 --- a/src/main/java/kcc/kccadr/sch/web/SchduleManageController.java +++ b/src/main/java/kcc/kccadr/sch/web/SchduleManageController.java @@ -267,7 +267,7 @@ public class SchduleManageController { schduleManageVO.setSearchStartDt(schduleManageVO.getSearchStartDt().split("T")[0].replaceAll("-", "")); - return schduleManageService.selectSchManageStatusList(schduleManageVO); + return schduleManageService.selectSchManageStatusAdminList(schduleManageVO); } //청소년 일정 관리 excel @@ -282,7 +282,7 @@ public class SchduleManageController { schduleManageVO.setSearchStartDt(schduleManageVO.getSearchStartDt().split("T")[0].replaceAll("-", "")); - List list= schduleManageService.selectSchManageStatusList(schduleManageVO); + List list= schduleManageService.selectSchManageStatusAdminList(schduleManageVO); List excelData = new ArrayList<>(); @@ -325,7 +325,7 @@ public class SchduleManageController { schduleManageVO.setSearchStartDt(schduleManageVO.getSearchStartDt().split("T")[0].replaceAll("-", "")); - return schduleManageService.selectSchManageStatusList(schduleManageVO); + return schduleManageService.selectSchManageStatusAdminList(schduleManageVO); } //@RequestMapping(value = "/kccadr/sch/popup/SchduleManagerPopDetail.do") diff --git a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java index 7e5f241b..af81a86c 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java @@ -710,12 +710,12 @@ public class CommonWebController { //step1.전달 파라미터를 대상 쿼리로 변경 하기 - String s_query = " SELECT '' AS edu_aplct_ord, '' AS edu_chasi_ord "; + String s_query = " SELECT '' AS edu_aplct_ord, '' AS edu_chasi_ord FROM DUAL "; String[] s_arr = veEduAplctVO.getEduAplctOrd().split("__"); for (int i=0;i selectInstrAsgnmOnPagingList_202310(VEInstrAsgnmVO paramVO) throws Exception; + + //온라인 강사 배정 220210 + List selectInstrAsgnmOnPagingList_220210(VEInstrAsgnmVO paramVO) throws Exception; + + + //오프라인 강사 배정 202310 + List selectInstrAsgnmOffPagingList_202310(VEInstrAsgnmVO paramVO) throws Exception; + + //오프라인 강사 배정 220210 + List selectInstrAsgnmOffPagingList_220210(VEInstrAsgnmVO paramVO) throws Exception; + + + //온라인 강사 배정 202310_adult + List selectInstrAsgnmOnPagingList_202310_adult(VEInstrAsgnmVO paramVO) throws Exception; + + //온라인 강사 배정 220210_adult + List selectInstrAsgnmOnPagingList_220210_adult(VEInstrAsgnmVO paramVO) throws Exception; + + + //오프라인 강사 배정 202310_adult + List selectInstrAsgnmOffPagingList_202310_adult(VEInstrAsgnmVO paramVO) throws Exception; + + //오프라인 강사 배정 220210_adult + List selectInstrAsgnmOffPagingList_220210_adult(VEInstrAsgnmVO paramVO) throws Exception; +} diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java index 020d9a4f..dce1cc8f 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java @@ -24,6 +24,9 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable { private String pnltyPnttm; //패널티일시 private String pnltyId; //패널티아이디 private String pnltyCn; //패널티내용 + + private String pnltyOrd; //패널티고유값 + private String frstRegistPnttm; //등록일시 private String frstRegisterId; //등록자 @@ -141,6 +144,8 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable { private String memoCn; //강사 메모 + private String yr; //강사 메모 + public String getMemoCn() { return memoCn; @@ -718,5 +723,17 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable { public void setMxmmChasi(String mxmmChasi) { this.mxmmChasi = mxmmChasi; } + public String getYr() { + return yr; + } + public void setYr(String yr) { + this.yr = yr; + } + public String getPnltyOrd() { + return pnltyOrd; + } + public void setPnltyOrd(String pnltyOrd) { + this.pnltyOrd = pnltyOrd; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIX2023DAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIX2023DAO.java new file mode 100644 index 00000000..823c38b8 --- /dev/null +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIX2023DAO.java @@ -0,0 +1,56 @@ +package kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.impl; + +import java.util.List; + +import org.springframework.stereotype.Repository; + +import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrAsgnmVO; + +@Repository("vEAsgnmMIX2023DAO") +public class VEAsgnmMIX2023DAO extends EgovAbstractDAO { + + + + public List selectInstrAsgnmOnPagingList_202310(VEInstrAsgnmVO paramVO) throws Exception { + List tlist = (List) list("VEAsgnmMIX2023DAO.selectInstrAsgnmOnPagingList_202310", paramVO); + return tlist; + } + + public List selectInstrAsgnmOffPagingList_202310(VEInstrAsgnmVO paramVO) throws Exception { + List tlist = (List) list("VEAsgnmMIX2023DAO.selectInstrAsgnmOffPagingList_202310", paramVO); + return tlist; + } + + public List selectInstrAsgnmOffPagingList_202310_adult(VEInstrAsgnmVO paramVO) throws Exception { + List tlist = (List) list("VEAsgnmMIX2023DAO.selectInstrAsgnmOffPagingList_202310_adult", paramVO); + return tlist; + } + + public List selectInstrAsgnmOnPagingList_202310_adult(VEInstrAsgnmVO paramVO) throws Exception { + List tlist = (List) list("VEAsgnmMIX2023DAO.selectInstrAsgnmOnPagingList_202310_adult", paramVO); + return tlist; + } + + //old + public List selectInstrAsgnmOnPagingList_220210(VEInstrAsgnmVO paramVO) throws Exception { + List tlist = (List) list("VEAsgnmMIXDAO.selectInstrAsgnmOnPagingList_220210", paramVO); + return tlist; + } + + public List selectInstrAsgnmOffPagingList_220210(VEInstrAsgnmVO paramVO) throws Exception { + List tlist = (List) list("VEAsgnmMIXDAO.selectInstrAsgnmOffPagingList_220210", paramVO); + return tlist; + } + + + public List selectInstrAsgnmOffPagingList_220210_adult(VEInstrAsgnmVO paramVO) throws Exception { + List tlist = (List) list("VEAsgnmMIXDAO.selectInstrAsgnmOffPagingList_220210_adult", paramVO); + return tlist; + } + + public List selectInstrAsgnmOnPagingList_220210_adult(VEInstrAsgnmVO paramVO) throws Exception { + List tlist = (List) list("VEAsgnmMIXDAO.selectInstrAsgnmOnPagingList_220210_adult", paramVO); + return tlist; + } +} diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIX2023ServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIX2023ServiceImpl.java new file mode 100644 index 00000000..d58d9280 --- /dev/null +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIX2023ServiceImpl.java @@ -0,0 +1,56 @@ +package kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.impl; + + +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + +import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIX2023Service; +import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrAsgnmVO; + +@Service("vEAsgnmMIX2023Service") +public class VEAsgnmMIX2023ServiceImpl implements VEAsgnmMIX2023Service { + + //차시 + @Resource(name="vEAsgnmMIX2023DAO") + private VEAsgnmMIX2023DAO vEAsgnmMIX2023DAO; + + + + public List selectInstrAsgnmOnPagingList_202310(VEInstrAsgnmVO paramVO) throws Exception{ + return vEAsgnmMIX2023DAO.selectInstrAsgnmOnPagingList_202310(paramVO); + } + + public List selectInstrAsgnmOffPagingList_202310(VEInstrAsgnmVO paramVO) throws Exception{ + return vEAsgnmMIX2023DAO.selectInstrAsgnmOffPagingList_202310(paramVO); + } + + public List selectInstrAsgnmOffPagingList_202310_adult(VEInstrAsgnmVO paramVO) throws Exception{ + return vEAsgnmMIX2023DAO.selectInstrAsgnmOffPagingList_202310_adult(paramVO); + } + + public List selectInstrAsgnmOnPagingList_202310_adult(VEInstrAsgnmVO paramVO) throws Exception{ + return vEAsgnmMIX2023DAO.selectInstrAsgnmOnPagingList_202310_adult(paramVO); + } + + + + public List selectInstrAsgnmOnPagingList_220210(VEInstrAsgnmVO paramVO) throws Exception{ + return vEAsgnmMIX2023DAO.selectInstrAsgnmOnPagingList_220210(paramVO); + } + + public List selectInstrAsgnmOffPagingList_220210(VEInstrAsgnmVO paramVO) throws Exception{ + return vEAsgnmMIX2023DAO.selectInstrAsgnmOffPagingList_220210(paramVO); + } + + public List selectInstrAsgnmOffPagingList_220210_adult(VEInstrAsgnmVO paramVO) throws Exception{ + return vEAsgnmMIX2023DAO.selectInstrAsgnmOffPagingList_220210_adult(paramVO); + } + + public List selectInstrAsgnmOnPagingList_220210_adult(VEInstrAsgnmVO paramVO) throws Exception{ + return vEAsgnmMIX2023DAO.selectInstrAsgnmOnPagingList_220210_adult(paramVO); + } + +} diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrAreaMngServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrAreaMngServiceImpl.java index 2e0872d6..2d7c4acd 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrAreaMngServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrAreaMngServiceImpl.java @@ -66,6 +66,6 @@ public class VELctrAreaMngServiceImpl implements VELctrAreaMngService { } public void insertNewYr(VELctrDetailVO paramVO) throws Exception { - vELctrAreaMngDAO.insertNewYr(paramVO); + //vELctrAreaMngDAO.insertNewYr(paramVO); } } diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/areaLctrMng/web/AreaLctrMngAdultController.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/areaLctrMng/web/AreaLctrMngAdultController.java index f0889eac..7834e422 100644 --- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/areaLctrMng/web/AreaLctrMngAdultController.java +++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/areaLctrMng/web/AreaLctrMngAdultController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; +import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.ComDefaultCodeVO; import kcc.com.cmm.LoginVO; @@ -178,8 +179,10 @@ public class AreaLctrMngAdultController { // 강사목록 @Resource(name = "vEInstrMixService") private VEInstrMixService vEInstrMixService; - - + + //패널티순번 + @Resource(name="pnltyOrdGnrService") + private EgovIdGnrService pnltyOrdGnrService; /** * 지역별 강의관리 목록 화면 @@ -653,6 +656,10 @@ public class AreaLctrMngAdultController { // 체크한 패널티 코드를 insert for (int i=0; i list= schduleManageService.selectSchManageStatusList(schduleManageVO); + List list= schduleManageService.selectSchManageStatusAdminList(schduleManageVO); list = egovCryptoUtil.decryptSchduleManageVOList(list); List excelData = new ArrayList<>(); diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduCnfrmMng/web/EduCnfrmMngAdultController.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduCnfrmMng/web/EduCnfrmMngAdultController.java index e2573bd7..0d880b9e 100644 --- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduCnfrmMng/web/EduCnfrmMngAdultController.java +++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduCnfrmMng/web/EduCnfrmMngAdultController.java @@ -30,6 +30,7 @@ import kcc.let.utl.fcc.service.EgovCryptoUtil; import kcc.let.utl.fcc.service.VEPagingUtil; import kcc.ve.cmm.VeConstants; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAcmdtAplctService; +import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIX2023Service; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduChasiInstrAsgnmService; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduPnltyService; @@ -123,6 +124,10 @@ public class EduCnfrmMngAdultController { @Resource(name = "vEAsgnmMIXService") private VEAsgnmMIXService vEAsgnmMIXService; + // 강의배정정보2023 + @Resource(name = "vEAsgnmMIX2023Service") + private VEAsgnmMIX2023Service vEAsgnmMIX2023Service; + // 숙박신청정보 @Resource(name = "vEAcmdtAplctService") private VEAcmdtAplctService vEAcmdtAplctService; @@ -336,10 +341,12 @@ public class EduCnfrmMngAdultController { System.out.println("==============================================="); if ("10".equals(vEEduAplctVO.getEduSlctCd())) { //10-온라인, 20-오프라인 - selectVEInstrAsgnmVOList = vEAsgnmMIXService.selectInstrAsgnmOnPagingList_220210_adult(vEInstrAsgnmVO); + //selectVEInstrAsgnmVOList = vEAsgnmMIXService.selectInstrAsgnmOnPagingList_220210_adult(vEInstrAsgnmVO); + selectVEInstrAsgnmVOList = vEAsgnmMIX2023Service.selectInstrAsgnmOnPagingList_202310_adult(vEInstrAsgnmVO); }else { - selectVEInstrAsgnmVOList = vEAsgnmMIXService.selectInstrAsgnmOffPagingList_220210_adult(vEInstrAsgnmVO); + //selectVEInstrAsgnmVOList = vEAsgnmMIXService.selectInstrAsgnmOffPagingList_220210_adult(vEInstrAsgnmVO); + selectVEInstrAsgnmVOList = vEAsgnmMIX2023Service.selectInstrAsgnmOffPagingList_202310_adult(vEInstrAsgnmVO); } diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java index d271de6e..a9293913 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; +import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.ComDefaultCodeVO; import kcc.com.cmm.LoginVO; @@ -180,6 +181,11 @@ public class AreaLctrMngTngrController { @Resource(name = "vEAStngService") private VEAStngService vEAStngService; + //pnltyOrdGnrService + //패널티순번 + @Resource(name="pnltyOrdGnrService") + private EgovIdGnrService pnltyOrdGnrService; + /** * 지역별 강의관리 목록 화면 */ @@ -763,6 +769,10 @@ public class AreaLctrMngTngrController { vo.setPnltyCd(vEInstrAsgnmVO.getPnltyCd()); vEInstrAsgnmVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id vo.setUserId(userId[i]); + + String s_pnltyOrd = pnltyOrdGnrService.getNextStringId(); + vo.setPnltyOrd(s_pnltyOrd); + vEEduPnltyService.insert(vo); } } @@ -782,6 +792,10 @@ public class AreaLctrMngTngrController { // 체크한 패널티 코드를 insert for (int i=0; i list= schduleManageService.selectSchManageStatusList(schduleManageVO); + List list= schduleManageService.selectSchManageStatusAdminList(schduleManageVO); list = egovCryptoUtil.decryptSchduleManageVOList(list); List excelData = new ArrayList<>(); diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduCnfrmMng/web/EduCnfrmMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduCnfrmMng/web/EduCnfrmMngTngrController.java index 373a2544..6dc3abb1 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduCnfrmMng/web/EduCnfrmMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduCnfrmMng/web/EduCnfrmMngTngrController.java @@ -32,6 +32,7 @@ import kcc.let.utl.fcc.service.EgovCryptoUtil; import kcc.let.utl.fcc.service.VEPagingUtil; import kcc.ve.cmm.VeConstants; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAcmdtAplctService; +import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIX2023Service; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduChasiInstrAsgnmService; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduPnltyService; @@ -125,6 +126,10 @@ public class EduCnfrmMngTngrController { // 강의배정정보 @Resource(name = "vEAsgnmMIXService") private VEAsgnmMIXService vEAsgnmMIXService; + + // 강의배정정보2023 + @Resource(name = "vEAsgnmMIX2023Service") + private VEAsgnmMIX2023Service vEAsgnmMIX2023Service; // 숙박신청정보 @Resource(name = "vEAcmdtAplctService") @@ -287,6 +292,7 @@ public class EduCnfrmMngTngrController { //로그인 처리==================================== //0.pageing step0 //온라인 오프라인 여부 확인 + //배치대상신청정보 vEEduAplctVO = vEEduAplctService.selectDetail(vEEduAplctVO); System.out.println(vEEduAplctVO.getEduSlctCd()); //10-온라인, 20-오프라인 @@ -316,16 +322,17 @@ public class EduCnfrmMngTngrController { //System.out.println(vEInstrAsgnmVO.getInstrNm()); //해당 교육 차시에 속한 달의 강사 교육접수차시 가져오기 - //현재 강사 값 가져오기 + //현재 강사 값 가져오기-최대차시값을 가져온다. VEInstrAsgnmVO t_vEInstrAsgnmVO = vEAsgnmMIXService.selectTtlMntChasiSumDetail(vEInstrAsgnmVO); vEInstrAsgnmVO.setMxmmChasi(t_vEInstrAsgnmVO.getMxmmChasi()); //최대 차시 제한을 넣는다. - if ("10".equals(vEEduAplctVO.getEduSlctCd())) { //10-온라인, 20-오프라인 - selectVEInstrAsgnmVOList = vEAsgnmMIXService.selectInstrAsgnmOnPagingList_220210(vEInstrAsgnmVO); + if ("10".equals(vEEduAplctVO.getEduSlctCd())) { //10-온라인, 20-오프라인 + selectVEInstrAsgnmVOList = vEAsgnmMIX2023Service.selectInstrAsgnmOnPagingList_202310(vEInstrAsgnmVO); }else { - selectVEInstrAsgnmVOList = vEAsgnmMIXService.selectInstrAsgnmOffPagingList_220210(vEInstrAsgnmVO); + //selectVEInstrAsgnmVOList = vEAsgnmMIX2023Service.selectInstrAsgnmOffPagingList_220210(vEInstrAsgnmVO); + selectVEInstrAsgnmVOList = vEAsgnmMIX2023Service.selectInstrAsgnmOffPagingList_202310(vEInstrAsgnmVO); } diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java index 3416afcb..a0c435fa 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java @@ -792,55 +792,63 @@ public class EduRsltMngTngrController { //로그인 처리==================================== - //담당자 검색 시 이름 암호화 - if("2".equals(vEEduAplctVO.getSearchCondition())) { - vEEduAplctVO.setSearchKeyword(egovCryptoUtil.encrypt(vEEduAplctVO.getSearchKeyword())); - } - model.addAttribute("cryptoUtil", egovCryptoUtil); - - //1.pageing step1 - PaginationInfo paginationInfo = this.setPagingStep1(vEEduAplctVO); - - //2. pageing step2 - vEEduAplctVO = this.setPagingStep2(vEEduAplctVO, paginationInfo); - //vEEduAplctVO.setLctrDivCd("30"); // 저작권 체험교실 코드 - vEEduAplctVO.setInstrDiv("10"); // 청소년교육 코드 - vEEduAplctVO.setLctrDivCd("10"); - vEEduAplctVO.setAprvlCd("60"); - vEEduAplctVO.setAsgnmAprvlCd("30"); //강사배정 교육승인 -// vEEduAplctVO.setSearchSubmitYn("Y"); //제출에 대한 강사료 확정 여부 - vEEduAplctVO.setSearchAsgnmAprvlCd("30"); - vEEduAplctVO.setSearchTableJoin("tngrResult"); - - vEEduAplctVO = egovCryptoUtil.encryptVEEduAplctVOInfo(vEEduAplctVO); - List vEEduAplctVOList = vEEduMIXService.selectTngrFeePagingList(vEEduAplctVO); - VEEduAplctVO vo = new VEEduAplctVO(); - for(int i=0; i < vEEduAplctVOList.size(); i++) { - vo = egovCryptoUtil.decryptVEEduAplctVOInfo(vEEduAplctVOList.get(i)); - System.out.println(" @@@@@@@@@@@@@ "+vo.getChrgNm()); - vEEduAplctVOList.get(i).setChrgNm(vo.getChrgNm()); + try { + //담당자 검색 시 이름 암호화 + if("2".equals(vEEduAplctVO.getSearchCondition())) { + vEEduAplctVO.setSearchKeyword(egovCryptoUtil.encrypt(vEEduAplctVO.getSearchKeyword())); + } + model.addAttribute("cryptoUtil", egovCryptoUtil); - // 강사료 계산 - VeInstrFeeMng veInstrFeeMng = new VeInstrFeeMng(); - VEInstrFeeAcmdtVO vEInstrFeeAcmdtVO = veInstrFeeMng.VeInstrFeeMng(vEInstrFeeService, vEEduAplctVOList.get(i).getEduAplctOrd(), vEEduAplctVOList.get(i).getEduChasiOrd()); - vEEduAplctVOList.get(i).setInstrFeeSum(Integer.toString(vEInstrFeeAcmdtVO.getInstrFeeSum())); + //1.pageing step1 + PaginationInfo paginationInfo = this.setPagingStep1(vEEduAplctVO); + + //2. pageing step2 + vEEduAplctVO = this.setPagingStep2(vEEduAplctVO, paginationInfo); + //vEEduAplctVO.setLctrDivCd("30"); // 저작권 체험교실 코드 + vEEduAplctVO.setInstrDiv("10"); // 청소년교육 코드 + vEEduAplctVO.setLctrDivCd("10"); + vEEduAplctVO.setAprvlCd("60"); + vEEduAplctVO.setAsgnmAprvlCd("30"); //강사배정 교육승인 +// vEEduAplctVO.setSearchSubmitYn("Y"); //제출에 대한 강사료 확정 여부 + vEEduAplctVO.setSearchAsgnmAprvlCd("30"); + vEEduAplctVO.setSearchTableJoin("tngrResult"); + + System.out.println("11111111111111113"); + + vEEduAplctVO = egovCryptoUtil.encryptVEEduAplctVOInfo(vEEduAplctVO); + List vEEduAplctVOList = vEEduMIXService.selectTngrFeePagingList(vEEduAplctVO); + VEEduAplctVO vo = new VEEduAplctVO(); + for(int i=0; i < vEEduAplctVOList.size(); i++) { + vo = egovCryptoUtil.decryptVEEduAplctVOInfo(vEEduAplctVOList.get(i)); + System.out.println(" @@@@@@@@@@@@@ "+vo.getChrgNm()); + vEEduAplctVOList.get(i).setChrgNm(vo.getChrgNm()); + + // 강사료 계산 + VeInstrFeeMng veInstrFeeMng = new VeInstrFeeMng(); + VEInstrFeeAcmdtVO vEInstrFeeAcmdtVO = veInstrFeeMng.VeInstrFeeMng(vEInstrFeeService, vEEduAplctVOList.get(i).getEduAplctOrd(), vEEduAplctVOList.get(i).getEduChasiOrd()); + vEEduAplctVOList.get(i).setInstrFeeSum(Integer.toString(vEInstrFeeAcmdtVO.getInstrFeeSum())); + } + + System.out.println("11111111111111112"); + + //3.pageing step3 + paginationInfo = this.setPagingStep3(vEEduAplctVOList, paginationInfo); + + + model.addAttribute("paginationInfo", paginationInfo); + + + //대상 리스트, 페이징 정보 전달 + model.addAttribute("list", vEEduAplctVOList); + + System.out.println("1111111111111111"); + + //대상 리스트, 페이징 정보 전달 + //model.addAttribute("resultList", vEEduAplctVOList); + }catch(Exception ex) { + ex.printStackTrace(); } - //3.pageing step3 - paginationInfo = this.setPagingStep3(vEEduAplctVOList, paginationInfo); - - - model.addAttribute("paginationInfo", paginationInfo); - - - //대상 리스트, 페이징 정보 전달 - model.addAttribute("list", vEEduAplctVOList); - - - //대상 리스트, 페이징 정보 전달 - //model.addAttribute("resultList", vEEduAplctVOList); - - return "oprtn/tngrVisitEdu/eduInstrFeeMngList"; } diff --git a/src/main/resources/egovframework/spring/com/context-idgen.xml b/src/main/resources/egovframework/spring/com/context-idgen.xml index 81eac5e9..418fd31a 100644 --- a/src/main/resources/egovframework/spring/com/context-idgen.xml +++ b/src/main/resources/egovframework/spring/com/context-idgen.xml @@ -2929,7 +2929,7 @@ - + @@ -2937,5 +2937,20 @@ - + + + + + + + + + + + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/config/tibero/sql-map-config-tibero-ve.xml b/src/main/resources/egovframework/sqlmap/config/tibero/sql-map-config-tibero-ve.xml index 97e83b85..1accc9e7 100644 --- a/src/main/resources/egovframework/sqlmap/config/tibero/sql-map-config-tibero-ve.xml +++ b/src/main/resources/egovframework/sqlmap/config/tibero/sql-map-config-tibero-ve.xml @@ -65,6 +65,7 @@ + diff --git a/src/main/resources/egovframework/sqlmap/kccadr/sch/SchduleManage_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/kccadr/sch/SchduleManage_SQL_Tibero.xml index d7b3c402..97c5be0a 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/sch/SchduleManage_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/sch/SchduleManage_SQL_Tibero.xml @@ -58,20 +58,25 @@ + + + + /* VEAcmdtAplctDAO.selectDetailByUser */ SELECT a.schol_instt_nm AS scholInsttNm , a.addr AS addr @@ -153,7 +154,7 @@ AND b.edu_chasi_ord = #eduChasiOrd# - AND b.edu_hope_dt = TO_CHAR(ADDDATE(TO_DATE(#yesterdayAcmdt#, 'YYYYMMDD'), -1),'YYYYMMDD') + AND b.edu_hope_dt = TO_CHAR(TO_DATE(#yesterdayAcmdt#, 'YYYY.MM.DD')-1,'YYYY.MM.DD') AND d.user_id = #frstRegisterId# ORDER BY b.end_tm DESC limit 1 diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_2023_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_2023_SQL_Tibero.xml new file mode 100644 index 00000000..565d71f2 --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_2023_SQL_Tibero.xml @@ -0,0 +1,787 @@ + + + + + + + + + + + ve_edu_chasi_instr_asgnm + + + + + edu_aplct_ord, + edu_chasi_ord, + + user_id, + + pnlty_cd, + pnlty_pnttm, + pnlty_id, + pnlty_cn, + frst_regist_pnttm, + frst_register_id, + last_updt_pnttm, + last_updusr_id, + prvs_srvy_ord, + aft_srvy_ord, + gnrl_srvy_ord, + lctr_plan_atch_file_id + + + + + + a.edu_aplct_ord AS eduAplctOrd, + a.edu_chasi_ord AS eduChasiOrd, + + a.user_id AS userId, + a.pnlty_cd AS pnltyCd, + a.pnlty_pnttm AS pnltyPnttm, + a.pnlty_id AS pnltyId, + a.pnlty_cn AS pnltyCn, + + TO_CHAR(a.frst_regist_pnttm,'YYYY-MM-DD') AS frstRegistPnttm, + a.frst_register_id AS frstRegisterId, + TO_CHAR(a.last_updt_pnttm,'YYYY-MM-DD') AS lastUpdtPnttm, + a.last_updusr_id AS lastUpdusrId, + + a.prvs_srvy_ord AS prvsSrvyOrd, + a.aft_srvy_ord AS aftSrvyOrd, + a.gnrl_srvy_ord AS gnrlSrvyOrd, + a.lctr_plan_atch_file_id AS lctrPlanAtchFileId + + + + + + + + + + + + + + + + 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 ad8b4125..90715494 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 @@ -4807,7 +4807,7 @@ AND c.aprvl_cd ='60' AND a.asgnm_aprvl_cd='30' - AND IFNULL(c.use_yn,'Y')='Y' + AND NVL(c.use_yn,'Y')='Y' /* AND ( diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEEduChasiInstrAsgnm_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEEduChasiInstrAsgnm_SQL_Tibero.xml index 86138de2..678d41de 100644 --- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEEduChasiInstrAsgnm_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEEduChasiInstrAsgnm_SQL_Tibero.xml @@ -67,12 +67,10 @@ - MERGE INTO T1 USING DB_ROOT + MERGE INTO T1 USING DUAL ON (T1.EDU_APLCT_ORD = #eduAplctOrd# AND T1.EDU_CHASI_ORD = #eduChasiOrd#) WHEN MATCHED THEN UPDATE SET - edu_aplct_ord = #eduAplctOrd#, - edu_chasi_ord = #eduChasiOrd#, user_id = #userId#, pnlty_cd = #pnltyCd#, pnlty_pnttm = #pnltyPnttm#, @@ -269,22 +267,32 @@ - INSERT INTO VE_EDU_CHASI_INSTR_ASGNM_DEAD_LINE - ( + /* VEEduChasiInstrAsgnmDAO.insertDeadLineDt */ + MERGE INTO VE_EDU_CHASI_INSTR_ASGNM_DEAD_LINE + USING DUAL + ON( + edu_aplct_ord = #eduAplctOrd# + AND edu_chasi_ord = #eduChasiOrd# + ) + + WHEN NOT MATCHED THEN + INSERT + ( EDU_APLCT_ORD , EDU_CHASI_ORD , USER_ID , DEAD_LINE_DT - ) - VALUES - ( + ) + VALUES( #eduAplctOrd# , #eduChasiOrd# , #userId# , #deadlineDt# - ) - ON DUPLICATE KEY UPDATE - DEAD_LINE_DT = #deadlineDt# + ) + WHEN MATCHED THEN + UPDATE + SET DEAD_LINE_DT = #deadlineDt# + @@ -81,13 +78,12 @@ SET - frst_regist_pnttm = NOW() + frst_regist_pnttm = SYSDATE ,frst_register_id = #lastUpdusrId# WHERE - edu_aplct_ord = #eduAplctOrd# - AND edu_chasi_ord = #eduChasiOrd# - AND pnlty_cd = #pnltyCd# + 1=1 + AND pnlty_ord = #pnltyOrd# @@ -95,11 +91,7 @@ DELETE FROM WHERE - edu_aplct_ord = #eduAplctOrd# - AND edu_chasi_ord = #eduChasiOrd# - - AND pnlty_cd = #pnltyCd# - + pnlty_ord = #pnltyOrd# @@ -108,7 +100,10 @@ SELECT ,b.schol_instt_nm AS scholInsttNm + /* ,TO_CHAR(c.edu_hope_dt,'YYYY.MM.DD') AS eduHopeDt + */ + ,c.edu_hope_dt AS eduHopeDt ,c.strt_tm AS strtTm ,c.end_tm AS endTm ,c.lrn_tm AS lrnTm diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEInstrFee_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEInstrFee_SQL_Tibero.xml index 145035ec..19c11e14 100644 --- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEInstrFee_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEInstrFee_SQL_Tibero.xml @@ -117,6 +117,7 @@ @@ -336,7 +340,7 @@ AND A.EDU_APLCT_ORD = #eduAplctOrd# AND A.USER_ID = #userId# AND F.EDU_HOPE_DT = #eduHopeDt# - ORDER BY 1=1 + ORDER BY 1 , A.EDU_CHASI_ORD diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduInstrDstnc_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduInstrDstnc_SQL_Tibero.xml index e32d53c7..24ed5255 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduInstrDstnc_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduInstrDstnc_SQL_Tibero.xml @@ -49,35 +49,45 @@ - - INSERT INTO ( - - - )VALUES( - #eduAplctOrd#, - - #userId#, - - #scholAddr#, - #instrAddr#, - #onewayDstnc#, - #cn#, - - - SYSDATE, - #frstRegisterId#, - SYSDATE, - #lastUpdusrId# - + /* VEEduInstrDstncDAO.insert */ + MERGE INTO + USING DUAL + ON( + edu_aplct_ord = #eduAplctOrd# + AND user_id = #userId# ) - ON DUPLICATE KEY UPDATE - schol_addr=#scholAddr#, - instr_addr=#instrAddr#, - oneway_dstnc=#onewayDstnc#, - cn=#cn#, - last_updt_pnttm=SYSDATE, - last_updusr_id=#lastUpdusrId# + WHEN NOT MATCHED THEN + INSERT + ( + + ) + VALUES( + #eduAplctOrd#, + + #userId#, + + #scholAddr#, + #instrAddr#, + #onewayDstnc#, + #cn#, + + + SYSDATE, + #frstRegisterId#, + NULL, + NULL + + ) + WHEN MATCHED THEN + UPDATE + SET + schol_addr=#scholAddr#, + instr_addr=#instrAddr#, + oneway_dstnc=#onewayDstnc#, + cn=#cn#, + last_updt_pnttm=SYSDATE, + last_updusr_id=#lastUpdusrId# 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 30931cd4..c83cc38b 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 @@ -1011,9 +1011,12 @@ EDU_APLCT_ORD ,EDU_CHASI_ORD ,SUM(lrn_tm) AS lrn_tm - ,MIN(REPLACE(IF(EDU_HOPE_DT IS NULL OR EDU_HOPE_DT = '', NULL, EDU_HOPE_DT), '.', '')) AS EDU_HOPE_DT + ,MIN(REPLACE( + CASE WHEN EDU_HOPE_DT IS NULL OR EDU_HOPE_DT = '' THEN NULL ELSE EDU_HOPE_DT END + , '.', '')) AS EDU_HOPE_DT FROM VE_EDU_CHASI GROUP BY EDU_APLCT_ORD + ,EDU_CHASI_ORD ) CC ON A.EDU_APLCT_ORD = CC.EDU_APLCT_ORD LEFT OUTER JOIN VE_EDU_CHASI B ON A.EDU_APLCT_ORD = B.EDU_APLCT_ORD @@ -1095,7 +1098,7 @@ AND A.EDU_APLCT_ORD = #eduAplctOrd# - ORDER BY 1=1 + ORDER BY 1 , A.EDU_APLCT_ORD DESC @@ -1103,7 +1106,10 @@ , $orderByQuery$ - LIMIT #recordCountPerPage# OFFSET #firstIndex# + /* + LIMIT recordCountPerPage OFFSET firstIndex + */ + OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; @@ -1667,10 +1673,16 @@ SELECT AA.*, 2 , + /* IF(aa.userId IS NOT NULL , '(' || SUBSTRING(aa.userId,INSTR(aa.userId,'_')+1)*1 || ')' ,'' ) AS userIdNum , + */ + CASE WHEN aa.userId IS NOT NULL THEN '(' || SUBSTRING(aa.userId,INSTR(aa.userId,'_')+1)*1 || ')' + ELSE '' + END AS userIdNum , + COUNT(1) OVER() AS totCnt FROM ( SELECT @@ -1723,14 +1735,14 @@ f.sbmt_yn AS feeSbmtYn, f.aprvl_cd AS feeAprvlCd, - NVL(TO_NUMBER(IF(f.instr_fee='',0,f.instr_fee)),0) - + NVL(TO_NUMBER(IF(f.bsns_trip_fee='',0,f.bsns_trip_fee)),0) - + NVL(TO_NUMBER(IF(f.spare_fee='',0,f.spare_fee)),0) - + NVL(TO_NUMBER(IF(f.special_work_allow='',0,f.special_work_allow)),0) - + NVL(TO_NUMBER(IF(f.distance_allow='',0,f.distance_allow)),0) - + NVL(TO_NUMBER(IF(f.traffic_fee='',0,f.traffic_fee)),0) - - NVL(TO_NUMBER(IF(f.income_tax='',0,f.income_tax)),0) - - NVL(TO_NUMBER(IF(f.local_income_tax='',0,f.local_income_tax)),0) + NVL(TO_NUMBER(DECODE(f.instr_fee ,'',0,f.instr_fee)),0) + + NVL(TO_NUMBER(DECODE(f.bsns_trip_fee ,'',0,f.bsns_trip_fee)),0) + + NVL(TO_NUMBER(DECODE(f.spare_fee ,'',0,f.spare_fee)),0) + + NVL(TO_NUMBER(DECODE(f.special_work_allow ,'',0,f.special_work_allow)),0) + + NVL(TO_NUMBER(DECODE(f.distance_allow ,'',0,f.distance_allow)),0) + + NVL(TO_NUMBER(DECODE(f.traffic_fee ,'',0,f.traffic_fee)),0) + - NVL(TO_NUMBER(DECODE(f.income_tax ,'',0,f.income_tax)),0) + - NVL(TO_NUMBER(DECODE(f.local_income_tax ,'',0,f.local_income_tax)),0) AS totFee , ( @@ -1909,7 +1921,7 @@ AND AA.insttNm LIKE '%'||#searchKeyword#||'%' - ORDER BY 1=1 + ORDER BY 1 , eduAplctOrd desc, eduChasiOrd @@ -1918,7 +1930,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_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml index b3a93969..8c1aa097 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 @@ -502,7 +502,7 @@ ( /* 해당월 시수 */ SELECT a.user_id , - SUBSTRING(b.edu_hope_dt,1,6) edu_hope_dt , + SUBSTR(b.edu_hope_dt,1,6) edu_hope_dt , SUM(b.chasi) lrn_tm_sum FROM ve_edu_chasi_instr_asgnm a , ve_edu_chasi b , @@ -518,11 +518,11 @@ c.use_yn IS NULL OR c.use_yn='Y' ) GROUP BY a.user_id , - SUBSTRING(b.edu_hope_dt,1,6) + SUBSTR(b.edu_hope_dt,1,6) ) bbbbb ON ( - SUBSTRING(h.edu_hope_dt,1,6)=bbbbb.edu_hope_dt + SUBSTR(h.edu_hope_dt,1,6)=bbbbb.edu_hope_dt AND a.user_id =bbbbb.user_id ) @@ -531,7 +531,7 @@ ( /* 해당년 시수 */ SELECT a.user_id , - SUBSTRING(b.edu_hope_dt,1,4) edu_hope_dt , + SUBSTR(b.edu_hope_dt,1,4) edu_hope_dt , SUM(b.chasi) lrn_tm_sum_yr FROM ve_edu_chasi_instr_asgnm a , ve_edu_chasi b , @@ -547,11 +547,11 @@ c.use_yn IS NULL OR c.use_yn='Y' ) GROUP BY a.user_id , - SUBSTRING(b.edu_hope_dt,1,4) + SUBSTR(b.edu_hope_dt,1,4) ) ccccc ON ( - SUBSTRING(h.edu_hope_dt,1,4)=ccccc.edu_hope_dt + SUBSTR(h.edu_hope_dt,1,4)=ccccc.edu_hope_dt AND a.user_id =ccccc.user_id ) @@ -874,7 +874,7 @@ @@ -1774,19 +1774,19 @@ ELSE '합계' END AS chasi - , IF (aaaa.no3='20', bbbb.mnt01, bbbb.cnt01) mnt01 - , IF (aaaa.no3='20', bbbb.mnt02, bbbb.cnt02) mnt02 - , IF (aaaa.no3='20', bbbb.mnt03, bbbb.cnt03) mnt03 - , IF (aaaa.no3='20', bbbb.mnt04, bbbb.cnt04) mnt04 - , IF (aaaa.no3='20', bbbb.mnt05, bbbb.cnt05) mnt05 - , IF (aaaa.no3='20', bbbb.mnt06, bbbb.cnt06) mnt06 - , IF (aaaa.no3='20', bbbb.mnt07, bbbb.cnt07) mnt07 - , IF (aaaa.no3='20', bbbb.mnt08, bbbb.cnt08) mnt08 - , IF (aaaa.no3='20', bbbb.mnt09, bbbb.cnt09) mnt09 - , IF (aaaa.no3='20', bbbb.mnt10, bbbb.cnt10) mnt10 - , IF (aaaa.no3='20', bbbb.mnt11, bbbb.cnt11) mnt11 - , IF (aaaa.no3='20', bbbb.mnt12, bbbb.cnt12) mnt12 - , IF (aaaa.no3='20', bbbb.mntSum, bbbb.cntSum) mntSum + , DECODE (aaaa.no3,'20', bbbb.mnt01, bbbb.cnt01) mnt01 + , DECODE (aaaa.no3,'20', bbbb.mnt02, bbbb.cnt02) mnt02 + , DECODE (aaaa.no3,'20', bbbb.mnt03, bbbb.cnt03) mnt03 + , DECODE (aaaa.no3,'20', bbbb.mnt04, bbbb.cnt04) mnt04 + , DECODE (aaaa.no3,'20', bbbb.mnt05, bbbb.cnt05) mnt05 + , DECODE (aaaa.no3,'20', bbbb.mnt06, bbbb.cnt06) mnt06 + , DECODE (aaaa.no3,'20', bbbb.mnt07, bbbb.cnt07) mnt07 + , DECODE (aaaa.no3,'20', bbbb.mnt08, bbbb.cnt08) mnt08 + , DECODE (aaaa.no3,'20', bbbb.mnt09, bbbb.cnt09) mnt09 + , DECODE (aaaa.no3,'20', bbbb.mnt10, bbbb.cnt10) mnt10 + , DECODE (aaaa.no3,'20', bbbb.mnt11, bbbb.cnt11) mnt11 + , DECODE (aaaa.no3,'20', bbbb.mnt12, bbbb.cnt12) mnt12 + , DECODE (aaaa.no3,'20', bbbb.mntSum, bbbb.cntSum) mntSum FROM ( @@ -1796,25 +1796,26 @@ , d.no3 FROM ( - SELECT #mngNmbrYr# edu_hope_yr + SELECT #mngNmbrYr# edu_hope_yr + FROM DUAL )a ,( - SELECT 10 div_cd - UNION ALL SELECT 20 no1 - UNION ALL SELECT 30 no1 - UNION ALL SELECT 40 no1 - UNION ALL SELECT 60 no1 - UNION ALL SELECT 80 no1 - UNION ALL SELECT 99 no1 + SELECT 10 div_cd FROM DUAL + UNION ALL SELECT 20 no1 FROM DUAL + UNION ALL SELECT 30 no1 FROM DUAL + UNION ALL SELECT 40 no1 FROM DUAL + UNION ALL SELECT 60 no1 FROM DUAL + UNION ALL SELECT 80 no1 FROM DUAL + UNION ALL SELECT 99 no1 FROM DUAL )b ,( - SELECT 10 edu_slct_cd - UNION ALL SELECT 20 no2 - UNION ALL SELECT 99 no2 + SELECT 10 edu_slct_cd FROM DUAL + UNION ALL SELECT 20 no2 FROM DUAL + UNION ALL SELECT 99 no2 FROM DUAL )c ,( - SELECT 10 no3 - UNION ALL SELECT 20 no2 + SELECT 10 no3 FROM DUAL + UNION ALL SELECT 20 no2 FROM DUAL )d )aaaa LEFT OUTER JOIN @@ -1826,61 +1827,61 @@ FROM ( /* 대상, 구분 별 집계입니다. */ SELECT aa.edu_hope_yr, aa.div_cd, aa.edu_slct_cd - , SUM(IF(aa.edu_hope_dt='01',aa.prsnl,0)) AS mnt01 - , SUM(IF(aa.edu_hope_dt='02',aa.prsnl,0)) AS mnt02 - , SUM(IF(aa.edu_hope_dt='03',aa.prsnl,0)) AS mnt03 - , SUM(IF(aa.edu_hope_dt='04',aa.prsnl,0)) AS mnt04 - , SUM(IF(aa.edu_hope_dt='05',aa.prsnl,0)) AS mnt05 - , SUM(IF(aa.edu_hope_dt='06',aa.prsnl,0)) AS mnt06 - , SUM(IF(aa.edu_hope_dt='07',aa.prsnl,0)) AS mnt07 - , SUM(IF(aa.edu_hope_dt='08',aa.prsnl,0)) AS mnt08 - , SUM(IF(aa.edu_hope_dt='09',aa.prsnl,0)) AS mnt09 - , SUM(IF(aa.edu_hope_dt='10',aa.prsnl,0)) AS mnt10 - , SUM(IF(aa.edu_hope_dt='11',aa.prsnl,0)) AS mnt11 - , SUM(IF(aa.edu_hope_dt='12',aa.prsnl,0)) AS mnt12 + , SUM(DECODE(aa.edu_hope_dt,'01',aa.prsnl,0)) AS mnt01 + , SUM(DECODE(aa.edu_hope_dt,'02',aa.prsnl,0)) AS mnt02 + , SUM(DECODE(aa.edu_hope_dt,'03',aa.prsnl,0)) AS mnt03 + , SUM(DECODE(aa.edu_hope_dt,'04',aa.prsnl,0)) AS mnt04 + , SUM(DECODE(aa.edu_hope_dt,'05',aa.prsnl,0)) AS mnt05 + , SUM(DECODE(aa.edu_hope_dt,'06',aa.prsnl,0)) AS mnt06 + , SUM(DECODE(aa.edu_hope_dt,'07',aa.prsnl,0)) AS mnt07 + , SUM(DECODE(aa.edu_hope_dt,'08',aa.prsnl,0)) AS mnt08 + , SUM(DECODE(aa.edu_hope_dt,'09',aa.prsnl,0)) AS mnt09 + , SUM(DECODE(aa.edu_hope_dt,'10',aa.prsnl,0)) AS mnt10 + , SUM(DECODE(aa.edu_hope_dt,'11',aa.prsnl,0)) AS mnt11 + , SUM(DECODE(aa.edu_hope_dt,'12',aa.prsnl,0)) AS mnt12 - , SUM(IF(aa.edu_hope_dt='01',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='02',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='03',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='04',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='05',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='06',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='07',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='08',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='09',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='10',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='11',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='12',aa.prsnl,0)) AS mntSum + , SUM(DECODE(aa.edu_hope_dt,'01',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'02',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'03',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'04',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'05',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'06',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'07',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'08',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'09',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'10',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'11',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'12',aa.prsnl,0)) AS mntSum - , SUM(IF(aa.edu_hope_dt='01',1,0)) AS cnt01 - , SUM(IF(aa.edu_hope_dt='02',1,0)) AS cnt02 - , SUM(IF(aa.edu_hope_dt='03',1,0)) AS cnt03 - , SUM(IF(aa.edu_hope_dt='04',1,0)) AS cnt04 - , SUM(IF(aa.edu_hope_dt='05',1,0)) AS cnt05 - , SUM(IF(aa.edu_hope_dt='06',1,0)) AS cnt06 - , SUM(IF(aa.edu_hope_dt='07',1,0)) AS cnt07 - , SUM(IF(aa.edu_hope_dt='08',1,0)) AS cnt08 - , SUM(IF(aa.edu_hope_dt='09',1,0)) AS cnt09 - , SUM(IF(aa.edu_hope_dt='10',1,0)) AS cnt10 - , SUM(IF(aa.edu_hope_dt='11',1,0)) AS cnt11 - , SUM(IF(aa.edu_hope_dt='12',1,0)) AS cnt12 + , SUM(DECODE(aa.edu_hope_dt,'01',1,0)) AS cnt01 + , SUM(DECODE(aa.edu_hope_dt,'02',1,0)) AS cnt02 + , SUM(DECODE(aa.edu_hope_dt,'03',1,0)) AS cnt03 + , SUM(DECODE(aa.edu_hope_dt,'04',1,0)) AS cnt04 + , SUM(DECODE(aa.edu_hope_dt,'05',1,0)) AS cnt05 + , SUM(DECODE(aa.edu_hope_dt,'06',1,0)) AS cnt06 + , SUM(DECODE(aa.edu_hope_dt,'07',1,0)) AS cnt07 + , SUM(DECODE(aa.edu_hope_dt,'08',1,0)) AS cnt08 + , SUM(DECODE(aa.edu_hope_dt,'09',1,0)) AS cnt09 + , SUM(DECODE(aa.edu_hope_dt,'10',1,0)) AS cnt10 + , SUM(DECODE(aa.edu_hope_dt,'11',1,0)) AS cnt11 + , SUM(DECODE(aa.edu_hope_dt,'12',1,0)) AS cnt12 - , SUM(IF(aa.edu_hope_dt='01',1,0)) - + SUM(IF(aa.edu_hope_dt='02',1,0)) - + SUM(IF(aa.edu_hope_dt='03',1,0)) - + SUM(IF(aa.edu_hope_dt='04',1,0)) - + SUM(IF(aa.edu_hope_dt='05',1,0)) - + SUM(IF(aa.edu_hope_dt='06',1,0)) - + SUM(IF(aa.edu_hope_dt='07',1,0)) - + SUM(IF(aa.edu_hope_dt='08',1,0)) - + SUM(IF(aa.edu_hope_dt='09',1,0)) - + SUM(IF(aa.edu_hope_dt='10',1,0)) - + SUM(IF(aa.edu_hope_dt='11',1,0)) - + SUM(IF(aa.edu_hope_dt='12',1,0)) AS cntSum + , SUM(DECODE(aa.edu_hope_dt,'01',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'02',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'03',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'04',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'05',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'06',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'07',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'08',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'09',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'10',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'11',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'12',1,0)) AS cntSum FROM ( SELECT - SUBSTRING(b.edu_hope_dt,1,4) AS edu_hope_yr - , SUBSTRING(b.edu_hope_dt,5,2) AS edu_hope_dt + SUBSTR(b.edu_hope_dt,1,4) AS edu_hope_yr + , SUBSTR(b.edu_hope_dt,6,2) AS edu_hope_dt , b.prsnl , a.edu_slct_cd , a.instt_div_cd div_cd @@ -1894,7 +1895,7 @@ /* AND d.instr_div = '20' */ - AND SUBSTRING(b.edu_hope_dt,1,4)=#mngNmbrYr# + AND SUBSTR(b.edu_hope_dt,1,4)=#mngNmbrYr# /* AND d.use_yn ='Y' AND c.user_id =d.user_id @@ -1902,7 +1903,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.aprvl_cd = '60' AND c.asgnm_aprvl_cd = '30' AND a.lctr_div_cd ='20' @@ -1945,61 +1946,61 @@ FROM ( SELECT aa.edu_hope_yr, aa.div_cd, aa.edu_slct_cd - , SUM(IF(aa.edu_hope_dt='01',aa.prsnl,0)) AS mnt01 - , SUM(IF(aa.edu_hope_dt='02',aa.prsnl,0)) AS mnt02 - , SUM(IF(aa.edu_hope_dt='03',aa.prsnl,0)) AS mnt03 - , SUM(IF(aa.edu_hope_dt='04',aa.prsnl,0)) AS mnt04 - , SUM(IF(aa.edu_hope_dt='05',aa.prsnl,0)) AS mnt05 - , SUM(IF(aa.edu_hope_dt='06',aa.prsnl,0)) AS mnt06 - , SUM(IF(aa.edu_hope_dt='07',aa.prsnl,0)) AS mnt07 - , SUM(IF(aa.edu_hope_dt='08',aa.prsnl,0)) AS mnt08 - , SUM(IF(aa.edu_hope_dt='09',aa.prsnl,0)) AS mnt09 - , SUM(IF(aa.edu_hope_dt='10',aa.prsnl,0)) AS mnt10 - , SUM(IF(aa.edu_hope_dt='11',aa.prsnl,0)) AS mnt11 - , SUM(IF(aa.edu_hope_dt='12',aa.prsnl,0)) AS mnt12 + , SUM(DECODE(aa.edu_hope_dt,'01',aa.prsnl,0)) AS mnt01 + , SUM(DECODE(aa.edu_hope_dt,'02',aa.prsnl,0)) AS mnt02 + , SUM(DECODE(aa.edu_hope_dt,'03',aa.prsnl,0)) AS mnt03 + , SUM(DECODE(aa.edu_hope_dt,'04',aa.prsnl,0)) AS mnt04 + , SUM(DECODE(aa.edu_hope_dt,'05',aa.prsnl,0)) AS mnt05 + , SUM(DECODE(aa.edu_hope_dt,'06',aa.prsnl,0)) AS mnt06 + , SUM(DECODE(aa.edu_hope_dt,'07',aa.prsnl,0)) AS mnt07 + , SUM(DECODE(aa.edu_hope_dt,'08',aa.prsnl,0)) AS mnt08 + , SUM(DECODE(aa.edu_hope_dt,'09',aa.prsnl,0)) AS mnt09 + , SUM(DECODE(aa.edu_hope_dt,'10',aa.prsnl,0)) AS mnt10 + , SUM(DECODE(aa.edu_hope_dt,'11',aa.prsnl,0)) AS mnt11 + , SUM(DECODE(aa.edu_hope_dt,'12',aa.prsnl,0)) AS mnt12 - , SUM(IF(aa.edu_hope_dt='01',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='02',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='03',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='04',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='05',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='06',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='07',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='08',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='09',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='10',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='11',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='12',aa.prsnl,0)) AS mntSum + , SUM(DECODE(aa.edu_hope_dt,'01',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'02',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'03',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'04',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'05',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'06',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'07',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'08',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'09',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'10',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'11',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'12',aa.prsnl,0)) AS mntSum - , SUM(IF(aa.edu_hope_dt='01',1,0)) AS cnt01 - , SUM(IF(aa.edu_hope_dt='02',1,0)) AS cnt02 - , SUM(IF(aa.edu_hope_dt='03',1,0)) AS cnt03 - , SUM(IF(aa.edu_hope_dt='04',1,0)) AS cnt04 - , SUM(IF(aa.edu_hope_dt='05',1,0)) AS cnt05 - , SUM(IF(aa.edu_hope_dt='06',1,0)) AS cnt06 - , SUM(IF(aa.edu_hope_dt='07',1,0)) AS cnt07 - , SUM(IF(aa.edu_hope_dt='08',1,0)) AS cnt08 - , SUM(IF(aa.edu_hope_dt='09',1,0)) AS cnt09 - , SUM(IF(aa.edu_hope_dt='10',1,0)) AS cnt10 - , SUM(IF(aa.edu_hope_dt='11',1,0)) AS cnt11 - , SUM(IF(aa.edu_hope_dt='12',1,0)) AS cnt12 + , SUM(DECODE(aa.edu_hope_dt,'01',1,0)) AS cnt01 + , SUM(DECODE(aa.edu_hope_dt,'02',1,0)) AS cnt02 + , SUM(DECODE(aa.edu_hope_dt,'03',1,0)) AS cnt03 + , SUM(DECODE(aa.edu_hope_dt,'04',1,0)) AS cnt04 + , SUM(DECODE(aa.edu_hope_dt,'05',1,0)) AS cnt05 + , SUM(DECODE(aa.edu_hope_dt,'06',1,0)) AS cnt06 + , SUM(DECODE(aa.edu_hope_dt,'07',1,0)) AS cnt07 + , SUM(DECODE(aa.edu_hope_dt,'08',1,0)) AS cnt08 + , SUM(DECODE(aa.edu_hope_dt,'09',1,0)) AS cnt09 + , SUM(DECODE(aa.edu_hope_dt,'10',1,0)) AS cnt10 + , SUM(DECODE(aa.edu_hope_dt,'11',1,0)) AS cnt11 + , SUM(DECODE(aa.edu_hope_dt,'12',1,0)) AS cnt12 - , SUM(IF(aa.edu_hope_dt='01',1,0)) - + SUM(IF(aa.edu_hope_dt='02',1,0)) - + SUM(IF(aa.edu_hope_dt='03',1,0)) - + SUM(IF(aa.edu_hope_dt='04',1,0)) - + SUM(IF(aa.edu_hope_dt='05',1,0)) - + SUM(IF(aa.edu_hope_dt='06',1,0)) - + SUM(IF(aa.edu_hope_dt='07',1,0)) - + SUM(IF(aa.edu_hope_dt='08',1,0)) - + SUM(IF(aa.edu_hope_dt='09',1,0)) - + SUM(IF(aa.edu_hope_dt='10',1,0)) - + SUM(IF(aa.edu_hope_dt='11',1,0)) - + SUM(IF(aa.edu_hope_dt='12',1,0)) AS cntSum + , SUM(DECODE(aa.edu_hope_dt,'01',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'02',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'03',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'04',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'05',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'06',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'07',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'08',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'09',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'10',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'11',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'12',1,0)) AS cntSum FROM ( SELECT - SUBSTRING(b.edu_hope_dt,1,4) AS edu_hope_yr - , SUBSTRING(b.edu_hope_dt,5,2) AS edu_hope_dt + SUBSTR(b.edu_hope_dt,1,4) AS edu_hope_yr + , SUBSTR(b.edu_hope_dt,6,2) AS edu_hope_dt , b.prsnl , a.edu_slct_cd , a.instt_div_cd div_cd @@ -2014,7 +2015,7 @@ /* AND d.instr_div = '20' */ - AND SUBSTRING(b.edu_hope_dt,1,4)=#mngNmbrYr# + AND SUBSTR(b.edu_hope_dt,1,4)=#mngNmbrYr# /* AND d.use_yn ='Y' AND c.user_id =d.user_id @@ -2022,7 +2023,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.aprvl_cd = '60' AND c.asgnm_aprvl_cd = '30' AND a.lctr_div_cd ='20' @@ -2068,61 +2069,61 @@ FROM ( SELECT aa.edu_hope_yr, aa.div_cd, aa.edu_slct_cd - , SUM(IF(aa.edu_hope_dt='01',aa.prsnl,0)) AS mnt01 - , SUM(IF(aa.edu_hope_dt='02',aa.prsnl,0)) AS mnt02 - , SUM(IF(aa.edu_hope_dt='03',aa.prsnl,0)) AS mnt03 - , SUM(IF(aa.edu_hope_dt='04',aa.prsnl,0)) AS mnt04 - , SUM(IF(aa.edu_hope_dt='05',aa.prsnl,0)) AS mnt05 - , SUM(IF(aa.edu_hope_dt='06',aa.prsnl,0)) AS mnt06 - , SUM(IF(aa.edu_hope_dt='07',aa.prsnl,0)) AS mnt07 - , SUM(IF(aa.edu_hope_dt='08',aa.prsnl,0)) AS mnt08 - , SUM(IF(aa.edu_hope_dt='09',aa.prsnl,0)) AS mnt09 - , SUM(IF(aa.edu_hope_dt='10',aa.prsnl,0)) AS mnt10 - , SUM(IF(aa.edu_hope_dt='11',aa.prsnl,0)) AS mnt11 - , SUM(IF(aa.edu_hope_dt='12',aa.prsnl,0)) AS mnt12 + , SUM(DECODE(aa.edu_hope_dt,'01',aa.prsnl,0)) AS mnt01 + , SUM(DECODE(aa.edu_hope_dt,'02',aa.prsnl,0)) AS mnt02 + , SUM(DECODE(aa.edu_hope_dt,'03',aa.prsnl,0)) AS mnt03 + , SUM(DECODE(aa.edu_hope_dt,'04',aa.prsnl,0)) AS mnt04 + , SUM(DECODE(aa.edu_hope_dt,'05',aa.prsnl,0)) AS mnt05 + , SUM(DECODE(aa.edu_hope_dt,'06',aa.prsnl,0)) AS mnt06 + , SUM(DECODE(aa.edu_hope_dt,'07',aa.prsnl,0)) AS mnt07 + , SUM(DECODE(aa.edu_hope_dt,'08',aa.prsnl,0)) AS mnt08 + , SUM(DECODE(aa.edu_hope_dt,'09',aa.prsnl,0)) AS mnt09 + , SUM(DECODE(aa.edu_hope_dt,'10',aa.prsnl,0)) AS mnt10 + , SUM(DECODE(aa.edu_hope_dt,'11',aa.prsnl,0)) AS mnt11 + , SUM(DECODE(aa.edu_hope_dt,'12',aa.prsnl,0)) AS mnt12 - , SUM(IF(aa.edu_hope_dt='01',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='02',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='03',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='04',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='05',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='06',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='07',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='08',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='09',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='10',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='11',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='12',aa.prsnl,0)) AS mntSum + , SUM(DECODE(aa.edu_hope_dt,'01',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'02',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'03',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'04',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'05',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'06',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'07',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'08',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'09',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'10',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'11',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'12',aa.prsnl,0)) AS mntSum - , SUM(IF(aa.edu_hope_dt='01',1,0)) AS cnt01 - , SUM(IF(aa.edu_hope_dt='02',1,0)) AS cnt02 - , SUM(IF(aa.edu_hope_dt='03',1,0)) AS cnt03 - , SUM(IF(aa.edu_hope_dt='04',1,0)) AS cnt04 - , SUM(IF(aa.edu_hope_dt='05',1,0)) AS cnt05 - , SUM(IF(aa.edu_hope_dt='06',1,0)) AS cnt06 - , SUM(IF(aa.edu_hope_dt='07',1,0)) AS cnt07 - , SUM(IF(aa.edu_hope_dt='08',1,0)) AS cnt08 - , SUM(IF(aa.edu_hope_dt='09',1,0)) AS cnt09 - , SUM(IF(aa.edu_hope_dt='10',1,0)) AS cnt10 - , SUM(IF(aa.edu_hope_dt='11',1,0)) AS cnt11 - , SUM(IF(aa.edu_hope_dt='12',1,0)) AS cnt12 + , SUM(DECODE(aa.edu_hope_dt,'01',1,0)) AS cnt01 + , SUM(DECODE(aa.edu_hope_dt,'02',1,0)) AS cnt02 + , SUM(DECODE(aa.edu_hope_dt,'03',1,0)) AS cnt03 + , SUM(DECODE(aa.edu_hope_dt,'04',1,0)) AS cnt04 + , SUM(DECODE(aa.edu_hope_dt,'05',1,0)) AS cnt05 + , SUM(DECODE(aa.edu_hope_dt,'06',1,0)) AS cnt06 + , SUM(DECODE(aa.edu_hope_dt,'07',1,0)) AS cnt07 + , SUM(DECODE(aa.edu_hope_dt,'08',1,0)) AS cnt08 + , SUM(DECODE(aa.edu_hope_dt,'09',1,0)) AS cnt09 + , SUM(DECODE(aa.edu_hope_dt,'10',1,0)) AS cnt10 + , SUM(DECODE(aa.edu_hope_dt,'11',1,0)) AS cnt11 + , SUM(DECODE(aa.edu_hope_dt,'12',1,0)) AS cnt12 - , SUM(IF(aa.edu_hope_dt='01',1,0)) - + SUM(IF(aa.edu_hope_dt='02',1,0)) - + SUM(IF(aa.edu_hope_dt='03',1,0)) - + SUM(IF(aa.edu_hope_dt='04',1,0)) - + SUM(IF(aa.edu_hope_dt='05',1,0)) - + SUM(IF(aa.edu_hope_dt='06',1,0)) - + SUM(IF(aa.edu_hope_dt='07',1,0)) - + SUM(IF(aa.edu_hope_dt='08',1,0)) - + SUM(IF(aa.edu_hope_dt='09',1,0)) - + SUM(IF(aa.edu_hope_dt='10',1,0)) - + SUM(IF(aa.edu_hope_dt='11',1,0)) - + SUM(IF(aa.edu_hope_dt='12',1,0)) AS cntSum + , SUM(DECODE(aa.edu_hope_dt,'01',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'02',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'03',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'04',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'05',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'06',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'07',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'08',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'09',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'10',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'11',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'12',1,0)) AS cntSum FROM ( SELECT - SUBSTRING(b.edu_hope_dt,1,4) AS edu_hope_yr - , SUBSTRING(b.edu_hope_dt,5,2) AS edu_hope_dt + SUBSTR(b.edu_hope_dt,1,4) AS edu_hope_yr + , SUBSTR(b.edu_hope_dt,6,2) AS edu_hope_dt , b.prsnl , a.edu_slct_cd , a.instt_div_cd div_cd @@ -2137,7 +2138,7 @@ /* AND d.instr_div = '20' */ - AND SUBSTRING(b.edu_hope_dt,1,4)=#mngNmbrYr# + AND SUBSTR(b.edu_hope_dt,1,4)=#mngNmbrYr# /* AND d.use_yn ='Y' AND c.user_id =d.user_id @@ -2145,7 +2146,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.aprvl_cd = '60' AND c.asgnm_aprvl_cd = '30' AND a.lctr_div_cd ='20' @@ -2191,61 +2192,61 @@ FROM ( SELECT aa.edu_hope_yr, aa.div_cd, aa.edu_slct_cd - , SUM(IF(aa.edu_hope_dt='01',aa.prsnl,0)) AS mnt01 - , SUM(IF(aa.edu_hope_dt='02',aa.prsnl,0)) AS mnt02 - , SUM(IF(aa.edu_hope_dt='03',aa.prsnl,0)) AS mnt03 - , SUM(IF(aa.edu_hope_dt='04',aa.prsnl,0)) AS mnt04 - , SUM(IF(aa.edu_hope_dt='05',aa.prsnl,0)) AS mnt05 - , SUM(IF(aa.edu_hope_dt='06',aa.prsnl,0)) AS mnt06 - , SUM(IF(aa.edu_hope_dt='07',aa.prsnl,0)) AS mnt07 - , SUM(IF(aa.edu_hope_dt='08',aa.prsnl,0)) AS mnt08 - , SUM(IF(aa.edu_hope_dt='09',aa.prsnl,0)) AS mnt09 - , SUM(IF(aa.edu_hope_dt='10',aa.prsnl,0)) AS mnt10 - , SUM(IF(aa.edu_hope_dt='11',aa.prsnl,0)) AS mnt11 - , SUM(IF(aa.edu_hope_dt='12',aa.prsnl,0)) AS mnt12 + , SUM(DECODE(aa.edu_hope_dt,'01',aa.prsnl,0)) AS mnt01 + , SUM(DECODE(aa.edu_hope_dt,'02',aa.prsnl,0)) AS mnt02 + , SUM(DECODE(aa.edu_hope_dt,'03',aa.prsnl,0)) AS mnt03 + , SUM(DECODE(aa.edu_hope_dt,'04',aa.prsnl,0)) AS mnt04 + , SUM(DECODE(aa.edu_hope_dt,'05',aa.prsnl,0)) AS mnt05 + , SUM(DECODE(aa.edu_hope_dt,'06',aa.prsnl,0)) AS mnt06 + , SUM(DECODE(aa.edu_hope_dt,'07',aa.prsnl,0)) AS mnt07 + , SUM(DECODE(aa.edu_hope_dt,'08',aa.prsnl,0)) AS mnt08 + , SUM(DECODE(aa.edu_hope_dt,'09',aa.prsnl,0)) AS mnt09 + , SUM(DECODE(aa.edu_hope_dt,'10',aa.prsnl,0)) AS mnt10 + , SUM(DECODE(aa.edu_hope_dt,'11',aa.prsnl,0)) AS mnt11 + , SUM(DECODE(aa.edu_hope_dt,'12',aa.prsnl,0)) AS mnt12 - , SUM(IF(aa.edu_hope_dt='01',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='02',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='03',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='04',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='05',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='06',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='07',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='08',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='09',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='10',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='11',aa.prsnl,0)) - + SUM(IF(aa.edu_hope_dt='12',aa.prsnl,0)) AS mntSum + , SUM(DECODE(aa.edu_hope_dt,'01',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'02',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'03',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'04',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'05',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'06',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'07',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'08',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'09',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'10',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'11',aa.prsnl,0)) + + SUM(DECODE(aa.edu_hope_dt,'12',aa.prsnl,0)) AS mntSum - , SUM(IF(aa.edu_hope_dt='01',1,0)) AS cnt01 - , SUM(IF(aa.edu_hope_dt='02',1,0)) AS cnt02 - , SUM(IF(aa.edu_hope_dt='03',1,0)) AS cnt03 - , SUM(IF(aa.edu_hope_dt='04',1,0)) AS cnt04 - , SUM(IF(aa.edu_hope_dt='05',1,0)) AS cnt05 - , SUM(IF(aa.edu_hope_dt='06',1,0)) AS cnt06 - , SUM(IF(aa.edu_hope_dt='07',1,0)) AS cnt07 - , SUM(IF(aa.edu_hope_dt='08',1,0)) AS cnt08 - , SUM(IF(aa.edu_hope_dt='09',1,0)) AS cnt09 - , SUM(IF(aa.edu_hope_dt='10',1,0)) AS cnt10 - , SUM(IF(aa.edu_hope_dt='11',1,0)) AS cnt11 - , SUM(IF(aa.edu_hope_dt='12',1,0)) AS cnt12 + , SUM(DECODE(aa.edu_hope_dt,'01',1,0)) AS cnt01 + , SUM(DECODE(aa.edu_hope_dt,'02',1,0)) AS cnt02 + , SUM(DECODE(aa.edu_hope_dt,'03',1,0)) AS cnt03 + , SUM(DECODE(aa.edu_hope_dt,'04',1,0)) AS cnt04 + , SUM(DECODE(aa.edu_hope_dt,'05',1,0)) AS cnt05 + , SUM(DECODE(aa.edu_hope_dt,'06',1,0)) AS cnt06 + , SUM(DECODE(aa.edu_hope_dt,'07',1,0)) AS cnt07 + , SUM(DECODE(aa.edu_hope_dt,'08',1,0)) AS cnt08 + , SUM(DECODE(aa.edu_hope_dt,'09',1,0)) AS cnt09 + , SUM(DECODE(aa.edu_hope_dt,'10',1,0)) AS cnt10 + , SUM(DECODE(aa.edu_hope_dt,'11',1,0)) AS cnt11 + , SUM(DECODE(aa.edu_hope_dt,'12',1,0)) AS cnt12 - , SUM(IF(aa.edu_hope_dt='01',1,0)) - + SUM(IF(aa.edu_hope_dt='02',1,0)) - + SUM(IF(aa.edu_hope_dt='03',1,0)) - + SUM(IF(aa.edu_hope_dt='04',1,0)) - + SUM(IF(aa.edu_hope_dt='05',1,0)) - + SUM(IF(aa.edu_hope_dt='06',1,0)) - + SUM(IF(aa.edu_hope_dt='07',1,0)) - + SUM(IF(aa.edu_hope_dt='08',1,0)) - + SUM(IF(aa.edu_hope_dt='09',1,0)) - + SUM(IF(aa.edu_hope_dt='10',1,0)) - + SUM(IF(aa.edu_hope_dt='11',1,0)) - + SUM(IF(aa.edu_hope_dt='12',1,0)) AS cntSum + , SUM(DECODE(aa.edu_hope_dt,'01',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'02',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'03',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'04',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'05',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'06',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'07',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'08',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'09',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'10',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'11',1,0)) + + SUM(DECODE(aa.edu_hope_dt,'12',1,0)) AS cntSum FROM ( SELECT - SUBSTRING(b.edu_hope_dt,1,4) AS edu_hope_yr - , SUBSTRING(b.edu_hope_dt,5,2) AS edu_hope_dt + SUBSTR(b.edu_hope_dt,1,4) AS edu_hope_yr + , SUBSTR(b.edu_hope_dt,6,2) AS edu_hope_dt , b.prsnl , a.edu_slct_cd , a.instt_div_cd div_cd @@ -2260,7 +2261,7 @@ /* AND d.instr_div = '20' */ - AND SUBSTRING(b.edu_hope_dt,1,4)=#mngNmbrYr# + AND SUBSTR(b.edu_hope_dt,1,4)=#mngNmbrYr# /* AND d.use_yn ='Y' AND c.user_id =d.user_id @@ -2268,7 +2269,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.aprvl_cd = '60' AND c.asgnm_aprvl_cd = '30' AND a.lctr_div_cd ='20' @@ -2291,8 +2292,8 @@ ) ORDER BY aaaa.edu_hope_yr - , IF(aaaa.div_cd='99','00',aaaa.div_cd) - , IF(aaaa.edu_slct_cd='99','00',IF(aaaa.edu_slct_cd='20','05',aaaa.edu_slct_cd)) + , DECODE(aaaa.div_cd,'99','00',aaaa.div_cd) + , DECODE(aaaa.edu_slct_cd,'99','00',DECODE(aaaa.edu_slct_cd,'20','05',aaaa.edu_slct_cd)) @@ -2445,8 +2446,8 @@ /* SELECT aa.areaNm2, COUNT(*) cnt - FROM ( SELECT TRIM(SUBSTRING(b.new_Addr, 1, INSTR(b.new_Addr,' ',INSTR(b.new_Addr,' ',1) +1))) AS areaNm1 , - TRIM(SUBSTRING(b.new_Addr , INSTR(b.new_Addr,' ',1) , INSTR(b.new_Addr,' ',INSTR(b.new_Addr,' ',1)+1) - INSTR(b.new_Addr,' ',1) ) ) AS areaNm2 + FROM ( SELECT TRIM(SUBSTR(b.new_Addr, 1, INSTR(b.new_Addr,' ',INSTR(b.new_Addr,' ',1) +1))) AS areaNm1 , + TRIM(SUBSTR(b.new_Addr , INSTR(b.new_Addr,' ',1) , INSTR(b.new_Addr,' ',INSTR(b.new_Addr,' ',1)+1) - INSTR(b.new_Addr,' ',1) ) ) AS areaNm2 FROM ve_schol b ) aa @@ -2480,8 +2481,8 @@ ,areaNm2 FROM ( - SELECT TRIM(SUBSTRING(b.new_Addr, 1, INSTR(b.new_Addr,' ',INSTR(b.new_Addr,' ',0) +1))) AS areaNm1 , - TRIM(SUBSTRING(b.new_Addr , INSTR(b.new_Addr,' ',1) , INSTR(b.new_Addr,' ',INSTR(b.new_Addr,' ',1)+1) - INSTR(b.new_Addr,' ',1) ) ) AS areaNm2 + SELECT TRIM(SUBSTR(b.new_Addr, 1, INSTR(b.new_Addr,' ',INSTR(b.new_Addr,' ',0) +1))) AS areaNm1 , + TRIM(SUBSTR(b.new_Addr , INSTR(b.new_Addr,' ',1) , INSTR(b.new_Addr,' ',INSTR(b.new_Addr,' ',1)+1) - INSTR(b.new_Addr,' ',1) ) ) AS areaNm2 FROM ve_schol b WHERE b.new_addr !='' )b0 @@ -2536,8 +2537,8 @@ SELECT aaaa.* , eeee.loc_nm , eeee.new_addr , - TRIM(SUBSTRING(eeee.new_Addr, 1, INSTR(eeee.new_Addr,' ',INSTR(eeee.new_Addr,' ',0) +1))) AS areaNm1, - TRIM(SUBSTRING(eeee.new_addr , INSTR(eeee.new_addr,' ',1) , INSTR(eeee.new_addr,' ',INSTR(eeee.new_addr,' ',1)+1) - INSTR(eeee.new_addr,' ',1) ) ) AS areaNm2 + TRIM(SUBSTR(eeee.new_Addr, 1, INSTR(eeee.new_Addr,' ',INSTR(eeee.new_Addr,' ',0) +1))) AS areaNm1, + TRIM(SUBSTR(eeee.new_addr , INSTR(eeee.new_addr,' ',1) , INSTR(eeee.new_addr,' ',INSTR(eeee.new_addr,' ',1)+1) - INSTR(eeee.new_addr,' ',1) ) ) AS areaNm2 FROM ( SELECT IF (sun_lctr_yn='Y',1,0) + IF (mon_lctr_yn='Y',1,0) + IF (tue_lctr_yn='Y',1,0) + IF (wed_lctr_yn='Y',1,0) + IF (thu_lctr_yn='Y',1,0) + IF (fri_lctr_yn='Y',1,0) + IF (sat_lctr_yn='Y',1,0) weekCnt , ddd.areaCnt , @@ -2550,7 +2551,7 @@ FROM ( SELECT user_id AS userId , CAST(SUM(chasi) AS INT) AS sumYr FROM ( SELECT d.user_id , - SUBSTRING(b.edu_hope_dt,1,4) AS mnt , + SUBSTR(b.edu_hope_dt,1,4) AS mnt , SUM(b.chasi) chasi FROM ve_lctr_stng d, ve_edu_chasi_instr_asgnm c , @@ -2558,7 +2559,7 @@ ve_edu_aplct a WHERE 1 =1 AND d.instr_div = '10' - AND SUBSTRING(b.edu_hope_dt,1,4)=#mngNmbrYr# + AND SUBSTR(b.edu_hope_dt,1,4)=#mngNmbrYr# AND d.use_yn ='Y' AND c.user_id =d.user_id AND b.edu_aplct_ord =c.edu_aplct_ord @@ -2570,7 +2571,7 @@ AND a.aprvl_cd = '60' AND c.asgnm_aprvl_cd = '30' GROUP BY d.user_id, - SUBSTRING(b.edu_hope_dt,1,4) + SUBSTR(b.edu_hope_dt,1,4) ) aa GROUP BY user_id @@ -2612,7 +2613,7 @@ AND bbbb.asgnm_aprvl_cd = '30' AND bbbb.edu_aplct_ord =cccc.edu_aplct_ord AND bbbb.edu_chasi_ord =cccc.edu_chasi_ord - AND SUBSTRING(cccc.edu_hope_dt,1,4)=#mngNmbrYr# + 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 dddd.lctr_div_cd ='10' @@ -2647,7 +2648,7 @@ SELECT aaaa.* , eeee.loc_nm , eeee.new_addr , - TRIM(SUBSTRING(eeee.new_addr , INSTR(eeee.new_addr,' ',1) , INSTR(eeee.new_addr,' ',INSTR(eeee.new_addr,' ',1)+1) - INSTR(eeee.new_addr,' ',1) ) ) AS areaNm2 + TRIM(SUBSTR(eeee.new_addr , INSTR(eeee.new_addr,' ',1) , INSTR(eeee.new_addr,' ',INSTR(eeee.new_addr,' ',1)+1) - INSTR(eeee.new_addr,' ',1) ) ) AS areaNm2 FROM ( SELECT IF (sun_lctr_yn='Y',1,0) + IF (mon_lctr_yn='Y',1,0) + IF (tue_lctr_yn='Y',1,0) + IF (wed_lctr_yn='Y',1,0) + IF (thu_lctr_yn='Y',1,0) + IF (fri_lctr_yn='Y',1,0) + IF (sat_lctr_yn='Y',1,0) weekCnt , ddd.areaCnt , aaa.sumYr @@ -2660,7 +2661,7 @@ FROM ( SELECT user_id AS userId , CAST(SUM(chasi) AS INT) AS sumYr FROM ( SELECT d.user_id , - SUBSTRING(b.edu_hope_dt,1,4) AS mnt , + SUBSTR(b.edu_hope_dt,1,4) AS mnt , SUM(b.chasi) chasi FROM ve_lctr_stng d, ve_edu_chasi_instr_asgnm c , @@ -2668,7 +2669,7 @@ ve_edu_aplct a WHERE 1 =1 AND d.instr_div = '10' - AND SUBSTRING(b.edu_hope_dt,1,4)=mngNmbrYr + AND SUBSTR(b.edu_hope_dt,1,4)=mngNmbrYr AND d.use_yn ='Y' AND c.user_id =d.user_id AND b.edu_aplct_ord =c.edu_aplct_ord @@ -2680,7 +2681,7 @@ AND a.aprvl_cd = '60' AND c.asgnm_aprvl_cd = '30' GROUP BY d.user_id, - SUBSTRING(b.edu_hope_dt,1,4) + SUBSTR(b.edu_hope_dt,1,4) ) aa GROUP BY user_id @@ -2722,7 +2723,7 @@ AND bbbb.asgnm_aprvl_cd = '30' AND bbbb.edu_aplct_ord =cccc.edu_aplct_ord AND bbbb.edu_chasi_ord =cccc.edu_chasi_ord - AND SUBSTRING(cccc.edu_hope_dt,1,4)=mngNmbrYr + 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 dddd.lctr_div_cd ='10' diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngReg.jsp index dffc5edd..2c926c78 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngReg.jsp @@ -482,6 +482,7 @@ +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp index b02de499..a6e322db 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp @@ -500,7 +500,7 @@ title="Check" type="checkbox"/> - + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp index ca5e3bb0..92805490 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp @@ -309,7 +309,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduInstrFeeMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduInstrFeeMngList.jsp index 48cbfa05..98af32b9 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduInstrFeeMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduInstrFeeMngList.jsp @@ -316,8 +316,9 @@ 미제출제출 - - + ${list.eduHopeDt} +<%-- --%> +<%-- --%> diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp index 08604fc4..bed52e2a 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp @@ -407,7 +407,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrCostPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrCostPopup.jsp index 5fd20380..603addc2 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrCostPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrCostPopup.jsp @@ -100,6 +100,7 @@ $("#specialWorkAllow").val($("#specialWorkAllow").val().replaceAll(',','')); $("#distanceAllow").val($("#distanceAllow").val().replaceAll(',','')); $("#trafficFee").val($("#trafficFee").val().replaceAll(',','')); + //$("#spareFee").val($("#trafficFee").val().replaceAll(',','')); var acmdtAprvlCd = $("#acmdtAprvlCd").val(); if(acmdtAprvlCd == "10"){ diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp index b43faa22..7d094c55 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp @@ -111,7 +111,7 @@ - + @@ -192,7 +192,7 @@
- +
    ', '');">
  • 번호