From 9c12311430e43dcf3e7a32db8c5f7fd365ee1e95 Mon Sep 17 00:00:00 2001 From: myname Date: Fri, 12 Apr 2024 10:43:57 +0900 Subject: [PATCH] =?UTF-8?q?2024-04-12=2010:43=20=EA=B0=95=EC=82=AC?= =?UTF-8?q?=EB=A3=8C=20=EC=97=91=EC=85=80=20=EB=8B=A4=EC=9A=B4=EB=A1=9C?= =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kcc/ve/cmm/VeInstrFeeMng.java | 15 ++++++++++++++- .../web/EduAsgnmCnfrmMngTngrController.java | 2 ++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/main/java/kcc/ve/cmm/VeInstrFeeMng.java b/src/main/java/kcc/ve/cmm/VeInstrFeeMng.java index 1fc39955..947ed0c2 100644 --- a/src/main/java/kcc/ve/cmm/VeInstrFeeMng.java +++ b/src/main/java/kcc/ve/cmm/VeInstrFeeMng.java @@ -358,7 +358,7 @@ public class VeInstrFeeMng { // 수당 합계(a+b) - int sum = + Integer.parseInt(vEInstrFeeAcmdtVO.getSpecialWorkAllow()) + int sum = Integer.parseInt(vEInstrFeeAcmdtVO.getSpecialWorkAllow()) + Integer.parseInt(vEInstrFeeAcmdtVO.getDistanceAllow()); vEInstrFeeAcmdtVO.setAllowance(sum); @@ -371,16 +371,29 @@ public class VeInstrFeeMng { System.out.println("Integer.parseInt(vEInstrFeeAcmdtVO.getSpecialWorkAllow())"); System.out.println(Integer.parseInt(vEInstrFeeAcmdtVO.getSpecialWorkAllow())); System.out.println(Integer.parseInt(vEInstrFeeAcmdtVO.getDistanceAllow())); + System.out.println(vEInstrFeeAcmdtVO.getAllowance()); + System.out.println(Integer.parseInt(vEInstrFeeAcmdtVO.getTrafficFee())); System.out.println(Integer.parseInt(vEInstrFeeAcmdtVO.getAcmdtFee())); + }else if("10".equals(vEInstrFeeAcmdtVO.getEduSlctCd())){ } } + // 수당 합계(a+b) + int sum = Integer.parseInt(vEInstrFeeAcmdtVO.getSpecialWorkAllow()) + + Integer.parseInt(vEInstrFeeAcmdtVO.getDistanceAllow()); + vEInstrFeeAcmdtVO.setAllowance(sum); + + // 여비 합계(c+d) + sum = Integer.parseInt(vEInstrFeeAcmdtVO.getTrafficFee()) + + Integer.parseInt(vEInstrFeeAcmdtVO.getAcmdtFee()); + //vEInstrFeeAcmdtVO.setSpareFee(String.format("%,d", sum)); + vEInstrFeeAcmdtVO.setSpareFee(Integer.toString(sum)); // 강사료 합계 int instrFeeSum = Integer.parseInt(vEInstrFeeAcmdtVO.getInstrFee()) 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 33ed0612..9d116c82 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 @@ -1038,6 +1038,8 @@ public class EduAsgnmCnfrmMngTngrController { // 도서벽지수당 계산 vo.setSpecialWorkAllow(vEInstrFeeAcmdtVO.getSpecialWorkAllow()); + // 장거리교육수당 + vo.setDistanceAllow(vEInstrFeeAcmdtVO.getDistanceAllow()); // hylee // 장거리교육수당 20240329