From 10c6179de8674d7c147197f3fcb9f51f70b71073 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Mon, 26 Feb 2024 14:11:09 +0900
Subject: [PATCH] =?UTF-8?q?2024-02-26=2014:10=20=EA=B5=90=EC=9C=A1?=
 =?UTF-8?q?=ED=99=95=EC=A0=95=EC=9D=B8=20=EA=B2=BD=EC=9A=B0=20=EC=B0=A8?=
 =?UTF-8?q?=EC=8B=9C=20=EC=B6=94=EA=B0=80/=EC=82=AD=EC=A0=9C=20=EB=B6=88?=
 =?UTF-8?q?=EA=B0=80=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=B2=98=EB=A6=AC?=
 =?UTF-8?q?=ED=95=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/kcc/ve/cmm/VeInstrFeeMng.java            |  6 ++++++
 .../web/EduAsgnmCnfrmMngTngrController.java            | 10 ++++++----
 .../WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp  |  8 ++++++--
 .../WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp  |  8 ++++++--
 4 files changed, 24 insertions(+), 8 deletions(-)

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(){
 						</span>
 					</div>
 					<div class="btn_wrap">
-<!-- 						<button type="button" class="btn_type01" onclick="addEduClassCopy('addClassRow');">교육추가</button> -->
+						<c:if test="${info.aprvlCd ne '60'}">
+							<button type="button" class="btn_type01" onclick="addEduClassCopy('addClassRow');">교육추가</button>
+						</c:if>						
 					</div>
 				</div>
 				<div class="tb_type01">
@@ -709,7 +711,9 @@ $( document ).ready(function(){
 										<td><input type="text" style="width: 75%;" name="trgt" value="${list.trgt}"></td>
 										<td><input type="text" style="width: 63%;" name="prsnl" value="${list.prsnl}" maxlength="3" onkeyup="onlyNumber(this);"><p class="input_text">명</p></td>
 										<td>
-<%-- 											<button type="button" class="table_del" onclick="tableDel(this)"><img src="<c:url value='/visitEdu/adm/publish/image/content/btn_del.png' />"></button> --%>
+											<c:if test="${info.aprvlCd ne '60'}">
+												<button type="button" class="table_del" onclick="tableDel(this)"><img src="<c:url value='/visitEdu/adm/publish/image/content/btn_del.png' />"></button>
+											</c:if>																
 										</td>
 									</tr>
 								</c:forEach>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp
index 2cd3d082..bf93af25 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp
@@ -131,9 +131,12 @@
 			}
 
 			$('input:checkbox[name="chk"]:checked').each(function() {
+
+				
+				
 			sendSms(
 					$(this).data('instrphone'),
-					p_smsMsg, 
+					$(this).data("dater") +"일 "+ p_smsMsg, 
 					$(this).val().split('@')[0],
 					$(this).data('userid'),
 					"C",
@@ -508,7 +511,8 @@
 								<td>
 									<input name="chk"
 									class="${list.atchFileId}" 
-									data-lctr="${list.userId}" value="${list.eduAplctOrd}@${list.eduChasiOrd}" data-phone="<c:out value='${list.clphone}' />" data-cnt="<c:out value='${list.cnt}' />" 
+									data-lctr="${list.userId}" value="${list.eduAplctOrd}@${list.eduChasiOrd}" data-phone="<c:out value='${list.clphone}' />" data-cnt="<c:out value='${list.cnt}' />"
+									data-dater="<c:out value='${list.eduHopeDt}' />" 
 									data-date="<c:out value='${list.eduHopeDt}' /> <c:out value='${list.strtTm}' /> ~ <c:out value='${list.endTm}' />"
 									data-instrphone="<c:out value='${list.instrPhone}' />"
 									data-email="<c:out value='${list.email}' />" data-chrgnm="<c:out value='${list.chrgNm}' />" data-userId="<c:out value='${list.userId}' />"