diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java index d15a6df6..26d6aa40 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java @@ -31,6 +31,7 @@ import kcc.let.utl.fcc.service.EgovCryptoUtil4VO; import kcc.let.utl.fcc.service.ITNotiUtil; import kcc.let.utl.fcc.service.VisitEduTransUtil; import kcc.ve.cmm.VeConstants; +import kcc.ve.cmm.VeInstrFeeMng; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAcmdtAplctService; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrAsgnmVO; @@ -906,6 +907,11 @@ public class VEAsgnmController { model.addAttribute("eduList", vEPrcsDetailVOList); System.out.println("+++++++++++++++++++++++++++1111111++++555++"); + // 강사료 계산 + VeInstrFeeMng veInstrFeeMng = new VeInstrFeeMng(); + VEInstrFeeAcmdtVO instrFee = veInstrFeeMng.VeInstrFeeMng(vEInstrFeeService, vEInstrAsgnmVO.getEduAplctOrd(), vEInstrAsgnmVO.getEduChasiOrd()); + model.addAttribute("instrFee", instrFee); + //전날숙박 조회 VEInstrFeeAcmdtVO acmdtAplctYesterday = new VEInstrFeeAcmdtVO(); acmdtAplctYesterday.setFrstRegisterId(loginVO.getUniqId()); diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java index a87fa04f..12066bbb 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java @@ -39,6 +39,8 @@ public interface CndtnTrgtMngService { void updateEduStateCdAndReqStateCdAjax(CndtnTrgtMngVO cndtnTrgtMngVO); + void deleteEduReqAjax(CndtnTrgtMngVO cndtnTrgtMngVO); + VEAStngVO selectSMSSndString(VEAStngVO vEAStngVO); void updateSMSSndString(VEAStngVO vEAStngVO); diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java index 0ac6f861..502170b1 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java @@ -170,6 +170,10 @@ public class CndtnTrgtMngDAO extends EgovAbstractDAO { update("cndtnTrgtInfoMngDAO.updateEduStateCdAndReqStateCdAjax", cndtnTrgtInfoMngVO); } + public void deleteEduReqAjax(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { + update("cndtnTrgtInfoMngDAO.deleteEduReqAjax", cndtnTrgtInfoMngVO); + } + public VEAStngVO selectSMSSndString(VEAStngVO vEAStngVO) { return (VEAStngVO) select("cndtnTrgtInfoMngDAO.selectSMSSndString", vEAStngVO); } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java index 2a395391..6e7e49c0 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java @@ -100,6 +100,11 @@ public class CndtnTrgtMngServiceImpl implements CndtnTrgtMngService { cndtnTrgtInfoMngDAO.updateEduStateCdAndReqStateCdAjax(cndtnTrgtMngVO); } + @Override + public void deleteEduReqAjax(CndtnTrgtMngVO cndtnTrgtMngVO) { + cndtnTrgtInfoMngDAO.deleteEduReqAjax(cndtnTrgtMngVO); + } + //비공개메모 update @Override public int memoUpdate(CndtnTrgtMngVO cndtnTrgtInfoMngVO) throws Exception { diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java index 8dd7e39f..e1b83a3b 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java @@ -297,6 +297,44 @@ public class CndtnTrgtMngController { } + //교육대상자 삭제 + @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/deleteEduReqAjax.do") + public ModelAndView deleteEduReqAjax( + @ModelAttribute("vEPrcsDetailVO") CndtnTrgtMngVO cndtnTrgtMngVO + , 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(); //권한에 따른 로그인 정보 가져오기 + cndtnTrgtMngVO.setLastUpdusrId(loginVO.getUniqId()); + try { + + + cndtnTrgtInfoMngService.deleteEduReqAjax(cndtnTrgtMngVO); + + + modelAndView.addObject("result", "success"); + + } catch (Exception ex) { + ex.printStackTrace(); + modelAndView.addObject("result", ""); + } + + + return modelAndView; + + } /** diff --git a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml index e2fafe38..02e6cc42 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml @@ -639,7 +639,7 @@ - /* cndtnTrgtInfoMngDAO.memoUpdate */ + /* cndtnTrgtInfoMngDAO.updateEduStateCdAndReqStateCdAjax-cndtnTrgtInfoMngDAO.memoUpdate */ UPDATE SET REQ_STATE_CD = #reqStateCd# @@ -651,7 +651,19 @@ #sspnIdtmtTrgtOrdList[]# - + + + /* cndtnTrgtInfoMngDAO.deleteEduReqAjax-cndtnTrgtInfoMngDAO.memoUpdate */ + + DELETE FROM + + + WHERE SSPN_IDTMT_TRGT_ORD IN + + #sspnIdtmtTrgtOrdList[]# + + +