From a6b0fb2e4ec4a83d696c7c15b3fc77a10453e325 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Thu, 11 Apr 2024 15:35:41 +0900
Subject: [PATCH] =?UTF-8?q?2024-04-11=2015:34=20=EA=B5=90=EC=9C=A1?=
 =?UTF-8?q?=EB=B0=B0=EC=B9=98=ED=99=95=EC=A0=95=EA=B4=80=EB=A6=AC=20?=
 =?UTF-8?q?=EC=97=91=EC=85=80=20=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20?=
 =?UTF-8?q?=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   | 30 ++++++++++++-------
 .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml    |  7 +++--
 .../tngrVisitEdu/popup/instrCostPopup.jsp     |  2 +-
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/main/java/kcc/ve/cmm/VeInstrFeeMng.java b/src/main/java/kcc/ve/cmm/VeInstrFeeMng.java
index e00016ae..1fc39955 100644
--- a/src/main/java/kcc/ve/cmm/VeInstrFeeMng.java
+++ b/src/main/java/kcc/ve/cmm/VeInstrFeeMng.java
@@ -135,14 +135,15 @@ public class VeInstrFeeMng {
 						vEInstrFeeAcmdtVO.setTrafficFee(Integer.toString(trafficFee));
 					}
 					vEInstrFeeAcmdtVO.setLikeCheckYn("N");
+					//식비지급
+					vEInstrFeeAcmdtVO.setFoodExpenses("7000");
 				}else {
 					vEInstrFeeAcmdtVO.setDistanceAllow("0");
 					vEInstrFeeAcmdtVO.setLikeCheckYn("Y");
+					//식비지급
+					vEInstrFeeAcmdtVO.setFoodExpenses("0");
 				}
 				
-				//식비지급
-				vEInstrFeeAcmdtVO.setFoodExpenses("7000");
-				
 				// 수당 합계
 				int sum = + Integer.parseInt(vEInstrFeeAcmdtVO.getSpecialWorkAllow())
 							+ Integer.parseInt(vEInstrFeeAcmdtVO.getDistanceAllow());
@@ -151,7 +152,8 @@ public class VeInstrFeeMng {
 				// 여비 합계
 				sum = Integer.parseInt(vEInstrFeeAcmdtVO.getTrafficFee()) 
 						+ Integer.parseInt(vEInstrFeeAcmdtVO.getAcmdtFee());
-				vEInstrFeeAcmdtVO.setSpareFee(String.format("%,d", sum));
+				//vEInstrFeeAcmdtVO.setSpareFee(String.format("%,d", sum));
+				vEInstrFeeAcmdtVO.setSpareFee(Integer.toString(sum));
 				
 				
 				
@@ -208,21 +210,20 @@ public class VeInstrFeeMng {
 		VEInstrFeeAcmdtVO vEInstrFeeAcmdtVO = vEInstrFeeService.selectDetail(infoVO);
 		
 		
-		//if(vEInstrFeeAcmdtVO.getInstrFeeOrd() == null) {
-		if(true) {
+		if(vEInstrFeeAcmdtVO.getInstrFeeOrd() == null) {
+		//if(true) {
 			
 			List<VEInstrFeeAcmdtVO> selectChasiList	=	vEInstrFeeService.selectChasiList(vEInstrFeeAcmdtVO);
 			System.out.println("@@          "+selectChasiList.get(0).getTotCnt());
 			
-			boolean check = true;
+			boolean check = false;
 			
 			System.out.println(" 조회 차시 정보 "+vEInstrFeeAcmdtVO.getEduChasiOrd());
 			System.out.println(" 첫번쨰 차시 정보 "+selectChasiList.get(0).getEduChasiOrd());
-			/*
+			
 			if(selectChasiList.get(0).getEduChasiOrd().equals(vEInstrFeeAcmdtVO.getEduChasiOrd())) {
 				check = true;
-			}
-			*/
+			}			
 			
 			/*
 			 * 강사료 계산 정리
@@ -336,18 +337,24 @@ public class VeInstrFeeMng {
 						
 					}
 					vEInstrFeeAcmdtVO.setLikeCheckYn("N");
+					//식비지급
+					vEInstrFeeAcmdtVO.setFoodExpenses("7000");
 				}else {
 					vEInstrFeeAcmdtVO.setDistanceAllow("0");
 					vEInstrFeeAcmdtVO.setLikeCheckYn("Y");
+					//식비지급
+					vEInstrFeeAcmdtVO.setFoodExpenses("0");
 				}
 				
 				//식비지급
 				//vEInstrFeeAcmdtVO.setFoodExpenses("7000");
+				/*
 				if ("1".equals(p_rankNo)) {
 					if (p_foodExpenses == null) {
 						vEInstrFeeAcmdtVO.setFoodExpenses("7000");
 					}
 				}
+				*/
 				
 				
 				// 수당 합계(a+b)
@@ -358,7 +365,8 @@ public class VeInstrFeeMng {
 				// 여비 합계(c+d)
 				sum = Integer.parseInt(vEInstrFeeAcmdtVO.getTrafficFee()) 
 						+ Integer.parseInt(vEInstrFeeAcmdtVO.getAcmdtFee());
-				vEInstrFeeAcmdtVO.setSpareFee(String.format("%,d", sum));
+				//vEInstrFeeAcmdtVO.setSpareFee(String.format("%,d", sum));
+				vEInstrFeeAcmdtVO.setSpareFee(Integer.toString(sum));
 				
 				System.out.println("Integer.parseInt(vEInstrFeeAcmdtVO.getSpecialWorkAllow())");
 				System.out.println(Integer.parseInt(vEInstrFeeAcmdtVO.getSpecialWorkAllow()));
diff --git 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
index 3b0297b2..eb4e7921 100644
--- 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
@@ -4154,13 +4154,14 @@
 				AND AA.insttNm LIKE '%'||#searchKeyword#||'%'
 			</isEqual>
 		</isNotEmpty>
-		ORDER BY 1
+		ORDER BY
 			
 		<isEmpty property="orderByQuery">
-			, eduAplctOrd desc, eduChasiOrd
+			AA.eduHopeDt DESC,		
+			AA.strtTm ASC
 		</isEmpty>
 		<isNotEmpty property="orderByQuery">
-			, $orderByQuery$
+			$orderByQuery$
 		</isNotEmpty>
 		<isNotEqual property="pageIndex"  compareValue="0">
 		/*
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrCostPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrCostPopup.jsp
index faec9000..8cf9b238 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrCostPopup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrCostPopup.jsp
@@ -314,7 +314,7 @@
 									<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="#,###"/>"/>
+									<input type="text" numberOnly id="foodExpenses" name="foodExpenses" value="<fmt:formatNumber value="${info.foodExpenses}" pattern="#,###"/>"/>
 								</c:otherwise>
 							</c:choose>