diff --git a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java index fa63f472..e119f9a2 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java @@ -957,6 +957,8 @@ public class CommonWebController { vEInstrAsgnmVO.setAsgnmAprvlCd(veEduAplctVO.getAsgnmAprvlCd()); ArrayList vEInstrDetailVOList = new ArrayList(); + ArrayList vEEduChasiVOList = new ArrayList(); + for (int i=0;i vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO); + //신청일 정렬 + if(StringUtils.isEmpty(vEEduAplctVO.getOrderByQuery())) { + vEEduAplctVO.setOrderByQuery("A.sbmt_pnttm DESC"); + } List vEEduAplctVOList = vEEduMIXService.selectPagingApplyList(vEEduAplctVO); //3.pageing step3 paginationInfo = this.setPagingStep3(vEEduAplctVOList, paginationInfo); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java index 3d08797d..846e0815 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduChasiVO.java @@ -142,6 +142,8 @@ public class VEEduChasiVO extends ComDefaultVO implements Serializable { private String veaRsltRprtOrd; //결과보고제출순번 + private String eduPlaceCd; //교육장소 코드 + public String getQustnrQesitmId10Cnt() { return qustnrQesitmId10Cnt; @@ -745,5 +747,11 @@ public class VEEduChasiVO extends ComDefaultVO implements Serializable { public void setAvgScoreFloat(String avgScoreFloat) { this.avgScoreFloat = avgScoreFloat; } + public String getEduPlaceCd() { + return eduPlaceCd; + } + public void setEduPlaceCd(String eduPlaceCd) { + this.eduPlaceCd = eduPlaceCd; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java index 103decff..d5e3bce9 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java @@ -3,6 +3,7 @@ package kcc.ve.instr.tngrVisitEdu.prcsInfo.service; import java.util.List; import java.util.Map; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; public interface VEPrcsAplctPrdService { @@ -70,4 +71,5 @@ public interface VEPrcsAplctPrdService { List selectCfnPagingList4Fndth(VEPrcsDetailVO vEPrcsDetailVO) throws Exception; + int memoUpdate(VEPrcsDetailVO vEPrcsDetailVO) throws Exception; } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java index a048174d..0d8e2f4a 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java @@ -212,6 +212,8 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { private String loginId; private String prcsCnTwo; //과정내용 + private String prvtMemoCn; //비공개 메모 + public String getEduPrcsOrd() { return eduPrcsOrd; } @@ -1034,6 +1036,12 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { public void setPrcsCnTwo(String prcsCnTwo) { this.prcsCnTwo = prcsCnTwo; } + public String getPrvtMemoCn() { + return prvtMemoCn; + } + public void setPrvtMemoCn(String prvtMemoCn) { + this.prvtMemoCn = prvtMemoCn; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java index f8b2a562..fffbb647 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java @@ -6,6 +6,7 @@ import java.util.Map; import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; @@ -144,4 +145,8 @@ public class VEPrcsAplctPrdDAO extends EgovAbstractDAO { return (List) list("VEPrcsAplctPrdDAO.selectOneDayBeforeTrainingStartDate", vEPrcsDetailVO); } + public int memoUpdate(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { + return update("VEPrcsAplctPrdDAO.memoUpdate", vEPrcsDetailVO); + } + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java index 28ef593f..d1c7b080 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java @@ -9,6 +9,7 @@ import javax.annotation.Resource; import org.springframework.stereotype.Service; import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsAplctPrdService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; @@ -156,5 +157,8 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService { return vEPrcsAplctPrdDAO.selectOneDayBeforeTrainingStartDate(vEPrcsDetailVO); } - + @Override + public int memoUpdate(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { + return vEPrcsAplctPrdDAO.memoUpdate(vEPrcsDetailVO); + } } diff --git a/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java b/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java index e6609255..fa556bbd 100644 --- a/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java +++ b/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java @@ -1404,7 +1404,49 @@ public class FndthPrcsAplctPrdMngController { modelAndView.addObject("result", "success"); return modelAndView; } + /** + * ve_prcs_aplct_prd 메모 업데이트 + */ + @RequestMapping("/kccadr/oprtn/fndthEnhanceTrn/updateMemoAjax.do") + public ModelAndView unqIsuesRegPopupAjax( + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + , 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 { + + vEPrcsDetailVO.setLastUpdusrId(loginVO.getUniqId()); //esntl_id + vEPrcsAplctPrdService.memoUpdate(vEPrcsDetailVO); + + 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/VEEduChasi_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduChasi_SQL_Tibero.xml index 102a502d..d6aaeb17 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduChasi_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduChasi_SQL_Tibero.xml @@ -173,9 +173,15 @@ 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 e04b9007..b5fa1149 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 @@ -1343,6 +1343,7 @@ , A.EDU_PLACE AS eduPlace + , A.EDU_PLACE_cd AS eduPlaceCd , A.SBMT_YN AS sbmtYn , TO_CHAR(A.SBMT_PNTTM, 'YYYY.MM.DD') AS sbmtPnttm @@ -4023,6 +4024,7 @@ , A.EDU_PRSNL AS eduPrsnl , A.schol_instt_nm AS scholInsttNm , A.edu_place AS eduPlace + , A.edu_place_cd AS eduPlaceCd , A.INSTT_NM AS InsttNm , A.hope_sbjct AS hopeSbjct , A.INSTT_DIV_CD AS insttDivCd @@ -8685,5 +8687,6 @@ VALUES WHERE a.LCTR_DIV_CD = '10' #rsltList[]# + ORDER BY b.EDU_HOPE_DT ASC, B.STRT_TM ASC; diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml index 1c6dc327..6791fd2a 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml @@ -599,6 +599,7 @@ ) AS lctrPlanRsltAtchFileId --> ,'' AS lctrPlanRsltAtchFileId + ,a.prvt_memo_cn AS prvtMemoCn FROM ve_prcs_aplct_prd a , ve_prcs b @@ -1420,5 +1421,17 @@ AND TO_DATE(a.EDU_STRT_PNTTM, 'YYYY.MM.DD') = TRUNC(SYSDATE) + NUMTODSINTERVAL(#diffDay#, 'DAY') AND a.LCTR_DIV_CD = #lctrDivCd# AND vea.USER_ID IS NOT null - + + + + /*VEPrcsAplctPrdDAO.memoUpdate*/ + UPDATE ve_prcs_aplct_prd + SET + prvt_memo_cn = #prvtMemoCn#, + last_updt_pnttm = SYSDATE, + last_updusr_id = #lastUpdusrId# + WHERE + prcs_aplct_prd_ord = #prcsAplctPrdOrd# + + 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 27614753..4ca9f824 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp @@ -367,10 +367,16 @@ //sms, 메일 발송 if(returnData.vEInstrDetailVOList != null){ for(var i=0; i @@ -331,6 +355,10 @@ +
+ + +
@@ -717,7 +745,7 @@ - + + + +
+

비공개 메모

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

내용

+
+
+ + +
+
+
+ +
@@ -741,7 +796,7 @@
- + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctReg.jsp index 3065b8eb..cffbd77b 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctReg.jsp @@ -503,7 +503,7 @@ $(document).ready(function(){

교육차시 정보

- ※ 교육추가 버튼을누러 대상별 1줄씩 작성(1줄 = 강사 1인) 바랍니다. (예시 : 3개 학급 신청 시 대상별 3줄 작성) + ※ 교육 추가 버튼을 눌러 대상별 1줄씩(1줄 = 강사 1인) 작성 바랍니다. (예시: 3개 학급 신청 시, 1학급 당 1줄씩 총 3줄을 작성)
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngMdfy2.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngMdfy2.jsp index 7495b982..8660b6cc 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngMdfy2.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngMdfy2.jsp @@ -650,7 +650,7 @@

교육차시 정보

- ※ 교육추가 버튼을누러 대상별 1줄씩 작성(1줄 = 강사 1인) 바랍니다. (예시 : 3개 학급 신청 시 대상별 3줄 작성) + ※ 교육 추가 버튼을 눌러 대상별 1줄씩(1줄 = 강사 1인) 작성 바랍니다. (예시: 3개 학급 신청 시, 1학급 당 1줄씩 총 3줄을 작성) diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp index e233ee82..179a1b4e 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp @@ -538,7 +538,7 @@ $( document ).ready(function(){

교육차시 정보

- ※ 교육추가 버튼을누러 대상별 1줄씩 작성(1줄 = 강사 1인) 바랍니다. (예시 : 3개 학급 신청 시 대상별 3줄 작성) + ※ 교육 추가 버튼을 눌러 대상별 1줄씩(1줄 = 강사 1인) 작성 바랍니다. (예시: 3개 학급 신청 시, 1학급 당 1줄씩 총 3줄을 작성) diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctReg.jsp index 279804ea..19211739 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctReg.jsp @@ -560,7 +560,7 @@ $(document).ready(function(){

교육차시 정보

- ※ 교육추가 버튼을누러 대상별 1줄씩 작성(1줄 = 강사 1인) 바랍니다. (예시 : 3개 학급 신청 시 대상별 3줄 작성) + ※ 교육 추가 버튼을 눌러 대상별 1줄씩(1줄 = 강사 1인) 작성 바랍니다. (예시: 3개 학급 신청 시, 1학급 당 1줄씩 총 3줄을 작성)
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 f6e87882..ff566869 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp @@ -610,7 +610,7 @@ var viewer = new m2soft.crownix.Viewer('http://119.193.215.98:8093/ReportingServer/service'); viewer.hideToolbarItem(["save"]); /* viewer.openFile('tnrg_rslts_240117.mrd', '/rf [http://192.168.0.12:8086/offedu/ve/aplct/tngrVisitEdu/eduAplct/tngrRsltRprtListAjax.do?rsltList='+rsltList+']'); */ - viewer.openFile('tnrg_rslts_240117.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/tngrVisitEdu/eduAplct/tngrRsltRprtListAjax.do?rsltList='+rsltList+']'); + viewer.openFile('tnrg_rslts_240117.mrd', '/rf [http://192.168.0.12:8086/offedu/ve/aplct/tngrVisitEdu/eduAplct/tngrRsltRprtListAjax.do?rsltList='+rsltList+']'); } } diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.jsp index 3e76bae7..b36d70d0 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.jsp @@ -118,7 +118,8 @@ - + <%-- --%> + @@ -141,7 +142,14 @@ - + + + ${list.eduPlace} + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfy.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfy.jsp index 7e86a30d..f8705437 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfy.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfy.jsp @@ -952,7 +952,7 @@

교육차시 정보

- ※ 교육추가 버튼을누러 대상별 1줄씩 작성(1줄 = 강사 1인) 바랍니다. (예시 : 3개 학급 신청 시 대상별 3줄 작성) + ※ 교육 추가 버튼을 눌러 대상별 1줄씩(1줄 = 강사 1인) 작성 바랍니다. (예시: 3개 학급 신청 시, 1학급 당 1줄씩 총 3줄을 작성)
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp index d1950698..c5afac2f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp @@ -1587,10 +1587,10 @@ function _chkChasiTime(p_this){

교육차시 정보

- ※ 교육추가 버튼을누러 대상별 1줄씩 작성(1줄 = 강사 1인) 바랍니다. (예시 : 3개 학급 신청 시 1학급 당 1줄씩 총 3줄을 작성) + ※ 교육 추가 버튼을 눌러 대상별 1줄씩(1줄 = 강사 1인) 작성 바랍니다. (예시: 3개 학급 신청 시, 1학급 당 1줄씩 총 3줄을 작성)
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctRegSample.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctRegSample.jsp index bccebb0c..2758e880 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctRegSample.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctRegSample.jsp @@ -950,7 +950,7 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크

교육차시 정보

- ※ 교육추가 버튼을누러 대상별 1줄씩 작성(1줄 = 강사 1인) 바랍니다. (예시 : 3개 학급 신청 시 대상별 3줄 작성) + ※ 교육 추가 버튼을 눌러 대상별 1줄씩(1줄 = 강사 1인) 작성 바랍니다. (예시: 3개 학급 신청 시, 1학급 당 1줄씩 총 3줄을 작성)