diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngAdultController.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngAdultController.java index 8e490a5b..3efe4571 100644 --- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngAdultController.java +++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngAdultController.java @@ -9,6 +9,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.apache.commons.lang3.StringUtils; import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -191,6 +192,9 @@ public class EduAsgnmCnfrmMngAdultController { vEEduAplctVO.setSearchAsgnmAprvlCd("30"); //교육배치확정 대상은 강사가 배정확정되어야 한다. + if(StringUtils.isEmpty(vEEduAplctVO.getOrderByQuery())) { + vEEduAplctVO.setOrderByQuery("CC.EDU_HOPE_DT desc"); + } List vEEduAplctVOList = vEEduMIXService.selectAdultPagingList(vEEduAplctVO); //이름 복호화 VEEduAplctVO vo = new VEEduAplctVO(); 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 7eafb8e0..7db114e5 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 @@ -189,6 +189,9 @@ public class EduCnfrmMngAdultController { System.out.println("vEEduAplctVO.getSearchRsdne()"); System.out.println(vEEduAplctVO.getSearchRsdne()); + if(StringUtils.isEmpty(vEEduAplctVO.getOrderByQuery())) { + vEEduAplctVO.setOrderByQuery("AA.eduHopeDt desc"); + } List vEEduAplctVOList = vEEduMIXService.selectTngrRsltPagingList(vEEduAplctVO); VEEduAplctVO vo = new VEEduAplctVO(); for(int i=0; i < vEEduAplctVOList.size(); i++) { diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java index b6471828..326bc025 100644 --- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java +++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java @@ -204,6 +204,9 @@ public class EduRsltMngAdultController { vEEduAplctVO = egovCryptoUtil.encryptVEEduAplctVOInfo(vEEduAplctVO); + if(StringUtils.isEmpty(vEEduAplctVO.getOrderByQuery())) { + vEEduAplctVO.setOrderByQuery("AA.eduHopeDt desc"); + } List vEEduAplctVOList = vEEduMIXService.selectTngrRsltPagingList(vEEduAplctVO); VEEduAplctVO vo = new VEEduAplctVO(); for(int i=0; i < vEEduAplctVOList.size(); i++) { diff --git a/src/main/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java index 5184d003..024c0122 100644 --- a/src/main/java/kcc/web/MainController.java +++ b/src/main/java/kcc/web/MainController.java @@ -1586,7 +1586,7 @@ public class MainController { } } - menuManageVO.setAuthorCode(auth); + /*menuManageVO.setAuthorCode(auth);*/ menuManageVO.setMenuUserType(menuManageVO.getMenuUserType()); List menuResultList = menuCreateManageService.selectMenuListJtreeWeb(menuManageVO) ; System.out.println("======================== menuResultList"); 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 2585076b..0337f64f 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 @@ -2816,13 +2816,13 @@ AND AA.insttNm LIKE '%' || #searchKeyword# || '%' - ORDER BY 1 + ORDER BY 1 , eduAplctOrd desc, eduChasiOrd - , $orderByQuery$ + ORDER BY $orderByQuery$ /* diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngList.jsp index 0295faab..28633342 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngList.jsp @@ -38,6 +38,12 @@ $(document).ready(function(){ + $('.eduHope').click(function(){ + var $tag = $('#orderByQuery'); + $tag.val($(this).data('info')); + linkPage(1); + }); + }); function linkPage(pageNo){ @@ -80,6 +86,8 @@ " /> " /> + " /> +
@@ -167,7 +175,16 @@ 번호 - 교육희망일자 + 교육희망일자 + + + + + + + + + 시간 온·오프라인 지역 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 c2e4170d..2e15e0c3 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp @@ -64,6 +64,12 @@ // setSearchMonthDate('${vEEduAplctVO.searchMonth}'); // } + $('.eduHope').click(function(){ + var $tag = $('#orderByQuery'); + $tag.val($(this).data('info')); + linkPage(1); + }); + }); function setSearchMonthDate(month){ @@ -520,6 +526,7 @@ " /> " /> + " /> " /> @@ -637,7 +644,16 @@ - 교육희망일자 + 교육희망일자 + + + + + + + + + 요일 시간 온·오프라인 @@ -657,7 +673,7 @@ ${list.asgnmAprvlCd} + 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 8567865e..ecc783d8 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp @@ -38,6 +38,12 @@