From 0e409196b3f82c3988696ec22f524cce628b340d Mon Sep 17 00:00:00 2001 From: myname Date: Mon, 8 Apr 2024 12:09:05 +0900 Subject: [PATCH] =?UTF-8?q?2024-04-08=20=EC=B2=AD=EC=86=8C=EB=85=84=20?= =?UTF-8?q?=EC=B0=BE=EA=B5=90=20=EA=B0=95=EC=82=AC=ED=99=9C=EB=8F=99?= =?UTF-8?q?=ED=99=95=EC=9D=B8=EC=84=9C=20=EC=9C=84=EC=B4=89=EA=B8=B0?= =?UTF-8?q?=EA=B0=84=20=EA=B4=80=EB=A6=AC=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aplct/comweb/CrownixAjaxController.java | 3 ++ .../VEInstrDetailActvtHstryService.java | 3 ++ .../service/VEInstrDetailActvtHstryVO.java | 8 ++++ .../instrInfo/service/VEInstrDetailVO.java | 8 ++++ .../impl/VEInstrDetailActvtHstryDAO.java | 6 ++- .../VEInstrDetailActvtHstryServiceImpl.java | 5 +++ .../InstrActvtHstryTngrMngController.java | 36 +++++++++++++++++ .../VEInstrDetailActvtHstry_SQL_Tibero.xml | 10 +++++ .../ve/instr/VEInstrDetail_SQL_Tibero.xml | 1 + .../tngrVisitEdu/instrActvtHstryMngDetail.jsp | 40 ++++++++++++++++++- 10 files changed, 118 insertions(+), 2 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java index 90d01d30..6a57c41f 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java @@ -1099,11 +1099,14 @@ public class CrownixAjaxController { p_modelAndView.addObject("page_1_25", "교육본부(교육운영팀)"); //담당부서 p_modelAndView.addObject("page_1_26", "경상남도 진주시 소호로 117"); //주소 + /* if ("Y".equals(p_vEInstrDetailVODetail.getQlfctEndYn())) { p_modelAndView.addObject("page_1_27", p_vEInstrDetailVODetail.getAprvlPnttm()+"~"+p_vEInstrDetailVODetail.getQlfctEndPnttm()); //위촉기간 }else { p_modelAndView.addObject("page_1_27", p_vEInstrDetailVODetail.getAprvlPnttm()+"~"); //위촉기간 } + */ + p_modelAndView.addObject("page_1_27", p_vEInstrDetailVODetail.getActvtPeriod()); //위촉기간 - 입력받는 값으로 수정 처리함 //modelAndView.addObject("page_1_28", "-"); //활동내용 diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryService.java index 3dce904d..0eaf5715 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryService.java @@ -13,6 +13,9 @@ public interface VEInstrDetailActvtHstryService { VEInstrDetailActvtHstryVO findById(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO); void updateStateCd(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO); + + void updateActvtPeriod(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO); + List selectSignAndCmpltCrtfcPagingList( VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryVO.java index b2f4c0e8..fe36a59f 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailActvtHstryVO.java @@ -72,6 +72,8 @@ public class VEInstrDetailActvtHstryVO extends ComDefaultVO implements Serializa private String eduStrtPnttm; // + private String actvtPeriod; + public String getInstrDetailActvtHstryOrd() { @@ -290,6 +292,12 @@ public class VEInstrDetailActvtHstryVO extends ComDefaultVO implements Serializa public void setEduStrtPnttm(String eduStrtPnttm) { this.eduStrtPnttm = eduStrtPnttm; } + public String getActvtPeriod() { + return actvtPeriod; + } + public void setActvtPeriod(String actvtPeriod) { + this.actvtPeriod = actvtPeriod; + } 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 617ae859..4d7013d3 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 @@ -223,6 +223,8 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable { private String cn; //내용 private String lrn; //차시 + private String actvtPeriod; + public String getDesc1() { return desc1; } @@ -1125,5 +1127,11 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable { public void setLrn(String lrn) { this.lrn = lrn; } + public String getActvtPeriod() { + return actvtPeriod; + } + public void setActvtPeriod(String actvtPeriod) { + this.actvtPeriod = actvtPeriod; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryDAO.java index 17f83d01..93db39c1 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryDAO.java @@ -38,7 +38,11 @@ public class VEInstrDetailActvtHstryDAO extends EgovAbstractDAO { public void updateStateCd(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) { update("VEInstrDetailActvtHstryDAO.updateStateCd", vEInstrDetailActvtHstryVO); } - + + public void updateActvtPeriod(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) { + update("VEInstrDetailActvtHstryDAO.updateActvtPeriod", vEInstrDetailActvtHstryVO); + } + /** * 등록 - C * @param AdjstChangeDateVO diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryServiceImpl.java index adf6f4f4..28f8a817 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailActvtHstryServiceImpl.java @@ -50,6 +50,11 @@ public class VEInstrDetailActvtHstryServiceImpl implements VEInstrDetailActvtHst vEInstrDetailActvtHstryDAO.updateStateCd(vEInstrDetailActvtHstryVO); } + @Override + public void updateActvtPeriod(VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO) { + vEInstrDetailActvtHstryDAO.updateActvtPeriod(vEInstrDetailActvtHstryVO); + } + /* //C diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/instrActvtHstryMng/InstrActvtHstryTngrMngController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/instrActvtHstryMng/InstrActvtHstryTngrMngController.java index cb5b9bf4..afccb644 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/instrActvtHstryMng/InstrActvtHstryTngrMngController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/instrActvtHstryMng/InstrActvtHstryTngrMngController.java @@ -279,6 +279,42 @@ public class InstrActvtHstryTngrMngController { } + @RequestMapping("/kccadr/oprtn/tngrVisitEdu/updateActvtPeriod.do") + public ModelAndView updateActvtPeriod( + @ModelAttribute("vEInstrActvtHstryVO") VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO + , ModelMap model + //, RedirectAttributes redirectAttributes + , 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(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + + //vEInstrDetailActvtHstryVO.setLastUpdusrId(loginVO.getUniqId()); + vEInstrDetailActvtHstryService.updateActvtPeriod(vEInstrDetailActvtHstryVO); + + + modelAndView.addObject("result", "success"); + + return modelAndView; + + } ////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml index 4a2a6991..2d2a0d92 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml @@ -54,6 +54,7 @@ , a.purpose , a.bsns_nmbr AS bsnsNmbr , a.bsns_nm AS bsnsNm + , a.actvt_period AS actvtPeriod @@ -295,6 +296,15 @@ + + UPDATE + + SET + actvt_period = #actvtPeriod# + WHERE + instr_detail_actvt_hstry_ord = #instrDetailActvtHstryOrd# + + diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml index da9ffecf..50aaf992 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml @@ -366,6 +366,7 @@ , c.bsns_nmbr AS bsnsNmbr , c.bsns_nm AS bsnsNm , c.docu_nmbr AS docuNmbr + , c.actvt_period AS actvtPeriod , TO_CHAR(c.state_pnttm, 'YYYY') || '-' || c.docu_nmbr || '호' AS docuNmbrDp diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngDetail.jsp index 27aaf42a..7412da9a 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngDetail.jsp @@ -81,6 +81,36 @@ }); } } + + //위촉기간 업데이트 + function fn_updateActvtPeriod() { + + var form = document.updateForm ; + form.actvtPeriod.value = $("#actvtPeriod_in").val(); + var data1 = new FormData(document.getElementById("updateForm")); + if(confirm("위촉기간 변경 하시겠습니까?")){ + $.ajax({ + type:"POST", + url:"${pageContext.request.contextPath}/kccadr/oprtn/tngrVisitEdu/updateActvtPeriod.do", + data: data1, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success:function(returnData){ + if(returnData.result == 'success'){ + alert("처리 되었습니다."); + window.location.reload(); + } + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + } + } + /* 첨부파일 다운로드 */ function fn_egov_downFile(atchFileId, fileSn){//atchFileId -> 파일 Id, fileSn -> 파일 순번 window.open(""); @@ -103,6 +133,7 @@
+
@@ -222,7 +253,14 @@ - + + + 위촉기간 + + + + +