From 5fe9df5280fd91bbb9085ab047ec3a527a773f8b Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Fri, 25 Aug 2023 17:07:11 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=B0=EC=A0=9C=EC=88=98=EB=8B=A8=EA=B3=BC?=
 =?UTF-8?q?=20=EC=B9=B4=EB=93=9C=EC=A0=95=EB=B3=B4=20=EA=B3=B5=EB=B0=B1?=
 =?UTF-8?q?=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../umt/EgovGnrlUserSelectPayDataListPop.jsp  | 42 ++++++++++++++---
 .../WEB-INF/jsp/uss/ion/pay/PayList.jsp       | 46 ++++++++-----------
 .../WEB-INF/jsp/uss/ion/pay/PayModify.jsp     | 29 +++++++++++-
 3 files changed, 82 insertions(+), 35 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectPayDataListPop.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectPayDataListPop.jsp
index 3b4769d1..d8f47282 100644
--- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectPayDataListPop.jsp
+++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectPayDataListPop.jsp
@@ -210,17 +210,17 @@ function sendMsgExcelDownload(){
 			<div class="tableWrap">
 				<table class="tbType1">
 					<colgroup>
-						<col style="width: 5%">
-						<col style="width: 8%">
-						<col style="width: 8%">
+						<col style="width: 4%">
+						<col style="width: 7%">
+						<col style="width: 7%">
 						<col style="width: 5%">
 						<col style="width: 9%">
-						<col style="width: 5%">
+						<col style="width: 9%">
 						<col style="width: *%">
 						<col style="width: 9%">
 						<col style="width: 6%">
 						<col style="width: 6%">
-						<col style="width: 13%">
+						<col style="width: 11%">
 					</colgroup>
 					<thead>
 						<tr>
@@ -269,7 +269,34 @@ function sendMsgExcelDownload(){
 								</c:if>
 							</td>
 							<td>
-								<c:out value="${result.payMethodTxt}"/>
+								<c:choose>
+									<c:when test="${result.payMethodTxt eq '신용카드'}">
+										<c:choose>
+											<c:when test="${not empty result.cardName}">
+												카드(<c:out value="${result.cardName}"/>)
+											</c:when>
+											<c:when test="${result.resultCode == '9991' || result.resultCode == '9993' || result.resultCode == 'I002'}">
+												카드(결제취소)
+											</c:when>
+											<c:otherwise>
+												카드
+											</c:otherwise>
+										</c:choose>
+									</c:when>
+									<c:when test="${result.payMethodTxt eq '간편결제'}">
+										<c:choose>
+											<c:when test="${not empty result.cardName}">
+												간편(<c:out value="${result.cardName}"/>)
+											</c:when>
+											<c:otherwise>
+												간편
+											</c:otherwise>
+										</c:choose>
+									</c:when>									
+									<c:otherwise>
+										<c:out value="${result.payMethodTxt}"/>
+									</c:otherwise>
+								</c:choose>
 							</td>
 							<td>
 								<c:out value="${result.tid}"/>
@@ -298,7 +325,8 @@ function sendMsgExcelDownload(){
 								</c:if>
 							</td>
 							<td>
-								<c:out value="${result.regDate}"/>
+								<fmt:parseDate value="${result.regDate}" var="regDateValue" pattern="yyyy-MM-dd HH:mm"/>
+								<fmt:formatDate value="${regDateValue}" pattern="yyyy-MM-dd HH:mm"/>																														
 							</td>
 						</tr>
 						</c:forEach>
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayList.jsp
index b9f52fc0..8beb3bdd 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayList.jsp
@@ -416,37 +416,29 @@ function fnSmishingUpdate(flag, id) {
 							</td>
 							<%-- <td><fmt:formatNumber value="${result.cancelAmt}" type="number" /><c:if test="${'8' eq result.pgStatus}"><font color="red">(오류)</font></c:if></td> --%>
 							<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
-								<!-- 카드결제 오류로 인한 카드 결제사 이름이 없는 경우 표시 문구 추가 2023.01.02 우영두 -->
 								<c:choose>
 									<c:when test="${result.payMethodTxt eq '신용카드'}">
-										카드
-											<c:choose>
-												<c:when test="${not empty result.cardName}">
-													(<c:out value="${result.cardName}"/>)
-												</c:when>
-												<c:when test="${result.resultCode == '9991' || result.resultCode == '9993' || result.resultCode == 'I002'}">
-													<%-- 9991, 9993, I002 결과코드는 사용자가 결제 중간에 취소하여 오류가 발생한 케이스임. --%>
-													(결제취소)
-												</c:when>
-												<c:otherwise>
-													
-												</c:otherwise>
-											</c:choose>
+										<c:choose>
+											<c:when test="${not empty result.cardName}">
+												카드(<c:out value="${result.cardName}"/>)
+											</c:when>
+											<c:when test="${result.resultCode == '9991' || result.resultCode == '9993' || result.resultCode == 'I002'}">
+												카드(결제취소)
+											</c:when>
+											<c:otherwise>
+												카드
+											</c:otherwise>
+										</c:choose>
 									</c:when>
 									<c:when test="${result.payMethodTxt eq '간편결제'}">
-										간편
-											<c:choose>
-												<c:when test="${not empty result.cardName}">
-													(<c:out value="${result.cardName}"/>)
-												</c:when>
-												<c:when test="${result.resultCode == '9991' || result.resultCode == '9993' || result.resultCode == 'I002'}">
-													<%-- 9991, 9993, I002 결과코드는 사용자가 결제 중간에 취소하여 오류가 발생한 케이스임. --%>
-													(결제취소)
-												</c:when>
-												<c:otherwise>
-													
-												</c:otherwise>
-											</c:choose>
+										<c:choose>
+											<c:when test="${not empty result.cardName}">
+												간편(<c:out value="${result.cardName}"/>)
+											</c:when>
+											<c:otherwise>
+												간편
+											</c:otherwise>
+										</c:choose>
 									</c:when>									
 									<c:otherwise>
 										<c:out value="${result.payMethodTxt}"/>
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayModify.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayModify.jsp
index cd7e6dce..64dffbc5 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayModify.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayModify.jsp
@@ -211,7 +211,34 @@ function goList(no){
 					<tr class="no_modi">
 						<th><span class="reqArea">결제수단</span></th>
 						<td colspan="3">
-							<input type="text" name="payMethodTxt" value="${mjonPayVO.payMethodTxt}" title="결제수단" maxlength="20" />
+								<c:choose>
+									<c:when test="${mjonPayVO.payMethodTxt eq '신용카드'}">
+										<c:choose>
+											<c:when test="${not empty mjonPayVO.cardName}">
+												카드(<c:out value="${mjonPayVO.cardName}"/>)
+											</c:when>
+											<c:when test="${mjonPayVO.resultCode == '9991' || mjonPayVO.resultCode == '9993' || mjonPayVO.resultCode == 'I002'}">
+												카드(결제취소)
+											</c:when>
+											<c:otherwise>
+												카드
+											</c:otherwise>
+										</c:choose>
+									</c:when>
+									<c:when test="${mjonPayVO.payMethodTxt eq '간편결제'}">
+										<c:choose>
+											<c:when test="${not empty mjonPayVO.cardName}">
+												간편(<c:out value="${mjonPayVO.cardName}"/>)
+											</c:when>
+											<c:otherwise>
+												간편
+											</c:otherwise>
+										</c:choose>
+									</c:when>									
+									<c:otherwise>
+										<c:out value="${mjonPayVO.payMethodTxt}"/>
+									</c:otherwise>
+								</c:choose>
 						</td>
 					</tr>