From 85d22a7cad009a6bf1a09acfd5f77c12f1715650 Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 7 Nov 2023 16:49:41 +0900 Subject: [PATCH] =?UTF-8?q?2023-11-07=2016:49=20=EA=B0=95=EC=82=AC=20?= =?UTF-8?q?=EC=9D=B4=EB=A0=A5=20=EA=B4=80=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/OprtnInstrAdultPrflContoller.java | 13 + .../web/OprtnInstrTngrPrflContoller.java | 111 +++++++ .../web/AreaLctrMngTngrController.java | 2 + .../spring/com/context-idgen.xml | 4 +- .../ve/tngr/VEAInstrHstryMng_SQL_Tibero.xml | 9 +- .../oprtn/adultVisitEdu/instrMngDetail.jsp | 118 ++++++- .../jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp | 140 +++----- .../tngrVisitEdu/popup/instrHstryMngPopup.jsp | 298 +++--------------- 8 files changed, 339 insertions(+), 356 deletions(-) diff --git a/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java b/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java index a3368cd0..4c4d9a62 100644 --- a/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java +++ b/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java @@ -42,6 +42,8 @@ import kcc.let.cop.bbs.service.Board; import kcc.let.uat.uia.service.SsoLoginVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; import kcc.let.utl.fcc.service.EgovCryptoUtil4VO; +import kcc.ve.adv.tngr.stngInfo.service.VEAStngService; +import kcc.ve.adv.tngr.stngInfo.service.VEAStngVO; import kcc.ve.aplct.cpyrgExprnClsrm.exprnClsrmAplct.service.ScholInfoService; import kcc.ve.aplct.cpyrgExprnClsrm.exprnClsrmAplct.service.ScholInfoVO; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailService; @@ -184,6 +186,9 @@ public class OprtnInstrAdultPrflContoller { @Resource(name = "scholInfoService") private ScholInfoService scholInfoService; + //강의설정 관리 + @Resource(name = "vEAStngService") + private VEAStngService vEAStngService; /** * 1.강사등록신청 목록 조회 - @@ -1116,6 +1121,14 @@ public class OprtnInstrAdultPrflContoller { lctrDetailVO.setAprvlCd("10"); // 강의 설정 요청 리스트만 불러오기 List lctrStngSbmtInfo = vELctrMIXService.selectLctrStngSbmtList(lctrDetailVO); model.addAttribute("lctrStngSbmtInfo", lctrStngSbmtInfo); + + // 이력관리 리스트 + VEAStngVO vEAStngVO = new VEAStngVO(); + vEAStngVO.setUserId(vEInstrDetailVO.getUserId()); + List selectList_VEAIHM = vEAStngService.selectList_VEAIHM(vEAStngVO); + + model.addAttribute("selectListVEAIHM",selectList_VEAIHM); + return "/oprtn/adultVisitEdu/instrMngDetail"; } 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 a83aaa9e..8b9f0780 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 @@ -220,6 +220,10 @@ public class OprtnInstrTngrPrflContoller { @Resource(name = "vEAStngMixService") private VEAStngMixService vEAStngMixService; + //강사료 순번 idgen + @Resource(name="instrHstryOrdGnrService") + private EgovIdGnrService instrHstryOrdGnrService; + /** * 1.강사등록신청 목록 조회 - */ @@ -1743,6 +1747,13 @@ public class OprtnInstrTngrPrflContoller { List vEInstrAsgnmVOList = vEEduPnltyService.selectList(vEInstrAsgnmVO); model.addAttribute("pnltyList",vEInstrAsgnmVOList); + + // 이력관리 리스트 + VEAStngVO vEAStngVO = new VEAStngVO(); + vEAStngVO.setUserId(vEInstrDetailVO.getUserId()); + List selectList_VEAIHM = vEAStngService.selectList_VEAIHM(vEAStngVO); + + model.addAttribute("selectListVEAIHM",selectList_VEAIHM); //누계정보1 //List selectAsgnmInfoT1List = vEInstrMixService.selectAsgnmInfoT1(vEInstrDetailVODetail); @@ -1762,6 +1773,50 @@ public class OprtnInstrTngrPrflContoller { return "/oprtn/tngrVisitEdu/instrMngDetail"; } + /** + * 이력 삭제 처리 + */ + @RequestMapping("/ve/oprtn/instr/tngrVisitEdu/instrInfo/popup/instrHstryDelAjax.do") + public ModelAndView instrHstryDelPopupAjax( + @ModelAttribute("vEAStngVO") VEAStngVO vEAStngVO + , 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(); //권한에 따른 로그인 정보 가져오기 + + //교육차시강사배정 테이블에 패널티 정보 삭제 + try { + //목록에서 한 패널티를 여러 유저에게 등록 시 + //vEEduPnltyService.delete(vEInstrAsgnmVO); + //VEAStngVO vEAStngVO = new VEAStngVO(); + //vEAStngVO.setInstrHstryOrd(instrHstryOrd); + vEAStngService.delete_VEAIHM(vEAStngVO); + + + } catch (Exception ex) { + ex.printStackTrace(); + } + + modelAndView.addObject("result", "success"); + + return modelAndView; + + } + /** * 6. 강사 관리 상세 조회 */ @@ -2652,6 +2707,62 @@ public class OprtnInstrTngrPrflContoller { return "oprtn/tngrVisitEdu/popup/instrHstryMngPopup"; } + /** + * 강사 이력 등록 + */ + + @RequestMapping(value="/kccadr/oprtn/tngrVisitEdu/popup/instrHstryMngPopupAjax.do") + public ModelAndView instrHstryMngPopupAjax( + 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; + } + + //로그인 처리==================================== + + + //System.out.println(request.getParameter("instrDiv")); + //System.out.println(request.getParameter("ddlnStateCd")); + + try { + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + String s_ord = instrHstryOrdGnrService.getNextStringId(); + + VEAStngVO vEAStngVO = new VEAStngVO(); + + vEAStngVO.setInstrHstryOrd(s_ord); + vEAStngVO.setUserId(request.getParameter("userId")); + vEAStngVO.setSbjct(request.getParameter("sbjct")); + vEAStngVO.setCn(request.getParameter("cn")); + vEAStngVO.setStrtDt(request.getParameter("rgstrStrtPnttm_dt")); + vEAStngVO.setDdlnDt(request.getParameter("rgstrDdlnPnttm_dt")); + vEAStngVO.setFrstRegisterId(loginVO.getUniqId()); + + vEAStngService.insert_VEAIHM(vEAStngVO); + + + }catch(Exception ex) { + ex.printStackTrace(); + } + modelAndView.addObject("result", "success"); + + return modelAndView; + + + } ///////////////////////////////////////////////////////////////////////////////////// // // diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java index c317bee1..c3d65ee1 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java @@ -940,6 +940,7 @@ public class AreaLctrMngTngrController { /** * 강사이력 삭제 처리 */ + /* @RequestMapping("popup/instrHstryDelAjax.do") public ModelAndView instrHstryDelPopupAjax( @ModelAttribute("vEInstrAsgnmVO") VEInstrAsgnmVO vEInstrAsgnmVO @@ -976,6 +977,7 @@ public class AreaLctrMngTngrController { return modelAndView; } + */ /** * 강사료 등록 처리 diff --git a/src/main/resources/egovframework/spring/com/context-idgen.xml b/src/main/resources/egovframework/spring/com/context-idgen.xml index f7239bc1..643192a4 100644 --- a/src/main/resources/egovframework/spring/com/context-idgen.xml +++ b/src/main/resources/egovframework/spring/com/context-idgen.xml @@ -2978,8 +2978,8 @@ - - + + diff --git a/src/main/resources/egovframework/sqlmap/ve/tngr/VEAInstrHstryMng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/tngr/VEAInstrHstryMng_SQL_Tibero.xml index f07fab78..6ae26ee0 100644 --- a/src/main/resources/egovframework/sqlmap/ve/tngr/VEAInstrHstryMng_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/tngr/VEAInstrHstryMng_SQL_Tibero.xml @@ -72,8 +72,8 @@ , sbjct = #sbjct# , cn = #cn# - , strtDt = #strtDt# - , ddlnDt = #ddlnDt# + , strt_dt = #strtDt# + , ddln_dt = #ddlnDt# , frst_regist_pnttm = SYSDATE , frst_register_id = #frstRegisterId# @@ -163,10 +163,13 @@ /* VEAInstrHstryMngDAO.selectList */ SELECT + , b.user_nm AS userNm FROM a + , LETTNEMPLYRINFO b WHERE - 1=1 + 1=1 + AND a.frst_register_id=b.ESNTL_ID AND a.user_id=#userId# diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp index 0084ff40..ce31ea81 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp @@ -255,6 +255,57 @@ function getYears(getYear){ }); } } + + // 강사이력 등록팝업 + function fnInstrHstryInsert() { + + /* + var p_stngYr = $("#listForm #stngYr").val(); + + if(p_stngYr==''){ + alert("회차관리 대상 년도를 선택해주세요."); + return false; + } + document.listForm.yr.value = p_stngYr; + */ + + //document.listForm.authorCode.value = vAuthorCode; + //document.listForm.action = ""; + document.listForm.action = ""; + window.open("#", "_instrHstryMngPop", "scrollbars = no, top=100px, left=100px, height=800px, width=1000px"); + document.listForm.target = "_instrHstryMngPop"; + document.listForm.submit(); + + } + + // 이력관리 삭제 + function fnInstrHstryDelete(p_instr_hstry_ord) { + + $("#listForm #instrHstryOrd").val(p_instr_hstry_ord); + + var data1 = new FormData(document.getElementById("listForm")); + if(confirm("해당 이력을 삭제하시겠습니까?)")){ + $.ajax({ + type:"POST", + url: "${pageContext.request.contextPath}/ve/oprtn/instr/tngrVisitEdu/instrInfo/popup/instrHstryDelAjax.do", + data: data1, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success:function(returnData){ + if(returnData.result == 'success'){ + alert("삭제 되었습니다."); + location.reload(); + } + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + } + } <%--
@@ -788,8 +839,73 @@ function getYears(getYear){ +
+

이력관리

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
교육명교육기간비고등록자등록일삭제
~ + +
+
+ + +
+
+
+
+ +
+
+ - \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp index d5007141..b875d4a5 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp @@ -373,6 +373,35 @@ } } + // 이력관리 삭제 + function fnInstrHstryDelete(p_instr_hstry_ord) { + + $("#listForm #instrHstryOrd").val(p_instr_hstry_ord); + + var data1 = new FormData(document.getElementById("listForm")); + if(confirm("해당 이력을 삭제하시겠습니까?)")){ + $.ajax({ + type:"POST", + url: "${pageContext.request.contextPath}/ve/oprtn/instr/tngrVisitEdu/instrInfo/popup/instrHstryDelAjax.do", + data: data1, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success:function(returnData){ + if(returnData.result == 'success'){ + alert("삭제 되었습니다."); + location.reload(); + } + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + } + } + // 강사이력 등록팝업 function fnInstrHstryInsert() { @@ -396,35 +425,6 @@ } - // 강사이력 삭제 - function fnInstrHstryDelete(p_pnlty_ord) { - - $("#listForm #pnltyOrd").val(p_pnlty_ord); - - var data1 = new FormData(document.getElementById("listForm")); - if(confirm("해당 이력을 삭제하시겠습니까?)")){ - $.ajax({ - type:"POST", - url: "${pageContext.request.contextPath}/kccadr/oprtn/tngrVisitEdu/popup/instrHstryDelAjax.do", - data: data1, - dataType:'json', - async: false, - processData: false, - contentType: false, - cache: false, - success:function(returnData){ - if(returnData.result == 'success'){ - alert("삭제 되었습니다."); - location.reload(); - } - }, - error:function(request , status, error){ - alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); - } - }); - } - } - @@ -934,90 +934,27 @@ - + + + ~ + + - - - - - - - - - - - ~ - (분) - - - - + - - - - + + -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
교육명교육기간비고등록
- - -
-
- -
- ~ -
- -
-
- 		- - - -
-
@@ -1034,8 +971,9 @@ + - + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrHstryMngPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrHstryMngPopup.jsp index 8d4bc87b..cee78792 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrHstryMngPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrHstryMngPopup.jsp @@ -49,17 +49,17 @@ }); function fncAprooval(){ - var msg = "강의가능시간 변경"; + //var msg = "강의가능시간 변경"; var data1 = new FormData(document.getElementById("createForm")); //console.log(data); console.log(data1); - if (confirm(msg+" 하시겠습니까?")) { + if (confirm("이력등록을 하시겠습니까?")) { $.ajax({ type: "POST", - url: "${pageContext.request.contextPath}/kccadr/oprtn/tngrVisitEdu/popup/areaLctrMngLctrPsblTmPopupAjax.do", + url: "${pageContext.request.contextPath}/kccadr/oprtn/tngrVisitEdu/popup/instrHstryMngPopupAjax.do", //data: JSON.stringify(data), data: data1, dataType:'json', @@ -70,9 +70,9 @@ success: function (returnData, status) { console.log(returnData.rs); if(returnData.result == 'success'){ - alert("정상적으로 "+ msg +" 되었습니다."); + alert("정상적으로 등록 되었습니다."); opener.location.reload(); - self.close(); + //self.close(); }else{ alert(returnData.message); } @@ -316,78 +316,50 @@
-

회차관리

+

이력관리

- -"> -"> -"> -"> - + +"> - - - - - - - - - - - -
-

필수입력 항목

-

-    년도   - - - -

-
- - - - - + + - - - - + + + + + + + - + + + + - +
+ + +
+ + +
회차명접수시작일시접수마감일시관리구분내용
+
+ 교육명 +
+
- 회차 + +
+
+
+ 교육기간 +
@@ -395,207 +367,35 @@
- 시 - - - 		-
- + ~
-
- - 시 +
+
+
+ 비고 +
-
-
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
회차명접수시작일시접수마감일시관리
-
- - 회차 -
-
-
- -
- 시 - -
- 		-
- -
- -
- 시 -
- 		-
-
- - -
-
-
@@ -603,7 +403,7 @@
- +