From 3bb1f11a5a707c5ebd796ac00f3c4e84ae37d103 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Mon, 4 Sep 2023 12:38:34 +0900
Subject: [PATCH] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=83=81=EC=84=B8=20?=
 =?UTF-8?q?=EC=95=8C=EB=A6=BC=ED=86=A1=EB=AA=A9=EB=A1=9D=20=EC=BF=BC?=
 =?UTF-8?q?=EB=A6=AC=EC=A1=B0=EA=B1=B4=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uss/umt/web/EgovUserManageController.java |  3 +-
 .../let/kakao/MjonKakaoATData_SQL_mysql.xml   | 38 +++++++--------
 .../cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp    | 47 ++++++++++++++-----
 .../EgovGnrlUserSelectKakaoDataListPop.jsp    | 33 +++++++++++++
 4 files changed, 89 insertions(+), 32 deletions(-)

diff --git a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java
index 991e00ea..648790e6 100644
--- a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java
+++ b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java
@@ -1412,7 +1412,7 @@ public class EgovUserManageController {
 			 */
 			
 			KakaoVO sendKakaoVO = new KakaoVO();
-			sendKakaoVO.setSearchCondition2("N");//예약건은 제외하기
+			//sendKakaoVO.setSearchCondition2("N");//예약건은 제외하기
 			sendKakaoVO.setReserveCYn("N");//예약취소건은 제외하기
 			sendKakaoVO.setUserId(reqMberManageVO.getMberId());
 			// 문자발송 완료건은 모두 보이도록 처리
@@ -1431,6 +1431,7 @@ public class EgovUserManageController {
 			 */
 			
 			KakaoVO reserveKakaoVO = new KakaoVO();
+			reserveKakaoVO.setReserveYn("Y");			//예약건만 조회
 			reserveKakaoVO.setSearchCondition2("Y");//예약건만 불러오기
 			reserveKakaoVO.setReserveCYn("N");//예약취소건은 제외하기
 			reserveKakaoVO.setUserId(reqMberManageVO.getMberId());
diff --git a/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml
index 3082d111..df0b4253 100644
--- a/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml
@@ -439,7 +439,7 @@
 			AGENT_CODE                            AS agentCode ,
 			RESERVE_YN                            AS reserveYn ,
 			RESERVE_C_YN                          AS reserveCYn ,
-			CANCELDATE                            AS cancelDate ,
+			DATE_FORMAT(CANCELDATE, '%Y-%m-%d %T') AS cancelDate ,
 			msgTypeName                           AS msgTypeName ,
 			orderByCode                           AS orderByCode ,
 			RESULT                                AS msgResult ,
@@ -554,13 +554,13 @@
 				</isEqual>
 				
 				<isEqual property="searchCondition2" compareValue="" >
-					AND M.RESERVE_YN IN ('Y','N')
+					AND IFNULL(M.RESERVE_YN, 'N') IN ('Y','N')
 				</isEqual>
 				<isEqual property="searchCondition2" compareValue="N">
-					AND M.RESERVE_YN = 'N'
+					AND IFNULL(M.RESERVE_YN, 'N') = 'N'
 				</isEqual>
 				<isEqual property="searchCondition2" compareValue="Y">
-					AND M.RESERVE_YN = 'Y'
+					AND IFNULL(M.RESERVE_YN, 'N') = 'Y'
 				</isEqual>
 			</isNotEmpty>
 			
@@ -585,13 +585,13 @@
 				</isNotEmpty>
 				<isNotEmpty property="searchCondition2">
 					<isEqual property="searchCondition2" compareValue="" >
-						AND M.RESERVE_YN IN ('Y','N')
+						AND IFNULL(M.RESERVE_YN, 'N') IN ('Y','N')
 					</isEqual>
 					<isEqual property="searchCondition2" compareValue="N">
-						AND M.RESERVE_YN = 'N'
+						AND IFNULL(M.RESERVE_YN, 'N') = 'N'
 					</isEqual>
 					<isEqual property="searchCondition2" compareValue="Y">
-						AND M.RESERVE_YN = 'Y'
+						AND IFNULL(M.RESERVE_YN, 'N') = 'Y'
 					</isEqual>
 				</isNotEmpty>
 			</isEmpty>
@@ -1214,7 +1214,7 @@
 				AGENT_CODE                            AS agentCode ,
 				RESERVE_YN                            AS reserveYn ,
 				RESERVE_C_YN                          AS reserveCYn ,
-				CANCELDATE                            AS cancelDate ,
+				DATE_FORMAT(CANCELDATE, '%Y-%m-%d %T') AS cancelDate ,
 				msgTypeName                           AS msgTypeName ,
 				orderByCode                           AS orderByCode ,
 				RESULT                                AS msgResult ,
@@ -1227,7 +1227,7 @@
 				BL.CALL_STATUS                        AS callStatus,
 				M.BIZ_KAKAO_RESEND_YN                 AS bizKakaoResendYn,
 				M.AT_DELAY_COMPLETE_YN					AS atDelayCompleteYn,
-				M.AT_DELAY_YN							AS atDelayYn
+				M.AT_DELAY_YN						AS atDelayYn
 			FROM ( 
 					SELECT MG.USER_ID ,
 					MG.MSG_GROUP_ID ,
@@ -1319,13 +1319,13 @@
 					</isEqual>
 					
 					<isEqual property="searchCondition2" compareValue="" >
-						AND M.RESERVE_YN IN ('Y','N')
+						AND IFNULL(M.RESERVE_YN, 'N') IN ('Y','N')
 					</isEqual>
 					<isEqual property="searchCondition2" compareValue="N">
-						AND M.RESERVE_YN = 'N'
+						AND IFNULL(M.RESERVE_YN, 'N') = 'N'
 					</isEqual>
 					<isEqual property="searchCondition2" compareValue="Y">
-						AND M.RESERVE_YN = 'Y'
+						AND IFNULL(M.RESERVE_YN, 'N') = 'Y'
 					</isEqual>
 				</isNotEmpty>
 				
@@ -1350,13 +1350,13 @@
 					</isNotEmpty>
 					<isNotEmpty property="searchCondition2">
 						<isEqual property="searchCondition2" compareValue="" >
-							AND M.RESERVE_YN IN ('Y','N')
+							AND IFNULL(M.RESERVE_YN, 'N') IN ('Y','N')
 						</isEqual>
 						<isEqual property="searchCondition2" compareValue="N">
-							AND M.RESERVE_YN = 'N'
+							AND IFNULL(M.RESERVE_YN, 'N') = 'N'
 						</isEqual>
 						<isEqual property="searchCondition2" compareValue="Y">
-							AND M.RESERVE_YN = 'Y'
+							AND IFNULL(M.RESERVE_YN, 'N') = 'Y'
 						</isEqual>
 					</isNotEmpty>
 				</isEmpty>
@@ -1364,7 +1364,7 @@
 				<isNotEmpty property="pageType">
 					<isEqual property="pageType" compareValue="sand">
 						AND M.AT_DELAY_COMPLETE_YN ='Y'
-						AND M.REFUND_YN = 'N'
+						/*AND M.REFUND_YN = 'N'*/
 					</isEqual>
 				</isNotEmpty>
 				
@@ -1996,13 +1996,13 @@
 					</isNotEmpty>
 					<isNotEmpty property="searchCondition2">
 						<isEqual property="searchCondition2" compareValue="" >
-							AND M.RESERVE_YN IN ('Y','N')
+							AND IFNULL(M.RESERVE_YN, 'N') IN ('Y','N')
 						</isEqual>
 						<isEqual property="searchCondition2" compareValue="N">
-							AND M.RESERVE_YN = 'N'
+							AND IFNULL(M.RESERVE_YN, 'N') = 'N'
 						</isEqual>
 						<isEqual property="searchCondition2" compareValue="Y">
-							AND M.RESERVE_YN = 'Y'
+							AND IFNULL(M.RESERVE_YN, 'N') = 'Y'
 						</isEqual>
 					</isNotEmpty>
 				</isEmpty>
diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
index ada033fa..a9b6ce16 100644
--- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
+++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
@@ -3902,6 +3902,15 @@ function kakaoATDelayCancel(msgGroupId){
 															</c:when>
 															<c:otherwise>
 																<c:choose>
+																	<c:when test="${mjonMsgSentList.delayYn eq 'Y' && mjonMsgSentList.delayCompleteYn eq 'Y' && not empty mjonMsgSentList.cancelDate}">
+																		<span style="color: red;">
+																			<c:if test="${mjonMsgSentList.reserveYn eq 'Y'}">
+																				[예약]
+																			</c:if>
+																			[발송취소]<br />
+																			<fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="MM-dd HH:mm"/>
+																		</span>
+																	</c:when>
 																	<c:when test="${mjonMsgSentList.reserveCYn eq 'Y'}">
 																		[예약취소]<br />
 																		<fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="MM-dd HH:mm"/>
@@ -3910,12 +3919,6 @@ function kakaoATDelayCancel(msgGroupId){
 																		[예약]<br />
 																		<fmt:formatDate value="${mjonMsgSentList.reqdate}" pattern="MM-dd HH:mm"/>
 																	</c:when>
-																	<c:when test="${mjonMsgSentList.delayYn eq 'Y' && mjonMsgSentList.delayCompleteYn eq 'Y' && not empty mjonMsgSentList.cancelDate}">
-																		<span style="color: red;">
-																			[발송취소]<br />
-																			<fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="MM-dd HH:mm"/>
-																		</span>
-																	</c:when>
 																	<c:otherwise>
 																		-
 																	</c:otherwise>
@@ -4109,6 +4112,15 @@ function kakaoATDelayCancel(msgGroupId){
 															</c:when>
 															<c:otherwise>
 																<c:choose>
+																	<c:when test="${mjonMsgSentList.delayYn eq 'Y' && mjonMsgSentList.delayCompleteYn eq 'Y' && not empty mjonMsgSentList.cancelDate}">
+																		<span style="color: red;">
+																			<c:if test="${mjonMsgSentList.reserveYn eq 'Y'}">
+																				[예약]
+																			</c:if>																		
+																			[발송취소]<br />
+																			<fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="yyyy-MM-dd HH:mm"/>
+																		</span>
+																	</c:when>
 																	<c:when test="${mjonMsgSentList.reserveCYn eq 'Y'}">
 																		[예약취소]<br />
 																		<fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="yyyy-MM-dd HH:mm"/>
@@ -4117,12 +4129,6 @@ function kakaoATDelayCancel(msgGroupId){
 																		[예약]<br />
 																		<fmt:formatDate value="${mjonMsgSentList.reqdate}" pattern="yyyy-MM-dd HH:mm"/>
 																	</c:when>
-																	<c:when test="${mjonMsgSentList.delayYn eq 'Y' && mjonMsgSentList.delayCompleteYn eq 'Y' && not empty mjonMsgSentList.cancelDate}">
-																		<span style="color: red;">
-																			[발송취소]<br />
-																			<fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="yyyy-MM-dd HH:mm"/>
-																		</span>
-																	</c:when>
 																	<c:otherwise>
 																		-
 																	</c:otherwise>
@@ -4525,6 +4531,16 @@ function kakaoATDelayCancel(msgGroupId){
 																</c:when>
 																<c:otherwise>
 																	<c:choose>
+																		<c:when test="${kakaoResultList.atDelayYn eq 'Y' && kakaoResultList.atDelayCompleteYn eq 'Y' && not empty kakaoResultList.cancelDate}">
+																			<span style="color: red;">
+																				<c:if test="${kakaoResultList.reserveYn eq 'Y'}">
+																					[예약]
+																				</c:if>																																					
+																				[발송취소]<br />
+																				<fmt:parseDate value="${kakaoResultList.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
+																				<fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>																				
+																			</span>
+																		</c:when>																		
 																		<c:when test="${kakaoResultList.reserveCYn eq 'Y'}">
 																			[예약취소]<br />
 																			<fmt:parseDate value="${kakaoResultList.cancelDate}" var="dateValue" pattern="yyyy-MM-dd HH:mm:ss"/>
@@ -4652,6 +4668,13 @@ function kakaoATDelayCancel(msgGroupId){
 																</c:when>
 																<c:otherwise>
 																	<c:choose>
+																		<c:when test="${kakaoReserveList.atDelayYn eq 'Y' && kakaoReserveList.atDelayCompleteYn eq 'Y' && not empty kakaoReserveList.cancelDate}">
+																			<span style="color: red;">
+																				[발송취소]<br />
+																				<fmt:parseDate value="${kakaoReserveList.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
+																				<fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>																				
+																			</span>
+																		</c:when>																		
 																		<c:when test="${kakaoReserveList.reserveCYn eq 'Y'}">
 																			[예약취소]<br />
 																			<fmt:parseDate value="${kakaoReserveList.cancelDate}" var="dateValue" pattern="yyyy-MM-dd HH:mm:ss"/>
diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/kakao/EgovGnrlUserSelectKakaoDataListPop.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/kakao/EgovGnrlUserSelectKakaoDataListPop.jsp
index f6d36715..e9d54857 100644
--- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/kakao/EgovGnrlUserSelectKakaoDataListPop.jsp
+++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/kakao/EgovGnrlUserSelectKakaoDataListPop.jsp
@@ -404,6 +404,7 @@ function msgDetailClose(obj){
 						<col style="width: 10%">
 						<col style="width: 10%">
 						<col style="width: 10%">
+						<col style="width: 10%">
 						<col style="width: 8%">
 						<col style="width: 20%">
 						<col style="width: 7%">
@@ -414,6 +415,7 @@ function msgDetailClose(obj){
 							<th>아이디</th>
 							<th>채널ID</th>
 							<th>발송건수</th>
+							<th>스미싱의심</th>
 							<th>요청시간</th>
 							<th>예약</th>
 							<th>내용</th>
@@ -457,6 +459,37 @@ function msgDetailClose(obj){
 									</c:otherwise>
 								</c:choose>	
 							</td>
+							<td>
+								<c:choose>
+									<c:when test="${result.atDelayYn eq 'Y'}">
+										<c:choose>
+											<c:when test="${result.atDelayCompleteYn eq 'Y' && not empty result.cancelDate}">
+												<span style="color: #0000FF;">
+													<c:if test="${result.atSmishingYn eq 'Y'}">온</c:if>
+													<c:if test="${result.atSmishingYn eq 'N'}">오프</c:if>[발송취소]
+													<span style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:block;margin-top:3px;" title="<c:out value="${result.cancelDate}"/>">
+														<fmt:parseDate value="${result.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
+														<fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>
+													</span>
+												</span>
+											</c:when>
+											<c:when test="${result.atDelayCompleteYn eq 'N'}">
+												<c:if test="${result.atSmishingYn eq 'Y'}">온</c:if>
+												<c:if test="${result.atSmishingYn eq 'N'}">오프</c:if>[미처리]
+											</c:when>
+											<c:otherwise>
+												<span style="color: #0000FF;">
+													<c:if test="${result.atSmishingYn eq 'Y'}">온</c:if>
+													<c:if test="${result.atSmishingYn eq 'N'}">오프</c:if>[승인]
+												</span>
+											</c:otherwise>
+										</c:choose>
+									</c:when>
+									<c:otherwise>
+										-
+									</c:otherwise>
+								</c:choose>							
+							</td>
 							<td>
 								<fmt:parseDate value="${result.reqDate}" var="reqDateValue" pattern="yyyy-MM-dd HH:mm"/>
 								<fmt:formatDate value="${reqDateValue}" pattern="MM-dd HH:mm"/>