diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailService.java index 0d70dbf4..19f9e87e 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailService.java @@ -34,6 +34,8 @@ public interface VEInstrDetailService { VEInstrDetailVO selectSlctnTeacher(VEInstrDetailVO vEInstrDetailVO) throws Exception; int updateInstrMemo(VEInstrDetailVO vEInstrDetailVO) throws Exception; + + int updateInstrSigMemo(VEInstrDetailVO vEInstrDetailVO) throws Exception; //EgovMap selectAdrRpplInfo(AdjstChangeDateVO adjstChangeDateVO) throws Exception; diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java index 8c7788f1..c057abb5 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java @@ -157,7 +157,9 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable { private String mngNmbrYr; - private String memo; + private String memo; // 비공개 메모 + + private String sigMemo; // 특이사항 메모 public String getLrnTmSum() { return lrnTmSum; @@ -795,4 +797,11 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable { public void setMngNmbrYr(String mngNmbrYr) { this.mngNmbrYr = mngNmbrYr; } + public String getSigMemo() { + return sigMemo; + } + public void setSigMemo(String sigMemo) { + this.sigMemo = sigMemo; + } + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailDAO.java index e7e70473..c2a79f89 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailDAO.java @@ -81,10 +81,14 @@ public class VEInstrDetailDAO extends EgovAbstractDAO { public VEInstrDetailVO selectSlctnTeacher(VEInstrDetailVO vEInstrDetailVO) throws Exception { return (VEInstrDetailVO) select("VEInstrDetailDAO.selectSlctnTeacher", vEInstrDetailVO); } - + public int updateInstrMemo(VEInstrDetailVO vEInstrDetailVO) throws Exception { return update("VEInstrDetailDAO.updateInstrMemo", vEInstrDetailVO); } + + public int updateInstrSigMemo(VEInstrDetailVO vEInstrDetailVO) throws Exception { + return update("VEInstrDetailDAO.updateInstrSigMemo", vEInstrDetailVO); + } /** diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailServiceImpl.java index cf35f3f7..96f9390e 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailServiceImpl.java @@ -85,6 +85,11 @@ public class VEInstrDetailServiceImpl implements VEInstrDetailService { return vEInstrDetailDAO.updateInstrMemo(vEInstrDetailVO); } + + public int updateInstrSigMemo(VEInstrDetailVO vEInstrDetailVO) throws Exception { + return vEInstrDetailDAO.updateInstrSigMemo(vEInstrDetailVO); + + } diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/web/EduAplctMngAdultController.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/web/EduAplctMngAdultController.java index 2d5b0252..41a639c3 100644 --- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/web/EduAplctMngAdultController.java +++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/web/EduAplctMngAdultController.java @@ -146,6 +146,14 @@ public class EduAplctMngAdultController { vEEduAplctVO = this.setPagingStep2(vEEduAplctVO, paginationInfo); vEEduAplctVO.setNotiUserId(user.getUniqId()); vEEduAplctVO.setMenuNo(session.getAttribute("menuNo").toString()); + + System.out.println("orderByQuery getOrderByQuery :: "+ vEEduAplctVO.getOrderByQuery()); + + // OrderByQuery(교육희망일자) 값이 비여있으면 desc로 초기화 함 => hylee + if(StringUtils.isEmpty(vEEduAplctVO.getOrderByQuery())) { + vEEduAplctVO.setOrderByQuery("desc"); + } + List vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO); vEEduAplctVOList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduAplctVOList); //3.pageing step3 diff --git a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java index d7c8ac69..a6ebc1d9 100644 --- a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java +++ b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java @@ -2514,6 +2514,49 @@ public class OprtnInstrTngrPrflContoller { return modelAndView; } + /** + * 특이 사항 메모저장 + */ + @RequestMapping("/ve/oprtn/instr/tngrVisitEdu/instrInfo/instrSigMemoUpdateAjax.do") + public ModelAndView instrSigMemoUpdateAjax( + @ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + //로그인 처리==================================== + //로그인 정보 가져오기 + String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model); + if (!"".equals(s_oprtnLoginCheckNInfo)) { + modelAndView.addObject("result", "loginFail"); + return modelAndView; + } + //로그인 처리==================================== + + //LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + + int successCnt = 0; + try { + + vEInstrDetailService.updateInstrSigMemo(vEInstrDetailVO); + + successCnt = successCnt+1; + + } catch (Exception ex) { + ex.printStackTrace(); + } + if (successCnt == 0) { + modelAndView.addObject("result", "fail"); + } else { + modelAndView.addObject("result", "success"); + } + + return modelAndView; + } + ///////////////////////////////////////////////////////////////////////////////////// // diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Cubrid.xml index bfe91c2d..96856d1f 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Cubrid.xml @@ -778,8 +778,18 @@ , A.EDU_APLCT_ORD DESC - , $orderByQuery$ + + , CC.EDU_HOPE_DT desc + + + , CC.EDU_HOPE_DT asc + + + + + + LIMIT #recordCountPerPage# OFFSET #firstIndex# diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Cubrid.xml index ed8c8a5f..d4cedb9a 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Cubrid.xml @@ -127,7 +127,8 @@ a.appt_dt AS apptDt, a.hchk_dt AS hchkDt, a.rmrks AS rmrks, - a.memo AS memo + a.memo AS memo, + a.sig_memo AS sigMemo @@ -550,4 +551,18 @@ INSTR_DIV = #instrDiv# + + + UPDATE + VE_INSTR_DETAIL + SET + SIG_MEMO = #sigMemo# + WHERE + USER_ID = #userId# + AND + INSTR_DETAIL_ORD = #instrDetailOrd# + AND + INSTR_DIV = #instrDiv# + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngList.jsp index c0ec1a09..beff326a 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngList.jsp @@ -22,6 +22,12 @@ @@ -300,6 +326,13 @@ +
+ + + + +
+ " /> @@ -564,6 +597,31 @@ + + +
+

특이사항 메모

+
+
+ + + + + + + + + + +
+

내용

+
+
+ + +
+
+
diff --git a/src/main/webapp/images/sortDown.png b/src/main/webapp/images/sortDown.png new file mode 100644 index 00000000..113eabba Binary files /dev/null and b/src/main/webapp/images/sortDown.png differ diff --git a/src/main/webapp/images/sortUp.png b/src/main/webapp/images/sortUp.png new file mode 100644 index 00000000..42721534 Binary files /dev/null and b/src/main/webapp/images/sortUp.png differ