diff --git a/src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java b/src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java index c1d079e4..d18d2a08 100644 --- a/src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java +++ b/src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java @@ -20,7 +20,10 @@ import kcc.let.uat.uia.service.SsoLoginVO; import kcc.let.uss.notify.service.NotifyManageService; import kcc.let.utl.fcc.service.EgovCryptoUtil; import kcc.ve.cmm.VeConstants; +import kcc.ve.cmm.VeInstrFeeMng; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService; +import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrFeeAcmdtVO; +import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrFeeService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService; @@ -68,6 +71,10 @@ public class VEFndtnAsgnmController { @Resource(name = "NotifyManageService") private NotifyManageService notifyManageService; + + //강사료 + @Resource(name="vEInstrFeeService") + private VEInstrFeeService vEInstrFeeService; // 기반강화 강의목록(확정) @RequestMapping("/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmList.do") @@ -305,6 +312,24 @@ public class VEFndtnAsgnmController { model.addAttribute("chasiList", vEEduChasiVOList); } + { + try { + // 강사료 계산 + VeInstrFeeMng veInstrFeeMng = new VeInstrFeeMng(); + VEInstrFeeAcmdtVO vEInstrFeeAcmdtVO = veInstrFeeMng.VeInstrFeeMng4Fndth(vEInstrFeeService, vEPrcsDetailVO.getPrcsAplctPrdOrd(), loginVO.getUniqId()); + + //지급총액 계산 + //int totalSum = instrFeeSum; + //vEInstrFeeAcmdtVO.setTotalSum(totalSum); + + model.addAttribute("instrFee",vEInstrFeeAcmdtVO); + + }catch(Exception ex) { + ex.printStackTrace(); + } + + } + return "/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmEndDetail"; } diff --git a/src/main/java/kcc/ve/instr/sspnIdtmt/asgnmInfo/web/VESspnIdtmtAsgnmController.java b/src/main/java/kcc/ve/instr/sspnIdtmt/asgnmInfo/web/VESspnIdtmtAsgnmController.java index 00bf41ca..d85daad4 100644 --- a/src/main/java/kcc/ve/instr/sspnIdtmt/asgnmInfo/web/VESspnIdtmtAsgnmController.java +++ b/src/main/java/kcc/ve/instr/sspnIdtmt/asgnmInfo/web/VESspnIdtmtAsgnmController.java @@ -20,7 +20,10 @@ import kcc.let.uat.uia.service.SsoLoginVO; import kcc.let.uss.notify.service.NotifyManageService; import kcc.let.utl.fcc.service.EgovCryptoUtil; import kcc.ve.cmm.VeConstants; +import kcc.ve.cmm.VeInstrFeeMng; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService; +import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrFeeAcmdtVO; +import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrFeeService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService; @@ -69,6 +72,9 @@ public class VESspnIdtmtAsgnmController { @Resource(name = "NotifyManageService") private NotifyManageService notifyManageService; + //강사료 + @Resource(name="vEInstrFeeService") + private VEInstrFeeService vEInstrFeeService; // 기반강화 강의목록(확정) @RequestMapping("/web/ve/instr/sspnIdtmt/asgnmInfo/instrAsgnmList.do") @@ -303,6 +309,24 @@ public class VESspnIdtmtAsgnmController { model.addAttribute("chasiList", vEEduChasiVOList); } + { + try { + // 강사료 계산 + VeInstrFeeMng veInstrFeeMng = new VeInstrFeeMng(); + VEInstrFeeAcmdtVO vEInstrFeeAcmdtVO = veInstrFeeMng.VeInstrFeeMng4Fndth(vEInstrFeeService, vEPrcsDetailVO.getPrcsAplctPrdOrd(), loginVO.getUniqId()); + + //지급총액 계산 + //int totalSum = instrFeeSum; + //vEInstrFeeAcmdtVO.setTotalSum(totalSum); + + model.addAttribute("instrFee",vEInstrFeeAcmdtVO); + + }catch(Exception ex) { + ex.printStackTrace(); + } + + } + return "/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrAsgnmEndDetail"; } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnInstrMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnInstrMngController.java index e4440e48..e99235f4 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnInstrMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnInstrMngController.java @@ -365,7 +365,10 @@ public class CndtnInstrMngController { //대상 리스트, 페이징 정보 전달 vEPrcsDetailVOList = egovCryptoUtil.decryptvEPrcsDetailList(vEPrcsDetailVOList); - model.addAttribute("list", vEPrcsDetailVOList); + model.addAttribute("list", vEPrcsDetailVOList); + + System.out.println("vEPrcsDetailVOList.toString()"); + System.out.println(vEPrcsDetailVOList.toString()); }catch(Exception ex) { ex.printStackTrace(); } diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEInstrFee_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEInstrFee_SQL_Tibero.xml index fae6d590..b0178fca 100644 --- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEInstrFee_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEInstrFee_SQL_Tibero.xml @@ -203,7 +203,7 @@ , B.INSTR_FEE_ORD AS instrFeeOrd , A.USER_ID AS userId - ,(SELECT AA.div_cd FROM VE_INSTR_DETAIL AA WHERE 1=1 AND AA.USER_ID = A.USER_ID AND aa.use_yn ='Y') AS divCd + ,(SELECT AA.div_cd FROM VE_INSTR_DETAIL AA WHERE 1=1 AND AA.USER_ID = A.USER_ID AND aa.use_yn ='Y' ORDER BY AA.sbmt_pnttm DESC LIMIT 1) AS divCd /* ,(SELECT AA.ADDR FROM VE_INSTR_DETAIL AA WHERE 1=1 AND AA.USER_ID = A.USER_ID AND aa.instr_div=e.lctr_div_cd AND aa.use_yn='Y') AS instrRsdnc diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmEndDetail.jsp index 5fab4262..01ab8053 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmEndDetail.jsp @@ -354,6 +354,31 @@ + + + +

강사료(a)

+ + + + + + + +

출장비(b)

+ + + + + + + +

총액(a+b)

+ + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/endInfo/instrEduEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/endInfo/instrEduEndList.jsp index 8439de5d..f5b58b79 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/endInfo/instrEduEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/endInfo/instrEduEndList.jsp @@ -115,7 +115,7 @@ - ${list.prcsNm } (${list.prcsAplctPrdOrd }) + ${list.prcsNm } ${list.eduStrtPnttm } ~ ${list.eduDdlnPnttm } diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrAsgnmEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrAsgnmEndDetail.jsp index 2fe2710d..2f076716 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrAsgnmEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrAsgnmEndDetail.jsp @@ -339,6 +339,32 @@ + + + +

강사료(a)

+ + + + + + + +

출장비(b)

+ + + + + + + +

총액(a+b)

+ + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrEduEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrEduEndList.jsp index 3031fa49..12842244 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrEduEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrEduEndList.jsp @@ -115,7 +115,7 @@ - ${list.prcsNm } (${list.prcsAplctPrdOrd }) + ${list.prcsNm } ${list.eduStrtPnttm }