2023-11-24 17:59 숙박 신청 상태 수정

src/main/java/kcc/let/utl/fcc/service/VisitEduTransUtil.java

@@ -0,0 +1,77 @@
+/**
+ * @Class Name  : VisitEduTransUtil.java
+ * @Description : 찾교 데이터 변환 관련 유틸리티
+ * @Modification Information
+ *
+ *     수정일         수정자                   수정내용
+ *     -------          --------        ---------------------------
+ *   2009.02.13       이삼섭                  최초 생성
+ *
+ * @author 공통 서비스 개발팀 이삼섭
+ * @since 2009. 02. 13
+ * @version 1.0
+ * @see
+ *
+ */
+
+package kcc.let.utl.fcc.service;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrAsgnmVO;
+/**
+ * 숫자 데이터 처리 관련 유틸리티
+ * @author 공통서비스개발팀 이삼섭
+ * @since 2009.02.13
+ * @version 1.0
+ * @see
+ *
+ * <pre>
+ * << 개정이력(Modification Information) >>
+ *
+ *   수정일      수정자           수정내용
+ *  -------    --------    ---------------------------
+ *   2009.02.13  이삼섭          최초 생성
+ *   2011.08.31  JJY            경량환경 템플릿 커스터마이징버전 생성
+ *
+ * </pre>
+ */
+
+public class VisitEduTransUtil {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(VisitEduTransUtil.class);
+    
+    public static List<VEInstrAsgnmVO> transData4feeSum(List<VEInstrAsgnmVO> p_vEInstrAsgnmVOList){
+    	
+		p_vEInstrAsgnmVOList.stream().forEach(t-> {
+			
+			int		i_feeSum4Dp			=	0;
+			
+			int		i_instrFee			=	0;
+			int		i_specialWorkAllow	=	0;
+			int		i_distanceAllow		=	0;
+			int		i_trafficFee		=	0;
+			int		i_acmdtFee			=	0;
+			
+			try {	i_instrFee	=	Integer.parseInt(t.getInstrFee());					}catch(Exception ex) {	i_instrFee	=	0;	System.out.println(ex.toString());			}				
+			try {	i_specialWorkAllow	=	Integer.parseInt(t.getSpecialWorkAllow());	}catch(Exception ex) {	i_specialWorkAllow	=	0;	System.out.println(ex.toString());	}				
+			try {	i_distanceAllow	=	Integer.parseInt(t.getDistanceAllow());			}catch(Exception ex) {	i_distanceAllow	=	0;	System.out.println(ex.toString());		}
+			try {	i_trafficFee	=	Integer.parseInt(t.getTrafficFee());			}catch(Exception ex) {	i_trafficFee	=	0;	System.out.println(ex.toString());		}
+			try {	i_acmdtFee	=	Integer.parseInt(t.getAcmdtFee());					}catch(Exception ex) {	i_acmdtFee	=	0;	System.out.println(ex.toString());			}	
+			
+			i_feeSum4Dp	=	i_instrFee	+	i_specialWorkAllow	+	i_distanceAllow	+	i_trafficFee	+	i_acmdtFee;
+			
+			try {	t.setFeeSum4Dp(Integer.toString(i_feeSum4Dp));						} catch (Exception e) {	e.printStackTrace();											}
+			
+			System.out.println("i_feeSum4Dp");
+			System.out.println(i_feeSum4Dp);
+			System.out.println(t.getFeeSum4Dp());
+			
+		});
+    	
+    	return p_vEInstrAsgnmVOList;
+    }
+}

src/main/java/kcc/ve/instr/adultVisitEdu/asgnmInfo/web/VEAdultAsgnmController.java

@@ -27,6 +27,7 @@ import kcc.com.utl.user.service.CheckLoginUtil;
 import kcc.let.uat.uia.service.SsoLoginVO;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
 import kcc.let.utl.fcc.service.EgovCryptoUtil4VO;
+import kcc.let.utl.fcc.service.VisitEduTransUtil;
 import kcc.ve.cmm.VeConstants;
 import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAcmdtAplctService;
 import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService;
@@ -146,6 +147,11 @@ public class VEAdultAsgnmController {
 	    	model.addAttribute("paginationInfo", paginationInfo);
 	    	
 	    	
+			//fee 계산하기
+			//feeSum4Dp			
+			vEInstrAsgnmVOList	=	VisitEduTransUtil.transData4feeSum(vEInstrAsgnmVOList);	    	
+	    	
+	    	
 	    	//대상 리스트, 페이징 정보 전달
 	    	model.addAttribute("vEInstrAsgnmVOList", vEInstrAsgnmVOList);
 
@@ -256,6 +262,11 @@ public class VEAdultAsgnmController {
 			model.addAttribute("paginationInfo", paginationInfo);
 			
 			
+			//fee 계산하기
+			//feeSum4Dp			
+			vEInstrAsgnmVOList	=	VisitEduTransUtil.transData4feeSum(vEInstrAsgnmVOList);
+			
+			
 			//대상 리스트, 페이징 정보 전달
 			model.addAttribute("vEInstrAsgnmVOList", vEInstrAsgnmVOList);
 			

src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java

@@ -155,6 +155,8 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable {
 	private String aplctCn;			//신청내용
 	private String rqstCn;			//요청내용
 	
+	private String feeSum4Dp;		//화면에 표시되는 fee 계산용
+	
 	
 	public String getMemoCn() {
 		return memoCn;
@@ -774,5 +776,11 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable {
 	public void setRqstCn(String rqstCn) {
 		this.rqstCn = rqstCn;
 	}
+	public String getFeeSum4Dp() {
+		return feeSum4Dp;
+	}
+	public void setFeeSum4Dp(String feeSum4Dp) {
+		this.feeSum4Dp = feeSum4Dp;
+	}
 	
 }

src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java

@@ -23,6 +23,7 @@ import kcc.com.utl.user.service.CheckLoginUtil;
 import kcc.let.uat.uia.service.SsoLoginVO;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
 import kcc.let.utl.fcc.service.EgovCryptoUtil4VO;
+import kcc.let.utl.fcc.service.VisitEduTransUtil;
 import kcc.ve.cmm.VeConstants;
 import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAcmdtAplctService;
 import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService;
@@ -279,9 +280,11 @@ public class VEAsgnmController {
 						if(StringUtils.isNotEmpty(acmdtCnfrmVO.getAcmdtSbmtYn()))
 							t.setAcmdtSbmtYn(acmdtCnfrmVO.getAcmdtSbmtYn()); 
 						if(StringUtils.isNotEmpty(acmdtCnfrmVO.getAcmdtSbmtYn()))
-							t.setAcmdtAprvlCd(acmdtCnfrmVO.getAcmdtSbmtYn());
+							//t.setAcmdtAprvlCd(acmdtCnfrmVO.getAcmdtSbmtYn());
+							;
 						if(StringUtils.isNotEmpty(acmdtCnfrmVO.getAcmdtSbmtYn()))
-							t.setAcmdtFee(acmdtCnfrmVO.getAcmdtSbmtYn());    
+							t.setAcmdtFee(acmdtCnfrmVO.getAcmdtSbmtYn());
+							
 					}
 				} catch (Exception e) {
 					// TODO Auto-generated catch block
@@ -296,6 +299,11 @@ public class VEAsgnmController {
 			model.addAttribute("paginationInfo", paginationInfo);
 			
 			
+			//fee 계산하기
+			//feeSum4Dp			
+			vEInstrAsgnmVOList	=	VisitEduTransUtil.transData4feeSum(vEInstrAsgnmVOList);
+			
+			
 			//대상 리스트, 페이징 정보 전달
 			model.addAttribute("vEInstrAsgnmVOList", vEInstrAsgnmVOList);
 			

src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java

@@ -39,6 +39,7 @@ import kcc.com.utl.user.service.CheckLoginUtil;
 import kcc.let.uat.uia.service.SsoLoginVO;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
 import kcc.let.utl.fcc.service.EgovCryptoUtil4VO;
+import kcc.let.utl.fcc.service.VisitEduTransUtil;
 import kcc.ve.cmm.VeConstants;
 import kcc.ve.cmm.VeInstrFeeMng;
 import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAcmdtAplctService;
@@ -211,6 +212,11 @@ public class VEEduEndController {
 		    	model.addAttribute("paginationInfo", paginationInfo);
 		    	
 		    	
+				//fee 계산하기
+				//feeSum4Dp			
+				vEInstrAsgnmVOList	=	VisitEduTransUtil.transData4feeSum(vEInstrAsgnmVOList);
+		    	
+		    	
 		    	//대상 리스트, 페이징 정보 전달
 		    	model.addAttribute("vEInstrAsgnmVOList", vEInstrAsgnmVOList);
 		    	

src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Tibero.xml

@@ -205,6 +205,7 @@
 				, bb.aplctCn
 				, bb.acmdtFee
 				, bb.acmdtAplctOrd
+				, bb.aprvlCn
 							
 			FROM (
 					SELECT a.EDU_HOPE_DT, b.USER_ID  
@@ -227,13 +228,17 @@
 							, a.aprvl_cd        AS aprvlCd 
 							, a.aplct_cn        AS aplctCn 
 							, a.acmdt_fee       AS acmdtFee 
-							, a.acmdt_aplct_ord AS AcmdtAplctOrd		
+							, a.acmdt_aplct_ord AS AcmdtAplctOrd
+							, a.aprvl_cn		AS aprvlCn
 							
 					FROM ve_acmdt_aplct a
 						, ve_edu_chasi b
 						, ve_edu_chasi_instr_asgnm c
 					WHERE    1                 =1
+					/*
+					숙박신청한 경우가 있으면 모두 가져와야 한다.
 							AND NVL(a.APRVL_CD,'10') ='10'
+							*/
 							AND a.SBMT_YN ='Y'
 							AND a.USE_YN ='Y'
 					        AND      a.edu_aplct_ord = b.edu_aplct_ord

src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml

@@ -653,7 +653,7 @@
 			,cnt
 			,notiCnt
 		FROM
-			( SELECT DISTINCT 
+			( SELECT  
 				 a.user_id				AS userId
 				, a.edu_aplct_ord		AS eduAplctOrd
 				, a.edu_chasi_ord		AS eduChasiOrd
@@ -688,7 +688,7 @@
 				LEFT OUTER JOIN ve_acmdt_aplct d
 					ON (
 						a.edu_aplct_ord = d.edu_aplct_ord
-						<!-- AND a.edu_chasi_ord = d.edu_chasi_ord -->
+						and a.edu_chasi_ord = d.edu_chasi_ord
 						and d.aplct_cn is not null
 						) 	  
 				LEFT OUTER JOIN ve_instr_fee e

src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngList.jsp

@@ -363,7 +363,7 @@
 												확정
 											</c:when>
 											<c:when test="${list.acmdtSbmtYn eq 'Y' and list.acmdtAprvlCd eq '20'}">
-												미확정
+												반려
 											</c:when>
 											<c:when test="${list.acmdtSbmtYn eq 'Y'}">
 												<button class="btn_type06" 

src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmList.jsp

@@ -131,19 +131,24 @@
 							</a></td>
 							<td><a href="javascript:fncGoDetail('<c:out value="${list.eduAplctOrd}"/>', '<c:out value="${list.eduChasiOrd}"/>');"><c:if test="${list.eduSlctCd eq '10'}">(온)</c:if><ve:code codeId="VE0008" code="${list.eduSlctAreaCd}"/></a></td>
 							<td><p><c:out value='${list.insttNm}'/></p></td>
-								<c:set var = "fee" value="" />
+
-								<c:choose>
+							<td><p>
-									<c:when test="${list.instrFeeSbmtYn ne 'Y'}">
+							
-										<c:set var = "fee" value="정산중" />
+									<c:set var = "fee" value="" />
-									</c:when>
+									<c:choose>
-									<c:when test="${list.acmdtSbmtYn eq 'Y' and empty list.acmdtAprvlCd}">
+										<c:when test="${list.instrFeeSbmtYn ne 'Y'}">
-										<c:set var = "fee" value="정산중" />
+											정산중
-									</c:when>
+										</c:when>
-									<c:otherwise>
+										<c:when test="${list.acmdtSbmtYn eq 'Y' and empty list.acmdtAprvlCd}">
-										<c:set var = "fee" value="${list.instrFee + list.specialWorkAllow + list.distanceAllow + list.trafficFee + list.acmdtFee}" />
+											정산중
-									</c:otherwise>
+										</c:when>
-								</c:choose>
+										<c:otherwise>
-							<td><p><c:out value="${fee}" /></p></td>
+											<c:set var = "fee" value="${list.feeSum4Dp}" />		
+											<fmt:formatNumber value="${fee}" pattern="#,###"/>
+										</c:otherwise>
+									</c:choose>
+							
+							</p></td>
 						</tr>
 					</c:forEach>
 					<c:if test="${empty vEInstrAsgnmVOList}">
@@ -195,19 +200,23 @@
 					<li>
 						<span>총 금액</span>
 						<span>
-								<c:set var = "fee" value="" />
+							<td><p>
-								<c:choose>
+							
-									<c:when test="${list.instrFeeSbmtYn ne 'Y'}">
+									<c:set var = "fee" value="" />
-										<c:set var = "fee" value="정산중" />
+									<c:choose>
-									</c:when>
+										<c:when test="${list.instrFeeSbmtYn ne 'Y'}">
-									<c:when test="${list.acmdtSbmtYn eq 'Y' and empty list.acmdtAprvlCd}">
+											정산중
-										<c:set var = "fee" value="정산중" />
+										</c:when>
-									</c:when>
+										<c:when test="${list.acmdtSbmtYn eq 'Y' and empty list.acmdtAprvlCd}">
-									<c:otherwise>
+											정산중
-										<c:set var = "fee" value="${list.instrFee + list.specialWorkAllow + list.distanceAllow + list.trafficFee + list.acmdtFee}" />
+										</c:when>
-									</c:otherwise>
+										<c:otherwise>
-								</c:choose>
+											<c:set var = "fee" value="${list.feeSum4Dp}" />		
-							<td><p><c:out value="${fee}" /></p></td>
+											<fmt:formatNumber value="${fee}" pattern="#,###"/>
+										</c:otherwise>
+									</c:choose>
+							
+							</p></td>
 						</span>
 					</li>					
 				</ul>			

src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp

@@ -139,19 +139,24 @@
 							</p></td>
 							<td><p><c:if test="${list.eduSlctCd eq '10'}">(온)</c:if><ve:code codeId="VE0008" code="${list.eduSlctAreaCd}"/></p></td>
 							<td><p><c:out value='${list.insttNm}'/></p></td>
-								<c:set var = "fee" value="" />
+
-								<c:choose>
+							<td><p>
-									<c:when test="${list.instrFeeSbmtYn ne 'Y'}">
+							
-										<c:set var = "fee" value="정산중" />
+									<c:set var = "fee" value="" />
-									</c:when>
+									<c:choose>
-									<c:when test="${list.acmdtSbmtYn eq 'Y' and empty list.acmdtAprvlCd}">
+										<c:when test="${list.instrFeeSbmtYn ne 'Y'}">
-										<c:set var = "fee" value="정산중" />
+											정산중
-									</c:when>
+										</c:when>
-									<c:otherwise>
+										<c:when test="${list.acmdtSbmtYn eq 'Y' and empty list.acmdtAprvlCd}">
-										<c:set var = "fee" value="${list.instrFee + list.specialWorkAllow + list.distanceAllow + list.trafficFee + list.acmdtFee}" />
+											정산중
-									</c:otherwise>
+										</c:when>
-								</c:choose>
+										<c:otherwise>
-							<td><p><c:out value='${fee}'/></p></td>
+											<c:set var = "fee" value="${list.feeSum4Dp}" />		
+											<fmt:formatNumber value="${fee}" pattern="#,###"/>
+										</c:otherwise>
+									</c:choose>													
+							
+							</p></td>
 							<c:set var="statCd" value="" />
 							
 							<c:choose>
@@ -220,19 +225,24 @@
 					</li>
 	                      <li>
 						<span>총 금액</span>
-								<c:set var = "fee" value="" />
+
-								<c:choose>
+						<span>
-									<c:when test="${list.instrFeeSbmtYn ne 'Y'}">
+						
-										<c:set var = "fee" value="정산중" />
+									<c:set var = "fee" value="" />
-									</c:when>
+									<c:choose>
-									<c:when test="${list.acmdtSbmtYn eq 'Y' and empty list.acmdtAprvlCd}">
+										<c:when test="${list.instrFeeSbmtYn ne 'Y'}">
-										<c:set var = "fee" value="정산중" />
+											정산중
-									</c:when>
+										</c:when>
-									<c:otherwise>
+										<c:when test="${list.acmdtSbmtYn eq 'Y' and empty list.acmdtAprvlCd}">
-										<c:set var = "fee" value="${list.instrFee + list.specialWorkAllow + list.distanceAllow + list.trafficFee + list.acmdtFee}" />
+											정산중
-									</c:otherwise>
+										</c:when>
-								</c:choose>
+										<c:otherwise>
-						<span><c:out value='${fee}'/></span>
+											<c:set var = "fee" value="${list.feeSum4Dp}" />		
+											<fmt:formatNumber value="${fee}" pattern="#,###"/>
+										</c:otherwise>
+									</c:choose>												
+						
+						</span>
 					</li>
 	                      <li>
 						<span>신청상태</span>

src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndList.jsp

@@ -145,19 +145,24 @@
 							</a></td>
 							<td><a href="javascript:fncGoDetail('<c:out value="${list.eduAplctOrd}"/>', '<c:out value="${list.eduChasiOrd}"/>');"><c:if test="${list.eduSlctCd eq '10'}">(온)</c:if><ve:code codeId="VE0008" code="${list.eduSlctAreaCd}"/></a></td>
 							<td><a href="javascript:fncGoDetail('<c:out value="${list.eduAplctOrd}"/>', '<c:out value="${list.eduChasiOrd}"/>');"><c:out value='${list.insttNm}'/></a></td>
-								<c:set var = "fee" value="" />
+
-								<c:choose>
+							<td><p>
-									<c:when test="${list.instrFeeSbmtYn ne 'Y'}">
+
-										<c:set var = "fee" value="정산중" />
+									<c:set var = "fee" value="" />
-									</c:when>
+									<c:choose>
-									<c:when test="${list.acmdtSbmtYn eq 'Y' and empty list.acmdtAprvlCd}">
+										<c:when test="${list.instrFeeSbmtYn ne 'Y'}">
-										<c:set var = "fee" value="정산중" />
+											정산중
-									</c:when>
+										</c:when>
-									<c:otherwise>
+										<c:when test="${list.acmdtSbmtYn eq 'Y' and empty list.acmdtAprvlCd}">
-										<c:set var = "fee" value="${list.instrFee + list.specialWorkAllow + list.distanceAllow + list.trafficFee + list.acmdtFee}" />
+											정산중
-									</c:otherwise>
+										</c:when>
-								</c:choose>
+										<c:otherwise>
-							<td><p><c:out value="${fee}" /></p></td>
+											<c:set var = "fee" value="${list.feeSum4Dp}" />		
+											<fmt:formatNumber value="${fee}" pattern="#,###"/>
+										</c:otherwise>
+									</c:choose>													
+							
+							</p></td>
 						</tr>
 					</c:forEach>
 					<c:if test="${empty vEInstrAsgnmVOList}">
@@ -210,20 +215,23 @@
 					</li>
 					<li>
 						<span>총 금액</span>
-								<c:set var = "fee" value="" />
+					
-								<c:choose>
-									<c:when test="${list.instrFeeSbmtYn ne 'Y'}">
-										<c:set var = "fee" value="정산중" />
-									</c:when>
-									<c:when test="${list.acmdtSbmtYn eq 'Y' and empty list.acmdtAprvlCd}">
-										<c:set var = "fee" value="정산중" />
-									</c:when>
-									<c:otherwise>
-										<c:set var = "fee" value="${list.instrFee + list.specialWorkAllow + list.distanceAllow + list.trafficFee + list.acmdtFee}" />
-									</c:otherwise>
-								</c:choose>						
 						<span>
-							<c:out value='${fee}'/>
+
+									<c:set var = "fee" value="" />
+									<c:choose>
+										<c:when test="${list.instrFeeSbmtYn ne 'Y'}">
+											정산중
+										</c:when>
+										<c:when test="${list.acmdtSbmtYn eq 'Y' and empty list.acmdtAprvlCd}">
+											정산중
+										</c:when>
+										<c:otherwise>
+											<c:set var = "fee" value="${list.feeSum4Dp}" />		
+											<fmt:formatNumber value="${fee}" pattern="#,###"/>
+										</c:otherwise>
+									</c:choose>						
+													
 						</span>
 					</li>
 				</ul>			

src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp

@@ -133,29 +133,43 @@
 							<td><a href="javascript:fncGoDetail('<c:out value="${list.eduAplctOrd}"/>', '<c:out value="${list.eduChasiOrd}"/>');"><c:if test="${list.eduSlctCd eq '10'}">(온)</c:if><ve:code codeId="VE0008" code="${list.eduSlctAreaCd}"/></a></td>
 							<td><a href="javascript:fncGoDetail('<c:out value="${list.eduAplctOrd}"/>', '<c:out value="${list.eduChasiOrd}"/>');"><c:out value='${list.scholInsttNm}'/></a></td>
 							<td><a href="javascript:fncGoDetail('<c:out value="${list.eduAplctOrd}"/>', '<c:out value="${list.eduChasiOrd}"/>');"><c:out value='${list.trgt}'/></a></td>
-								<c:set var = "fee" value="" />
+
-								<c:choose>
+							<td>
-									<c:when test="${list.instrFeeSbmtYn ne 'Y'}">
+								<p>
-										<c:set var = "fee" value="정산중" />
+															
-									</c:when>
+									<c:set var = "fee" value="" />
-									<c:when test="${list.acmdtSbmtYn eq 'Y' and empty list.acmdtAprvlCd}">
+									<c:choose>
-										<c:set var = "fee" value="정산중" />
+										<c:when test="${list.instrFeeSbmtYn ne 'Y'}">
-									</c:when>
+											정산중
-									<c:otherwise>
+										</c:when>
-<%-- 										<c:set var = "fee" value="${list.instrFee + list.specialWorkAllow + list.distanceAllow + list.trafficFee + list.acmdtFee}" /> --%>
+										<c:when test="${list.acmdtSbmtYn eq 'Y' and empty list.acmdtFee}">
-									</c:otherwise>
+											정산중
-								</c:choose>
+										</c:when>
-							<td><p><c:out value="${fee}" /></p></td>
+										<c:otherwise>
+											<c:set var = "fee" value="${list.feeSum4Dp}" />		
+											<fmt:formatNumber value="${fee}" pattern="#,###"/>
+										</c:otherwise>
+									</c:choose>						
+									
+								</p>
+							</td>
 								<c:set var="acmdtYn" value="" />
 								<c:if test="${empty list.acmdtSbmtYn}">
 									<c:set var="acmdtYn" value="미신청" />
 								</c:if>
-								<c:if test="${list.acmdtSbmtYn eq 'Y' and list.acmdtAprvlCd eq '10'}">
+								<c:if test="${list.acmdtSbmtYn eq 'Y'}">
-									<c:set var="acmdtYn" value="신청(승인)" />
+									<c:choose>
-								</c:if>
+										<c:when test="${list.acmdtAprvlCd eq '10'}">
-								<c:if test="${list.acmdtSbmtYn eq 'Y' and list.acmdtAprvlCd ne '10'}">
+											<c:set var="acmdtYn" value="신청(승인)" />
-									<c:set var="acmdtYn" value="신청(미승인)" />
+										</c:when>
-								</c:if>
+										<c:when test="${list.acmdtAprvlCd eq '20'}">
+											<c:set var="acmdtYn" value="신청(반려)" />
+										</c:when>
+										<c:otherwise>
+											<c:set var="acmdtYn" value="확인중" />
+										</c:otherwise>
+									</c:choose>
+								</c:if>								
 							<td><p>${acmdtYn}</p></td>
 						</tr>
 					</c:forEach>
@@ -212,20 +226,23 @@
                     <li>                    
 						<span>총 지급액</span>
 						
-								<c:set var = "fee" value="" />
+						<span><span>
-								<c:choose>
-									<c:when test="${list.instrFeeSbmtYn ne 'Y'}">
-										<c:set var = "fee" value="정산중" />
-									</c:when>
-									<c:when test="${list.acmdtSbmtYn eq 'Y' and empty list.acmdtAprvlCd}">
-										<c:set var = "fee" value="정산중" />
-									</c:when>
-									<c:otherwise>
-										<c:set var = "fee" value="${list.instrFee + list.specialWorkAllow + list.distanceAllow + list.trafficFee + list.acmdtFee}" />
-									</c:otherwise>
-								</c:choose>						
 						
-						<span><span><c:out value='${fee}'/></span></span>
+									<c:set var = "fee" value="" />
+									<c:choose>
+										<c:when test="${list.instrFeeSbmtYn ne 'Y'}">
+											정산중
+										</c:when>
+										<c:when test="${list.acmdtSbmtYn eq 'Y' and empty list.acmdtFee}">
+											정산중
+										</c:when>
+										<c:otherwise>
+											<c:set var = "fee" value="${list.feeSum4Dp}" />		
+											<fmt:formatNumber value="${fee}" pattern="#,###"/>
+										</c:otherwise>
+									</c:choose>												
+						
+						</span></span>
 					</li>
 					<li>
 						<span>숙박여부</span>
@@ -233,12 +250,20 @@
 								<c:if test="${empty list.acmdtSbmtYn}">
 									<c:set var="acmdtYn" value="미신청" />
 								</c:if>
-								<c:if test="${list.acmdtSbmtYn eq 'Y' and list.acmdtAprvlCd eq '10'}">
+								<c:if test="${list.acmdtSbmtYn eq 'Y'}">
-									<c:set var="acmdtYn" value="신청(승인)" />
+									<c:choose>
+										<c:when test="${list.acmdtAprvlCd eq '10'}">
+											<c:set var="acmdtYn" value="신청(승인)" />
+										</c:when>
+										<c:when test="${list.acmdtAprvlCd eq '20'}">
+											<c:set var="acmdtYn" value="신청(반려)" />
+										</c:when>
+										<c:otherwise>
+											<c:set var="acmdtYn" value="확인중" />
+										</c:otherwise>
+									</c:choose>
 								</c:if>
-								<c:if test="${list.acmdtSbmtYn eq 'Y' and list.acmdtAprvlCd ne '10'}">
+								${list.acmdtAprvlCd}
-									<c:set var="acmdtYn" value="신청(미승인)" />
-								</c:if>						
 						<span><span><c:out value='${acmdtYn}'/></span></span>
 					</li>					
 				</ul>			

src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail.jsp

@@ -370,7 +370,7 @@ $( document ).ready(function() {
 									신청안함
 								</c:if>
 								<c:if test="${acmdtAplct.sbmtYn eq 'Y'}">
-									신청
+<!-- 									신청 -->
 									<c:if test="${acmdtAplct.atchFileId ne null}">
 										<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
 											<c:param name="param_atchFileId" value="${acmdtAplct.atchFileId}" />
@@ -417,8 +417,7 @@ $( document ).ready(function() {
 									신청안함
 								</c:if>
 								<c:if test="${acmdtAplct.sbmtYn eq 'Y'}">
-									신청
+<!-- 									신청 -->								
-								
 									<c:if test="${acmdtAplct.atchFileId ne null}">
 										<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
 											<c:param name="param_atchFileId" value="${acmdtAplct.atchFileId}" />
@@ -492,10 +491,17 @@ $( document ).ready(function() {
 						<td>
 							<c:forEach var="fileVO" items="${fileList}" varStatus="status">
 								<c:set var="fileNm" value="${info2.instrNm}_${info.scholInsttNm}_${info3.frstRegistPnttm}_${status.index+1}" />
-								<a href="javascript:fileDownload('<c:out value="${fileVO.atchFileId}"/>','<c:out value="${fileVO.fileSn}"/>','<c:out value="${fileNm}"/>')" class="fileName" title="다운로드">
+<%-- 								<a href="javascript:fileDownload('<c:out value="${fileVO.atchFileId}"/>','<c:out value="${fileVO.fileSn}"/>','<c:out value="${fileNm}"/>')" class="fileName" title="다운로드"> --%>
-									<img style="width:50%;" src='<c:url value='/uss/ion/pwm/getImage.do'/>?atchFileId=<c:out value="${fileVO.atchFileId}"/>&fileSn=<c:out value="${fileVO.fileSn}"/>' class="atchFileImg"alt="해당파일이미지"/>
+<%-- 									<img style="width:50%;" src='<c:url value='/uss/ion/pwm/getImage.do'/>?atchFileId=<c:out value="${fileVO.atchFileId}"/>&fileSn=<c:out value="${fileVO.fileSn}"/>' class="atchFileImg"alt="해당파일이미지"/> --%>
-									<br>파일명 : <c:out value="${fileNm}" />
+<%-- 									<br>파일명 : <c:out value="${fileNm}" /> --%>
-								</a>
+<!-- 								</a> -->
+<!-- 								<br> -->
+<!-- 								<br/> -->
+									<c:if test="${fileVO.atchFileId ne null}">
+										<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
+											<c:param name="param_atchFileId" value="${fileVO.atchFileId}" />
+										</c:import>
+									</c:if>								
 							</c:forEach>
 						</td>
 					</tr>