2024-04-12 10:43 강사료 엑셀 다운로드 수정

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())

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