Commit @3bb1f11a5a707c5ebd796ac00f3c4e84ae37d103

itn 2023-09-04

회원상세 알림톡목록 쿼리조건 수정

@3bb1f11a5a707c5ebd796ac00f3c4e84ae37d103

06fe04f

3bb1f11

src/main/java/itn/let/uss/umt/web/EgovUserManageController.java

--- src/main/java/itn/let/uss/umt/web/EgovUserManageController.java

+++ src/main/java/itn/let/uss/umt/web/EgovUserManageController.java


 			 */
 			
 			KakaoVO sendKakaoVO = new KakaoVO();
-			sendKakaoVO.setSearchCondition2("N");//예약건은 제외하기
+			//sendKakaoVO.setSearchCondition2("N");//예약건은 제외하기
 			sendKakaoVO.setReserveCYn("N");//예약취소건은 제외하기
 			sendKakaoVO.setUserId(reqMberManageVO.getMberId());
 			// 문자발송 완료건은 모두 보이도록 처리

 			 */
 			
 			KakaoVO reserveKakaoVO = new KakaoVO();
+			reserveKakaoVO.setReserveYn("Y");			//예약건만 조회
 			reserveKakaoVO.setSearchCondition2("Y");//예약건만 불러오기
 			reserveKakaoVO.setReserveCYn("N");//예약취소건은 제외하기
 			reserveKakaoVO.setUserId(reqMberManageVO.getMberId());

06fe04f

3bb1f11

src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml

--- src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml


 			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 ,

 				</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>
 			

 				</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>

 				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 ,

 				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 ,

 					</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>
 				

 					</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>

 				<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>
 				

 					</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>

06fe04f

3bb1f11

src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp

--- src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp

+++ src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp


 															</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"/>

 																	<c:when test="${mjonMsgSentList.reserveYn eq 'Y' && mjonMsgSentList.reserveCYn eq 'N'}">
 																		[예약]<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: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"/>

 																	<c:when test="${mjonMsgSentList.reserveYn eq 'Y' && mjonMsgSentList.reserveCYn eq 'N'}">
 																		[예약]<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: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"/>

 																</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"/>

06fe04f

3bb1f11

src/main/webapp/WEB-INF/jsp/cmm/uss/umt/kakao/EgovGnrlUserSelectKakaoDataListPop.jsp

--- src/main/webapp/WEB-INF/jsp/cmm/uss/umt/kakao/EgovGnrlUserSelectKakaoDataListPop.jsp

+++ src/main/webapp/WEB-INF/jsp/cmm/uss/umt/kakao/EgovGnrlUserSelectKakaoDataListPop.jsp


 						<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%">

 							<th>아이디</th>
 							<th>채널ID</th>
 							<th>발송건수</th>
+							<th>스미싱의심</th>
 							<th>요청시간</th>
 							<th>예약</th>
 							<th>내용</th>

 								</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"/>
 							</td>							

Add a comment

Open 0
Closed 0

List

...	...	@@ -1412,7 +1412,7 @@
1412	1412	*/
1413	1413
1414	1414	KakaoVO sendKakaoVO = new KakaoVO();
1415		- sendKakaoVO.setSearchCondition2("N");//예약건은 제외하기
	1415	+ //sendKakaoVO.setSearchCondition2("N");//예약건은 제외하기
1416	1416	sendKakaoVO.setReserveCYn("N");//예약취소건은 제외하기
1417	1417	sendKakaoVO.setUserId(reqMberManageVO.getMberId());
1418	1418	// 문자발송 완료건은 모두 보이도록 처리
...	...	@@ -1431,6 +1431,7 @@
1431	1431	*/
1432	1432
1433	1433	KakaoVO reserveKakaoVO = new KakaoVO();
	1434	+ reserveKakaoVO.setReserveYn("Y"); //예약건만 조회
1434	1435	reserveKakaoVO.setSearchCondition2("Y");//예약건만 불러오기
1435	1436	reserveKakaoVO.setReserveCYn("N");//예약취소건은 제외하기
1436	1437	reserveKakaoVO.setUserId(reqMberManageVO.getMberId());

...	...	@@ -439,7 +439,7 @@
439	439	AGENT_CODE AS agentCode ,
440	440	RESERVE_YN AS reserveYn ,
441	441	RESERVE_C_YN AS reserveCYn ,
442		- CANCELDATE AS cancelDate ,
	442	+ DATE_FORMAT(CANCELDATE, '%Y-%m-%d %T') AS cancelDate ,
443	443	msgTypeName AS msgTypeName ,
444	444	orderByCode AS orderByCode ,
445	445	RESULT AS msgResult ,
...	...	@@ -554,13 +554,13 @@
554	554	</isEqual>
555	555
556	556	<isEqual property="searchCondition2" compareValue="" >
557		- AND M.RESERVE_YN IN ('Y','N')
	557	+ AND IFNULL(M.RESERVE_YN, 'N') IN ('Y','N')
558	558	</isEqual>
559	559	<isEqual property="searchCondition2" compareValue="N">
560		- AND M.RESERVE_YN = 'N'
	560	+ AND IFNULL(M.RESERVE_YN, 'N') = 'N'
561	561	</isEqual>
562	562	<isEqual property="searchCondition2" compareValue="Y">
563		- AND M.RESERVE_YN = 'Y'
	563	+ AND IFNULL(M.RESERVE_YN, 'N') = 'Y'
564	564	</isEqual>
565	565	</isNotEmpty>
566	566
...	...	@@ -585,13 +585,13 @@
585	585	</isNotEmpty>
586	586	<isNotEmpty property="searchCondition2">
587	587	<isEqual property="searchCondition2" compareValue="" >
588		- AND M.RESERVE_YN IN ('Y','N')
	588	+ AND IFNULL(M.RESERVE_YN, 'N') IN ('Y','N')
589	589	</isEqual>
590	590	<isEqual property="searchCondition2" compareValue="N">
591		- AND M.RESERVE_YN = 'N'
	591	+ AND IFNULL(M.RESERVE_YN, 'N') = 'N'
592	592	</isEqual>
593	593	<isEqual property="searchCondition2" compareValue="Y">
594		- AND M.RESERVE_YN = 'Y'
	594	+ AND IFNULL(M.RESERVE_YN, 'N') = 'Y'
595	595	</isEqual>
596	596	</isNotEmpty>
597	597	</isEmpty>
...	...	@@ -1214,7 +1214,7 @@
1214	1214	AGENT_CODE AS agentCode ,
1215	1215	RESERVE_YN AS reserveYn ,
1216	1216	RESERVE_C_YN AS reserveCYn ,
1217		- CANCELDATE AS cancelDate ,
	1217	+ DATE_FORMAT(CANCELDATE, '%Y-%m-%d %T') AS cancelDate ,
1218	1218	msgTypeName AS msgTypeName ,
1219	1219	orderByCode AS orderByCode ,
1220	1220	RESULT AS msgResult ,
...	...	@@ -1227,7 +1227,7 @@
1227	1227	BL.CALL_STATUS AS callStatus,
1228	1228	M.BIZ_KAKAO_RESEND_YN AS bizKakaoResendYn,
1229	1229	M.AT_DELAY_COMPLETE_YN AS atDelayCompleteYn,
1230		- M.AT_DELAY_YN AS atDelayYn
	1230	+ M.AT_DELAY_YN AS atDelayYn
1231	1231	FROM (
1232	1232	SELECT MG.USER_ID ,
1233	1233	MG.MSG_GROUP_ID ,
...	...	@@ -1319,13 +1319,13 @@
1319	1319	</isEqual>
1320	1320
1321	1321	<isEqual property="searchCondition2" compareValue="" >
1322		- AND M.RESERVE_YN IN ('Y','N')
	1322	+ AND IFNULL(M.RESERVE_YN, 'N') IN ('Y','N')
1323	1323	</isEqual>
1324	1324	<isEqual property="searchCondition2" compareValue="N">
1325		- AND M.RESERVE_YN = 'N'
	1325	+ AND IFNULL(M.RESERVE_YN, 'N') = 'N'
1326	1326	</isEqual>
1327	1327	<isEqual property="searchCondition2" compareValue="Y">
1328		- AND M.RESERVE_YN = 'Y'
	1328	+ AND IFNULL(M.RESERVE_YN, 'N') = 'Y'
1329	1329	</isEqual>
1330	1330	</isNotEmpty>
1331	1331
...	...	@@ -1350,13 +1350,13 @@
1350	1350	</isNotEmpty>
1351	1351	<isNotEmpty property="searchCondition2">
1352	1352	<isEqual property="searchCondition2" compareValue="" >
1353		- AND M.RESERVE_YN IN ('Y','N')
	1353	+ AND IFNULL(M.RESERVE_YN, 'N') IN ('Y','N')
1354	1354	</isEqual>
1355	1355	<isEqual property="searchCondition2" compareValue="N">
1356		- AND M.RESERVE_YN = 'N'
	1356	+ AND IFNULL(M.RESERVE_YN, 'N') = 'N'
1357	1357	</isEqual>
1358	1358	<isEqual property="searchCondition2" compareValue="Y">
1359		- AND M.RESERVE_YN = 'Y'
	1359	+ AND IFNULL(M.RESERVE_YN, 'N') = 'Y'
1360	1360	</isEqual>
1361	1361	</isNotEmpty>
1362	1362	</isEmpty>
...	...	@@ -1364,7 +1364,7 @@
1364	1364	<isNotEmpty property="pageType">
1365	1365	<isEqual property="pageType" compareValue="sand">
1366	1366	AND M.AT_DELAY_COMPLETE_YN ='Y'
1367		- AND M.REFUND_YN = 'N'
	1367	+ /AND M.REFUND_YN = 'N'/
1368	1368	</isEqual>
1369	1369	</isNotEmpty>
1370	1370
...	...	@@ -1996,13 +1996,13 @@
1996	1996	</isNotEmpty>
1997	1997	<isNotEmpty property="searchCondition2">
1998	1998	<isEqual property="searchCondition2" compareValue="" >
1999		- AND M.RESERVE_YN IN ('Y','N')
	1999	+ AND IFNULL(M.RESERVE_YN, 'N') IN ('Y','N')
2000	2000	</isEqual>
2001	2001	<isEqual property="searchCondition2" compareValue="N">
2002		- AND M.RESERVE_YN = 'N'
	2002	+ AND IFNULL(M.RESERVE_YN, 'N') = 'N'
2003	2003	</isEqual>
2004	2004	<isEqual property="searchCondition2" compareValue="Y">
2005		- AND M.RESERVE_YN = 'Y'
	2005	+ AND IFNULL(M.RESERVE_YN, 'N') = 'Y'
2006	2006	</isEqual>
2007	2007	</isNotEmpty>
2008	2008	</isEmpty>

...	...	@@ -3902,6 +3902,15 @@
3902	3902	</c:when>
3903	3903	<c:otherwise>
3904	3904	<c:choose>
	3905	+ <c:when test="${mjonMsgSentList.delayYn eq 'Y' && mjonMsgSentList.delayCompleteYn eq 'Y' && not empty mjonMsgSentList.cancelDate}">
	3906	+ <span style="color: red;">
	3907	+ <c:if test="${mjonMsgSentList.reserveYn eq 'Y'}">
	3908	+ [예약]
	3909	+ </c:if>
	3910	+ [발송취소]<br />
	3911	+ <fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="MM-dd HH:mm"/>
	3912	+ </span>
	3913	+ </c:when>
3905	3914	<c:when test="${mjonMsgSentList.reserveCYn eq 'Y'}">
3906	3915	[예약취소]<br />
3907	3916	<fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="MM-dd HH:mm"/>
...	...	@@ -3909,12 +3918,6 @@
3909	3918	<c:when test="${mjonMsgSentList.reserveYn eq 'Y' && mjonMsgSentList.reserveCYn eq 'N'}">
3910	3919	[예약]<br />
3911	3920	<fmt:formatDate value="${mjonMsgSentList.reqdate}" pattern="MM-dd HH:mm"/>
3912		- </c:when>
3913		- <c:when test="${mjonMsgSentList.delayYn eq 'Y' && mjonMsgSentList.delayCompleteYn eq 'Y' && not empty mjonMsgSentList.cancelDate}">
3914		- <span style="color: red;">
3915		- [발송취소]<br />
3916		- <fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="MM-dd HH:mm"/>
3917		- </span>
3918	3921	</c:when>
3919	3922	<c:otherwise>
3920	3923	-
...	...	@@ -4109,6 +4112,15 @@
4109	4112	</c:when>
4110	4113	<c:otherwise>
4111	4114	<c:choose>
	4115	+ <c:when test="${mjonMsgSentList.delayYn eq 'Y' && mjonMsgSentList.delayCompleteYn eq 'Y' && not empty mjonMsgSentList.cancelDate}">
	4116	+ <span style="color: red;">
	4117	+ <c:if test="${mjonMsgSentList.reserveYn eq 'Y'}">
	4118	+ [예약]
	4119	+ </c:if>
	4120	+ [발송취소]<br />
	4121	+ <fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="yyyy-MM-dd HH:mm"/>
	4122	+ </span>
	4123	+ </c:when>
4112	4124	<c:when test="${mjonMsgSentList.reserveCYn eq 'Y'}">
4113	4125	[예약취소]<br />
4114	4126	<fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="yyyy-MM-dd HH:mm"/>
...	...	@@ -4116,12 +4128,6 @@
4116	4128	<c:when test="${mjonMsgSentList.reserveYn eq 'Y' && mjonMsgSentList.reserveCYn eq 'N'}">
4117	4129	[예약]<br />
4118	4130	<fmt:formatDate value="${mjonMsgSentList.reqdate}" pattern="yyyy-MM-dd HH:mm"/>
4119		- </c:when>
4120		- <c:when test="${mjonMsgSentList.delayYn eq 'Y' && mjonMsgSentList.delayCompleteYn eq 'Y' && not empty mjonMsgSentList.cancelDate}">
4121		- <span style="color: red;">
4122		- [발송취소]<br />
4123		- <fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="yyyy-MM-dd HH:mm"/>
4124		- </span>
4125	4131	</c:when>
4126	4132	<c:otherwise>
4127	4133	-
...	...	@@ -4525,6 +4531,16 @@
4525	4531	</c:when>
4526	4532	<c:otherwise>
4527	4533	<c:choose>
	4534	+ <c:when test="${kakaoResultList.atDelayYn eq 'Y' && kakaoResultList.atDelayCompleteYn eq 'Y' && not empty kakaoResultList.cancelDate}">
	4535	+ <span style="color: red;">
	4536	+ <c:if test="${kakaoResultList.reserveYn eq 'Y'}">
	4537	+ [예약]
	4538	+ </c:if>
	4539	+ [발송취소]<br />
	4540	+ <fmt:parseDate value="${kakaoResultList.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
	4541	+ <fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>
	4542	+ </span>
	4543	+ </c:when>
4528	4544	<c:when test="${kakaoResultList.reserveCYn eq 'Y'}">
4529	4545	[예약취소]<br />
4530	4546	<fmt:parseDate value="${kakaoResultList.cancelDate}" var="dateValue" pattern="yyyy-MM-dd HH:mm:ss"/>
...	...	@@ -4652,6 +4668,13 @@
4652	4668	</c:when>
4653	4669	<c:otherwise>
4654	4670	<c:choose>
	4671	+ <c:when test="${kakaoReserveList.atDelayYn eq 'Y' && kakaoReserveList.atDelayCompleteYn eq 'Y' && not empty kakaoReserveList.cancelDate}">
	4672	+ <span style="color: red;">
	4673	+ [발송취소]<br />
	4674	+ <fmt:parseDate value="${kakaoReserveList.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
	4675	+ <fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>
	4676	+ </span>
	4677	+ </c:when>
4655	4678	<c:when test="${kakaoReserveList.reserveCYn eq 'Y'}">
4656	4679	[예약취소]<br />
4657	4680	<fmt:parseDate value="${kakaoReserveList.cancelDate}" var="dateValue" pattern="yyyy-MM-dd HH:mm:ss"/>

...	...	@@ -404,6 +404,7 @@
404	404	<col style="width: 10%">
405	405	<col style="width: 10%">
406	406	<col style="width: 10%">
	407	+ <col style="width: 10%">
407	408	<col style="width: 8%">
408	409	<col style="width: 20%">
409	410	<col style="width: 7%">
...	...	@@ -414,6 +415,7 @@
414	415	<th>아이디</th>
415	416	<th>채널ID</th>
416	417	<th>발송건수</th>
	418	+ <th>스미싱의심</th>
417	419	<th>요청시간</th>
418	420	<th>예약</th>
419	421	<th>내용</th>
...	...	@@ -458,6 +460,37 @@
458	460	</c:choose>
459	461	</td>
460	462	<td>
	463	+ <c:choose>
	464	+ <c:when test="${result.atDelayYn eq 'Y'}">
	465	+ <c:choose>
	466	+ <c:when test="${result.atDelayCompleteYn eq 'Y' && not empty result.cancelDate}">
	467	+ <span style="color: #0000FF;">
	468	+ <c:if test="${result.atSmishingYn eq 'Y'}">온</c:if>
	469	+ <c:if test="${result.atSmishingYn eq 'N'}">오프</c:if>[발송취소]
	470	+ <span style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:block;margin-top:3px;" title="<c:out value="${result.cancelDate}"/>">
	471	+ <fmt:parseDate value="${result.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
	472	+ <fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>
	473	+ </span>
	474	+ </span>
	475	+ </c:when>
	476	+ <c:when test="${result.atDelayCompleteYn eq 'N'}">
	477	+ <c:if test="${result.atSmishingYn eq 'Y'}">온</c:if>
	478	+ <c:if test="${result.atSmishingYn eq 'N'}">오프</c:if>[미처리]
	479	+ </c:when>
	480	+ <c:otherwise>
	481	+ <span style="color: #0000FF;">
	482	+ <c:if test="${result.atSmishingYn eq 'Y'}">온</c:if>
	483	+ <c:if test="${result.atSmishingYn eq 'N'}">오프</c:if>[승인]
	484	+ </span>
	485	+ </c:otherwise>
	486	+ </c:choose>
	487	+ </c:when>
	488	+ <c:otherwise>
	489	+ -
	490	+ </c:otherwise>
	491	+ </c:choose>
	492	+ </td>
	493	+ <td>
461	494	<fmt:parseDate value="${result.reqDate}" var="reqDateValue" pattern="yyyy-MM-dd HH:mm"/>
462	495	<fmt:formatDate value="${reqDateValue}" pattern="MM-dd HH:mm"/>
463	496	</td>

Delete comment