From bf04903d9e3227eec0b4a51b6e940768416df64a Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 28 Jun 2023 15:54:52 +0900 Subject: [PATCH] =?UTF-8?q?feat=20:=20PMS:#3225=20=EA=B0=95=EC=82=AC=20?= =?UTF-8?q?=ED=8A=B9=EC=9D=B4=EC=82=AC=ED=95=AD=20=EB=A9=94=EB=AA=A8=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/VEInstrDetailService.java | 2 + .../instrInfo/service/VEInstrDetailVO.java | 11 +++- .../service/impl/VEInstrDetailDAO.java | 6 +- .../impl/VEInstrDetailServiceImpl.java | 5 ++ .../web/EduAplctMngAdultController.java | 8 +++ .../web/OprtnInstrTngrPrflContoller.java | 43 +++++++++++++ .../sqlmap/ve/edu/VEEdu_MIX_SQL_Cubrid.xml | 12 +++- .../ve/instr/VEInstrDetail_SQL_Cubrid.xml | 17 ++++- .../oprtn/adultVisitEdu/eduAplctMngList.jsp | 20 +++++- .../jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp | 58 ++++++++++++++++++ src/main/webapp/images/sortDown.png | Bin 0 -> 1018 bytes src/main/webapp/images/sortUp.png | Bin 0 -> 1012 bytes 12 files changed, 176 insertions(+), 6 deletions(-) create mode 100644 src/main/webapp/images/sortDown.png create mode 100644 src/main/webapp/images/sortUp.png 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 0000000000000000000000000000000000000000..113eabba57b1e14915c28d7e0a154ac914ca8843 GIT binary patch literal 1018 zcmaJ=O=uHA6kc1cwa|+w_zS}pMZxTEHfEQ`nr72B;FhutGzSaa>`t1s-JNxIVzyPV z2nwP?d-Nj3dwTRD(n3AxLA;8Gf}jU`@hEywXVWD0VBEvbo8kMu_q{i79!^b;4-T9f zU>IhwFrk}tjpP3QKKkGK>A#@MNs=#-X;dL~3qvOBpfUsn&zgrOw49}zZ{aY*^qzN% zB~mi3X*TjWE5>k<7f?3C439*CWiLPi%5dKGGwipQn=Ejh3_GJ3f)V6k)ty+zaC&*N zXfH3=s>6<40mG3-1w2SB5P6G!s6`pJsjJaAKIU1_gph>{yJxCoOo1H25GY(KVT(xx zTvjloMh~OA4AKf!4>;Y}l!2rasonMRystN=Tsbe7#=h>N1D$ zJTI!M$_o-NNePNbgiAiLqJ$p~wH0(2+Sm<!VuN4O)su86sHQb9EKJ_xQNhVyNgp* zL{L~o0m$XzuBqU{jO#n79$sv63_~mUA+dZL7W52DRXEpmG$EN)l-y`Ct?RNV=10|> ztfpmIQWZIy&S#Z2S4VcugFb08UKxw#MT zt}?>r-QT~St*@`ARvS;oXSJcnhmt?et{#2;y!!st?eEv0uGT(DgZkF-o?4^t>)3Sh zz_HE4Wr2Ov)0pWo>ubsFFKdm;%I?Mro;`B^;G55wh$~Dl(>QTvXBRxU6Tiknep25U HoxAr3*Ox>h literal 0 HcmV?d00001 diff --git a/src/main/webapp/images/sortUp.png b/src/main/webapp/images/sortUp.png new file mode 100644 index 0000000000000000000000000000000000000000..427215344cd7d3dbc1ea4d9fbbd917d876bd3cb9 GIT binary patch literal 1012 zcmaJ=&rj4q6s{~mLR>DIpd^|}Nf3hDU;Be?rNYt{Sz^g%S;HPQq1z6-&C*V32e#k^ zi5I;PFCIK9XFO?4Ow@zXsPP{#@o3@=Zzk%&>9V_caP6VW*uTsfmPd;>BASVXkc41y`0uL-BV!Ap5ON2()MD> z+^(CVMNeM=Q=voz9Ec4NI%{qqg)-gLl}H>NvovTza9yU4OqKNlP>>Hnn#m+gK9vTO zBEx5rDN(!x1dh+LT$bgN2|gpGI7tvd>!V3F-&&Q5>Rc-q*~xSbV^3n)Mx((rk__^z zEH8>8%L%L?BnToAY`NG76K*ilR#0JJ`nHE{&E}H4 zre+mQNzEx*niJYw6`30jba9(&9dmPCxzRW{9?7gi-`<4QoR1vPEL*a>dztL2*Wy~; zy=1#`Sz?BbF88m?ZXb~eio(w5l1*p$p-U#-C!_u4{NR1^EUdhmD}|pcD>Jc$g@v!D z%2e_pJp`W47Yg6s{rYjZM}OoWjsM(ZBj$kp5X_5`!~I@Grb?4^xW$E6nnliF|%`mioZR3d-p)R7rn#0wx}M=uI&B+ Dcf>j+ literal 0 HcmV?d00001