diff --git a/src/main/java/kcc/ve/cmm/VeInstrFeeMng.java b/src/main/java/kcc/ve/cmm/VeInstrFeeMng.java index f3ebfc57..5ea1caa0 100644 --- a/src/main/java/kcc/ve/cmm/VeInstrFeeMng.java +++ b/src/main/java/kcc/ve/cmm/VeInstrFeeMng.java @@ -140,6 +140,9 @@ public class VeInstrFeeMng { vEInstrFeeAcmdtVO.setLikeCheckYn("Y"); } + //식비지급 + vEInstrFeeAcmdtVO.setFoodExpenses("7000"); + // 수당 합계 int sum = + Integer.parseInt(vEInstrFeeAcmdtVO.getSpecialWorkAllow()) + Integer.parseInt(vEInstrFeeAcmdtVO.getDistanceAllow()); @@ -149,6 +152,9 @@ public class VeInstrFeeMng { sum = Integer.parseInt(vEInstrFeeAcmdtVO.getTrafficFee()) + Integer.parseInt(vEInstrFeeAcmdtVO.getAcmdtFee()); vEInstrFeeAcmdtVO.setSpareFee(String.format("%,d", sum)); + + + }else if("10".equals(vEInstrFeeAcmdtVO.getEduSlctCd())){ } diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngTngrController.java index ab30d896..27cef2fb 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngTngrController.java @@ -909,6 +909,9 @@ public class EduAsgnmCnfrmMngTngrController { VeInstrFeeMng veInstrFeeMng = new VeInstrFeeMng(); VEInstrFeeAcmdtVO vEInstrFeeAcmdtVO = veInstrFeeMng.VeInstrFeeMng(vEInstrFeeService, vo.getEduAplctOrd(), vo.getEduChasiOrd()); + + // 식비 + vo.setFoodExpenses(vEInstrFeeAcmdtVO.getFoodExpenses()); // 강사료 계산 (강의차시 * 강사 기본값) vo.setInstrFee(vEInstrFeeAcmdtVO.getInstrFee()); @@ -995,11 +998,10 @@ public class EduAsgnmCnfrmMngTngrController { , 4000, 4000, 8000, 4000 , 4000, 4000, 4000, 4000 , 4000, 4000, 4000, 4000, 4000, 4000 + , 4000, 4000, 4000, 4000 , 4000, 4000, 4000 - , 4000, 4000, 4000 - , 4000, 4000 - , 4000 - , 4000, 4000, 4000 + , 4000, 4000 + , 4000, 4000, 4000, 4000 }; // 너비 //33개 항목 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 d87d1e97..e88980cc 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp @@ -545,7 +545,9 @@ $( document ).ready(function(){
명