2023-12-05 20:18 강사료 수정

2023-12-05 20:18:24 +09:00 · 2023-12-05 20:18:24 +09:00 · 4a52155433
commit 4a52155433
parent b5cf52f7b6
7 changed files with 119 additions and 28 deletions
--- a/src/main/java/kcc/ve/cmm/VeInstrFeeMng.java
+++ b/src/main/java/kcc/ve/cmm/VeInstrFeeMng.java
@ -150,7 +150,9 @@ public class VeInstrFeeMng {
 				+ Integer.parseInt(vEInstrFeeAcmdtVO.getSpecialWorkAllow())
 				+ Integer.parseInt(vEInstrFeeAcmdtVO.getDistanceAllow())
 				+ Integer.parseInt(vEInstrFeeAcmdtVO.getTrafficFee())
-				+ Integer.parseInt(vEInstrFeeAcmdtVO.getAcmdtFee());
+				+ Integer.parseInt(vEInstrFeeAcmdtVO.getFoodExpenses())
+				+ Integer.parseInt(vEInstrFeeAcmdtVO.getAcmdtFee())
+				;
 		vEInstrFeeAcmdtVO.setInstrFeeSum(instrFeeSum);

 		// 세금 합계   -> 세금 제거 요청으로 제거
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrFeeAcmdtVO.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrFeeAcmdtVO.java
@ -38,6 +38,9 @@ public class VEInstrFeeAcmdtVO extends ComDefaultVO implements Serializable {
 	private String	specialWorkAllow;	//특수근무수당(도서벽지수당)
 	private String	distanceAllow;		//거리수당
 	private String	trafficFee;			//교통비
+	private String	foodExpenses;		//식비
+	private String	instrFeeCn;			//강사료의견내용
+	
 	
 	private int allowance;				// 수당
 	private int instrFeeSum;			//강사료 합계
@ -427,4 +430,16 @@ public class VEInstrFeeAcmdtVO extends ComDefaultVO implements Serializable {
 	public void setAllowance(int allowance) {
 		this.allowance = allowance;
 	}
+	public String getFoodExpenses() {
+		return foodExpenses;
+	}
+	public void setFoodExpenses(String foodExpenses) {
+		this.foodExpenses = foodExpenses;
+	}
+	public String getInstrFeeCn() {
+		return instrFeeCn;
+	}
+	public void setInstrFeeCn(String instrFeeCn) {
+		this.instrFeeCn = instrFeeCn;
+	}
 }
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java
@ -368,6 +368,7 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable {
 	private String specialWorkAllow;
 	private String distanceAllow;
 	private String trafficFee;
+	private String foodExpenses;
 	private String acmdtFee;
 	private String instrFeeSum;
 	private String incomeTax;
@ -1807,6 +1808,12 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable {
 	public void setPrvsQs(String prvsQs) {
 		this.prvsQs = prvsQs;
 	}
+	public String getFoodExpenses() {
+		return foodExpenses;
+	}
+	public void setFoodExpenses(String foodExpenses) {
+		this.foodExpenses = foodExpenses;
+	}
 	
 	
 }
--- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java
+++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java
@ -48,7 +48,6 @@ import kcc.com.cmm.util.StringUtil;
 import kcc.com.utl.user.service.CheckLoginUtil;
 import kcc.com.utl.user.service.QustnrCommonUtil;
 import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO;
-import kcc.kccadr.cmm.CmmUtil;
 import kcc.let.uss.olp.qri.service.EgovQustnrRespondInfoService;
 import kcc.let.uss.olp.qri.service.QustnrRespondInfoVO;
 import kcc.let.uss.olp.qrm.service.QustnrRespondManageVO;
@ -1211,8 +1210,11 @@ public class EduRsltMngTngrController {
 		list.forEach( vo -> {
 			ComDefaultCodeVO codeParam = new ComDefaultCodeVO();
 			
+			try {
+				
 				// 교육일자
-			vo.setEduHopeDt(CmmUtil.getStrDateFormat(vo.getEduHopeDt()));
+				//vo.setEduHopeDt(CmmUtil.getStrDateFormat(vo.getEduHopeDt()));
+				vo.setEduHopeDt(vo.getEduHopeDt());
 				
 				// 학교구분 코드
 				codeParam.setCodeId("VE0009");
@ -1232,6 +1234,14 @@ public class EduRsltMngTngrController {
 					vo.setOnewayDstnc(vo.getOnewayDstnc() + "km");
 				}

+				
+			}
+			catch(Exception ex) {
+				System.out.println(ex.toString());
+				
+			}
+			
+			
 			try {
 				
 				// 강사료 계산
@ -1248,6 +1258,7 @@ public class EduRsltMngTngrController {
 				vo.setSpecialWorkAllow(vEInstrFeeAcmdtVO.getSpecialWorkAllow());
 				vo.setDistanceAllow(vEInstrFeeAcmdtVO.getDistanceAllow());
 				vo.setTrafficFee(vEInstrFeeAcmdtVO.getTrafficFee());
+				vo.setFoodExpenses(vEInstrFeeAcmdtVO.getFoodExpenses());
 				vo.setAcmdtFee(vEInstrFeeAcmdtVO.getAcmdtFee());
 				vo.setInstrFeeSum(String.format("%,d", vEInstrFeeAcmdtVO.getInstrFeeSum()));
 				vo.setIncomeTax(String.format("%,d", Integer.parseInt(vEInstrFeeAcmdtVO.getIncomeTax())));
@ -1257,6 +1268,7 @@ public class EduRsltMngTngrController {
 				
 			}
 			catch(Exception ex) {
+				System.out.println(ex.toString());
 				
 			}
 		});		
@ -1269,21 +1281,21 @@ public class EduRsltMngTngrController {
 		// 너비
 		int[] width = {
 			4000, 4000, 4000, 6000, 6000
-			, 4000, 4000, 4000, 4000, 4000, 4000
+			, 4000, 4000, 4000, 4000, 4000, 4000, 4000
 			, 4000, 4000
 		};
 		
 		// 헤더
 		String[] header = {
 			"교육일자", "차시", "학교구분", "지역", "학교(기관)명"
-			, "강사이름", "강사료", "편도거리", "도서벽지 수당", "거리 수당", "교통비"
+			, "강사이름", "강사료", "편도거리", "도서벽지 수당", "거리 수당", "교통비", "식비"
 			,"숙박비", "강사료 합계"
 		};
 		
 		// 컬럼명
 		String[] order = {
 			"EduHopeDt", "ChasiCnt", "ScholDivCd", "EduSlctAreaCd", "ScholInsttNm"
-			, "InstrNm", "InstrFeeOrd", "OnewayDstnc", "SpecialWorkAllow", "DistanceAllow" , "TrafficFee"
+			, "InstrNm", "InstrFeeOrd", "OnewayDstnc", "SpecialWorkAllow", "DistanceAllow" , "TrafficFee", "FoodExpenses"
 			, "AcmdtFee", "InstrFeeSum"
 		};

--- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEInstrFee_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEInstrFee_SQL_Tibero.xml
@ -41,7 +41,9 @@
 			spare_fee,			
 			income_tax,		
 			local_income_tax,
-			use_yn
+			use_yn,
+			instr_fee_cn,
+			food_expenses
 	</sql>
 	
 	<!-- 조회용 공통 컬럼 명 -->
@ -72,7 +74,11 @@
 			a.traffic_fee			AS	trafficFee,
 			a.income_tax			AS	incomeTax,
 			a.local_income_tax		AS	localIncomeTax,
-			a.use_yn				AS	useYn     		   	   	
+			a.use_yn				AS	useYn,
+			
+			a.instr_fee_cn			AS	instrFeeCn,
+			a.food_expenses			AS	foodExpenses
+			     		   	   	
 	</sql>
 	
 	<!-- 강사료 등록 C -->
@ -111,7 +117,10 @@
 			#spareFee#,
 			#incomeTax#,
 			#localIncomeTax#,
-			#useYn#        		
+			#useYn#,
+			
+			#instrFeeCn#,
+			#foodExpenses#        		
 		)
 	</insert>
 	
@ -135,6 +144,7 @@
 			, NVL(DECODE(B.SPECIAL_WORK_ALLOW	,'','0',B.SPECIAL_WORK_ALLOW), '0')						AS specialWorkAllow
 			, NVL(DECODE(B.DISTANCE_ALLOW		,'','0',B.DISTANCE_ALLOW), '0')							AS distanceAllow
 			, NVL(DECODE(B.TRAFFIC_FEE			,'','0',B.TRAFFIC_FEE), '0')							AS trafficFee
+			, NVL(DECODE(B.FOOD_EXPENSES		,'','0',B.FOOD_EXPENSES), '0')							AS foodExpenses
 			, NVL(DECODE(B.BSNS_TRIP_FEE		,'','0',B.BSNS_TRIP_FEE), '0')							AS bsnsTripFee
 			, NVL(DECODE(B.SPARE_FEE			,'','0',B.SPARE_FEE), '0')								AS spareFee
 			, NVL(DECODE(C.ACMDT_FEE			,'','0',C.ACMDT_FEE), '0')								AS acmdtFee 
@ -242,6 +252,14 @@
 		<isNotEmpty property="useYn">
 			, use_yn	= #useYn#						
 		</isNotEmpty>
+		
+		<isNotEmpty property="instrFeeCn">
+			, instr_fee_cn	= #instrFeeCn#						
+		</isNotEmpty>
+		<isNotEmpty property="foodExpenses">
+			, food_expenses	= #foodExpenses#						
+		</isNotEmpty>
+			
 		<isEqual property="sbmtYn" compareValue="Y">
 			, sbmt_pnttm = SYSDATE
 		</isEqual>
--- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
@ -3212,6 +3212,7 @@
                 + NVL(TO_NUMBER(DECODE(f.special_work_allow	,'',0,f.special_work_allow)),0)
                 + NVL(TO_NUMBER(DECODE(f.distance_allow		,'',0,f.distance_allow)),0)
                 + NVL(TO_NUMBER(DECODE(f.traffic_fee			,'',0,f.traffic_fee)),0)
+                 + NVL(TO_NUMBER(DECODE(f.food_expenses			,'',0,f.food_expenses)),0)
                 - NVL(TO_NUMBER(DECODE(f.income_tax			,'',0,f.income_tax)),0)
                 - NVL(TO_NUMBER(DECODE(f.local_income_tax		,'',0,f.local_income_tax)),0)
 													  AS totFee
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrCostPopup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrCostPopup.jsp
@ -54,14 +54,17 @@
 			var trafficFee = $("#trafficFee").val();
 			trafficFee = trafficFee.replaceAll(",", "");

+			var foodExpenses = $("#foodExpenses").val();
+			foodExpenses = foodExpenses.replaceAll(",", "");			
+			
 			var acmdtAprvlCd = $("#acmdtAprvlCd").val();
 			var instrFeeSum;
 			if(acmdtAprvlCd == "10"){
 				var acmdtFee = $("#acmdtFee").val();
 				acmdtFee = acmdtFee.replaceAll(",", "");
-				instrFeeSum = Number(instrFee) + Number(specialWorkAllow) + Number(distanceAllow) + Number(trafficFee) + Number(acmdtFee);
+				instrFeeSum = Number(instrFee) + Number(specialWorkAllow) + Number(distanceAllow) + Number(trafficFee) + Number(foodExpenses) + Number(acmdtFee);
 			}else{
-				instrFeeSum = Number(instrFee) + Number(specialWorkAllow) + Number(distanceAllow) + Number(trafficFee);
+				instrFeeSum = Number(instrFee) + Number(specialWorkAllow) + Number(distanceAllow) + Number(trafficFee) + Number(foodExpenses);
 			};
 			
 			$("#instrFeeSum").val(instrFeeSum);
@ -100,6 +103,7 @@
 			$("#specialWorkAllow").val($("#specialWorkAllow").val().replaceAll(',',''));
 			$("#distanceAllow").val($("#distanceAllow").val().replaceAll(',',''));
 			$("#trafficFee").val($("#trafficFee").val().replaceAll(',',''));
+			$("#foodExpenses").val($("#foodExpenses").val().replaceAll(',',''));
 			//$("#spareFee").val($("#trafficFee").val().replaceAll(',',''));
 			
 			var acmdtAprvlCd = $("#acmdtAprvlCd").val();
@ -299,6 +303,26 @@
 							</br>12Km 이상  : 20,000원 &nbsp;/&nbsp; 1Km 이상 10,000원 
 						</td>
 					</tr>
+					<tr>
+						<th scope="row">
+							<p>식비</p>
+						</th>
+						<td>
+						
+							<c:choose>
+								<c:when test="${info.eduSlctCd eq '10'}">
+									<input type="text" numberOnly id="foodExpenses" name="foodExpenses" value="<fmt:formatNumber value="0" pattern="#,###"/>"/>
+								</c:when>
+								<c:otherwise>
+									<input type="text" numberOnly id="foodExpenses" name="foodExpenses" value="<fmt:formatNumber value="7000" pattern="#,###"/>"/>
+								</c:otherwise>
+							</c:choose>					
+						
+						</td>
+						<td>
+							오프라인 교육 출강 1회 당 7,000원
+						</td>
+					</tr>					
 					<tr>
 						<th scope="row">
 							<p>교통비</p>
@ -458,6 +482,18 @@
 							</br>12Km 이상  : 20,000원 &nbsp;/&nbsp; 1Km 이상 10,000원 
 						</td>
 					</tr>
+					
+					<tr>
+						<th scope="row">
+							<p>식비</p>
+						</th>
+						<td>
+							<fmt:formatNumber value="${info.foodExpenses}" pattern="#,###"/> 원
+						</td>
+						<td>
+							오프라인 교육 출강 1회 당 7,000원
+						</td>
+					</tr>					
 					<tr>
 						<th scope="row">
 							<p>교통비</p>(160원 * <c:out value="${info.onewayDstnc}" />Km)