Commit @f4caafc7574813e20bb1ec0999e1d49ae9fb71b2

woo 2023-07-03

Merge branch 'rosewiper'

@f4caafc7574813e20bb1ec0999e1d49ae9fb71b2

7a73f92

f4caafc

src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml

--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml


 						AND MGD.REQ_DATE > now()
 						AND MGD.RESERVE_YN = 'Y'
 						]]>
+						/**30분 지연이 아니거나 지연 처리가 완료된 건들 불러오기*/
+		                 AND
+	                         (
+	                                 (
+	                                         MGD.DELAY_YN          = 'N'
+	                                 AND     MGD.DELAY_COMPLETE_YN = 'N'
+	                                 )
+	                         OR
+	                                 (
+	                                         MGD.DELAY_YN          = 'Y'
+	                                 AND     MGD.DELAY_COMPLETE_YN = 'Y'
+	                                 )
+	                         )
 						</isEqual>
 					</isNotEmpty>
 					

7a73f92

f4caafc

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


 								</thead>
 								<tbody>
 									<c:choose>
-										<c:when test="${not empty mjonMsgSentList}">
+										<c:when test="${not empty mjonMsgSentList2}">
 											<c:forEach var="mjonMsgSentList" items="${mjonMsgSentList2}" varStatus="status">
 												<tr>
 													<td><c:out value="${status.count}"/></td>

 										</c:when>
 										<c:otherwise>
 											<tr>
-												<td colspan="9">문자 발송 내역이 없습니다.</td>
+												<td colspan="9">예약 문자 내역이 없습니다.</td>
 											</tr>
 										</c:otherwise>
 									</c:choose>

 									</c:when>
 									<c:otherwise>
 										<tr>
-											<td colspan="9">문자 발송 내역이 없습니다.</td>
+											<td colspan="9">문자 지연 내역이 없습니다.</td>
 										</tr>
 									</c:otherwise>
 								</c:choose>

Add a comment

Open 0
Closed 0

List

...	...	@@ -4659,6 +4659,19 @@
4659	4659	AND MGD.REQ_DATE > now()
4660	4660	AND MGD.RESERVE_YN = 'Y'
4661	4661	]]>
	4662	+ /*30분 지연이 아니거나 지연 처리가 완료된 건들 불러오기/
	4663	+ AND
	4664	+ (
	4665	+ (
	4666	+ MGD.DELAY_YN = 'N'
	4667	+ AND MGD.DELAY_COMPLETE_YN = 'N'
	4668	+ )
	4669	+ OR
	4670	+ (
	4671	+ MGD.DELAY_YN = 'Y'
	4672	+ AND MGD.DELAY_COMPLETE_YN = 'Y'
	4673	+ )
	4674	+ )
4662	4675	</isEqual>
4663	4676	</isNotEmpty>
4664	4677

...	...	@@ -3516,7 +3516,7 @@
3516	3516	</thead>
3517	3517	<tbody>
3518	3518	<c:choose>
3519		- <c:when test="${not empty mjonMsgSentList}">
	3519	+ <c:when test="${not empty mjonMsgSentList2}">
3520	3520	<c:forEach var="mjonMsgSentList" items="${mjonMsgSentList2}" varStatus="status">
3521	3521	<tr>
3522	3522	<td><c:out value="${status.count}"/></td>
...	...	@@ -3664,7 +3664,7 @@
3664	3664	</c:when>
3665	3665	<c:otherwise>
3666	3666	<tr>
3667		- <td colspan="9">문자 발송 내역이 없습니다.</td>
	3667	+ <td colspan="9">예약 문자 내역이 없습니다.</td>
3668	3668	</tr>
3669	3669	</c:otherwise>
3670	3670	</c:choose>
...	...	@@ -3868,7 +3868,7 @@
3868	3868	</c:when>
3869	3869	<c:otherwise>
3870	3870	<tr>
3871		- <td colspan="9">문자 발송 내역이 없습니다.</td>
	3871	+ <td colspan="9">문자 지연 내역이 없습니다.</td>
3872	3872	</tr>
3873	3873	</c:otherwise>
3874	3874	</c:choose>

Delete comment