rosewiper
2024-09-04
사용자 발송결과, 예약발송결과 화면 30분 딜레이시 발송시간을 30분 추가 되지 않은 시간으로 표시 되도록 변경
@d3232e2ceb3f60792c16faca8ead86dd01546288
--- src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java
+++ src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java
... | ... | @@ -73,6 +73,7 @@ |
| 73 | 73 |
private String msgKind; //문자종류(일반:N, 광고:A , 선거:C, 관리자:S, 이벤트:E) |
| 74 | 74 |
private String delayYn; //지연 문자 유무 |
| 75 | 75 |
private String delayCompleteYn; //지연문자 처리 완료 여부 |
| 76 |
+ private Date delayOrgTime; //30분 딜레이된 발송시간에서 -30분 처리하여 원래 보내려던 발송시간 처리 |
|
| 76 | 77 |
|
| 77 | 78 |
private String msgId; //문자아이디 |
| 78 | 79 |
private String atchFiles; // 그림문자 파일정보 |
... | ... | @@ -473,5 +474,11 @@ |
| 473 | 474 |
public void setResultWFValue(String resultWFValue) {
|
| 474 | 475 |
this.resultWFValue = resultWFValue; |
| 475 | 476 |
} |
| 477 |
+ public Date getDelayOrgTime() {
|
|
| 478 |
+ return delayOrgTime; |
|
| 479 |
+ } |
|
| 480 |
+ public void setDelayOrgTime(Date delayOrgTime) {
|
|
| 481 |
+ this.delayOrgTime = delayOrgTime; |
|
| 482 |
+ } |
|
| 476 | 483 |
|
| 477 | 484 |
} |
--- src/main/java/itn/let/mjo/reservmsg/service/MjonResvMsgVO.java
+++ src/main/java/itn/let/mjo/reservmsg/service/MjonResvMsgVO.java
... | ... | @@ -64,6 +64,8 @@ |
| 64 | 64 |
private String delayYn; //30분 딜레이 유무 |
| 65 | 65 |
private String delayCompleteYn; //30분 딜레이 문자 처리 완료 유무 |
| 66 | 66 |
|
| 67 |
+ private Date delayOrgTime; //30분 딜레이된 발송시간에서 -30분 처리하여 원래 보내려던 발송시간 처리 |
|
| 68 |
+ |
|
| 67 | 69 |
public String getCallFromComma() {
|
| 68 | 70 |
return callFromComma; |
| 69 | 71 |
} |
... | ... | @@ -334,6 +336,13 @@ |
| 334 | 336 |
public void setDelayCompleteYn(String delayCompleteYn) {
|
| 335 | 337 |
this.delayCompleteYn = delayCompleteYn; |
| 336 | 338 |
} |
| 339 |
+ public Date getDelayOrgTime() {
|
|
| 340 |
+ return delayOrgTime; |
|
| 341 |
+ } |
|
| 342 |
+ public void setDelayOrgTime(Date delayOrgTime) {
|
|
| 343 |
+ this.delayOrgTime = delayOrgTime; |
|
| 344 |
+ } |
|
| 345 |
+ |
|
| 337 | 346 |
|
| 338 | 347 |
|
| 339 | 348 |
|
--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml
... | ... | @@ -202,6 +202,7 @@ |
| 202 | 202 |
M2.subject, |
| 203 | 203 |
M2.regdate, |
| 204 | 204 |
M2.reqdate, |
| 205 |
+ IF(delayYn = 'Y' and delayCompleteYn = 'N', DATE_ADD(M2.reqdate, INTERVAL -30 MINUTE), M2.reqdate) AS delayOrgTime, |
|
| 205 | 206 |
M2.diffMin, |
| 206 | 207 |
M2.callFrom, |
| 207 | 208 |
FN_GETHYPHEN(M2.callFrom) AS callFromComma, |
--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
... | ... | @@ -233,6 +233,7 @@ |
| 233 | 233 |
, M2.subject |
| 234 | 234 |
, M2.regdate |
| 235 | 235 |
, M2.reqdate |
| 236 |
+ , IF(delayYn = 'Y' and delayCompleteYn = 'N', DATE_ADD(M2.reqdate, INTERVAL -30 MINUTE), M2.reqdate) AS delayOrgTime |
|
| 236 | 237 |
, M2.callFrom |
| 237 | 238 |
, M2.callTo |
| 238 | 239 |
, FN_GETHYPHEN(M2.callFrom) AS callFromComma |
... | ... | @@ -628,6 +629,7 @@ |
| 628 | 629 |
, M2.subject |
| 629 | 630 |
, M2.regdate |
| 630 | 631 |
, M2.reqdate |
| 632 |
+ , IF(delayYn = 'Y' and delayCompleteYn = 'N', DATE_ADD(M2.reqdate, INTERVAL -30 MINUTE), M2.reqdate) AS delayOrgTime |
|
| 631 | 633 |
, M2.callFrom |
| 632 | 634 |
, M2.callTo |
| 633 | 635 |
, FN_GETHYPHEN(M2.callFrom) AS callFromComma |
... | ... | @@ -647,6 +649,8 @@ |
| 647 | 649 |
, M2.msgId |
| 648 | 650 |
, M2.msgResult |
| 649 | 651 |
, M2.sendKind |
| 652 |
+ , M2.delayYn |
|
| 653 |
+ , M2.delayCompleteYn |
|
| 650 | 654 |
FROM |
| 651 | 655 |
( |
| 652 | 656 |
SELECT |
... | ... | @@ -667,6 +671,8 @@ |
| 667 | 671 |
, CUR_STATE AS curState |
| 668 | 672 |
, RSLT_CODE AS rsltCode |
| 669 | 673 |
, RSLT_CODE2 AS rsltCode2 |
| 674 |
+ , DELAY_YN AS delayYn |
|
| 675 |
+ , DELAY_COMPLETE_YN AS delayCompleteYn |
|
| 670 | 676 |
, IF( (RSLT_CODE != '0' |
| 671 | 677 |
AND RSLT_CODE != '100' |
| 672 | 678 |
AND RSLT_CODE != '101' |
... | ... | @@ -713,6 +719,8 @@ |
| 713 | 719 |
, MD.CUR_STATE |
| 714 | 720 |
, MD.RSLT_CODE |
| 715 | 721 |
, MD.RSLT_CODE2 |
| 722 |
+ , MGD.DELAY_YN |
|
| 723 |
+ , MGD.DELAY_COMPLETE_YN |
|
| 716 | 724 |
, MGD.SEND_KIND AS sendKind |
| 717 | 725 |
,(<include refid="MjonMsgSentDAO.selectAgentResultQuery_MD"/>) AS RESULT |
| 718 | 726 |
FROM |
--- src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
... | ... | @@ -173,7 +173,15 @@ |
| 173 | 173 |
|
| 174 | 174 |
</td> |
| 175 | 175 |
<td name="listTd"> |
| 176 |
- <p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.reqdate}" /></p>
|
|
| 176 |
+ <c:choose> |
|
| 177 |
+ <c:when test="${resultAllSentList.delayYn eq 'Y' && resultAllSentList.delayCompleteYn eq 'N'}">
|
|
| 178 |
+ <%-- 30분 딜레이 된 건으로 관리자 승인/취소 처리가 완료 되지 않은 건에 대해서 -30분 처리하여 원래 사용자가 보내려던 시간을 표시해줌 --%> |
|
| 179 |
+ <p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.delayOrgTime}" /></p>
|
|
| 180 |
+ </c:when> |
|
| 181 |
+ <c:otherwise> |
|
| 182 |
+ <p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.reqdate}" /></p>
|
|
| 183 |
+ </c:otherwise> |
|
| 184 |
+ </c:choose> |
|
| 177 | 185 |
</td> |
| 178 | 186 |
<td name="listTd"> |
| 179 | 187 |
<p> |
--- src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentCompleteListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentCompleteListAjax.jsp
... | ... | @@ -152,7 +152,15 @@ |
| 152 | 152 |
|
| 153 | 153 |
</td> |
| 154 | 154 |
<td> |
| 155 |
- <p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.reqdate}" /></p>
|
|
| 155 |
+ <c:choose> |
|
| 156 |
+ <c:when test="${resultAllSentList.delayYn eq 'Y' && resultAllSentList.delayCompleteYn eq 'N'}">
|
|
| 157 |
+ <%-- 30분 딜레이 된 건으로 관리자 승인/취소 처리가 완료 되지 않은 건에 대해서 -30분 처리하여 원래 사용자가 보내려던 시간을 표시해줌 --%> |
|
| 158 |
+ <p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.delayOrgTime}" /></p>
|
|
| 159 |
+ </c:when> |
|
| 160 |
+ <c:otherwise> |
|
| 161 |
+ <p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.reqdate}" /></p>
|
|
| 162 |
+ </c:otherwise> |
|
| 163 |
+ </c:choose> |
|
| 156 | 164 |
</td> |
| 157 | 165 |
<td> |
| 158 | 166 |
<p> |
--- src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp
... | ... | @@ -140,7 +140,15 @@ |
| 140 | 140 |
|
| 141 | 141 |
</td> |
| 142 | 142 |
<td> |
| 143 |
- <p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.reqdate}" /></p>
|
|
| 143 |
+ <c:choose> |
|
| 144 |
+ <c:when test="${resultAllSentList.delayYn eq 'Y' && resultAllSentList.delayCompleteYn eq 'N'}">
|
|
| 145 |
+ <%-- 30분 딜레이 된 건으로 관리자 승인/취소 처리가 완료 되지 않은 건에 대해서 -30분 처리하여 원래 사용자가 보내려던 시간을 표시해줌 --%> |
|
| 146 |
+ <p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.delayOrgTime}" /></p>
|
|
| 147 |
+ </c:when> |
|
| 148 |
+ <c:otherwise> |
|
| 149 |
+ <p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.reqdate}" /></p>
|
|
| 150 |
+ </c:otherwise> |
|
| 151 |
+ </c:choose> |
|
| 144 | 152 |
</td> |
| 145 | 153 |
<td> |
| 146 | 154 |
<p> |
--- src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp
... | ... | @@ -152,7 +152,15 @@ |
| 152 | 152 |
|
| 153 | 153 |
</td> |
| 154 | 154 |
<td> |
| 155 |
- <p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.regdate}" /></p>
|
|
| 155 |
+ <c:choose> |
|
| 156 |
+ <c:when test="${resultAllSentList.delayYn eq 'Y' && resultAllSentList.delayCompleteYn eq 'N'}">
|
|
| 157 |
+ <%-- 30분 딜레이 된 건으로 관리자 승인/취소 처리가 완료 되지 않은 건에 대해서 -30분 처리하여 원래 사용자가 보내려던 시간을 표시해줌 --%> |
|
| 158 |
+ <p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.delayOrgTime}" /></p>
|
|
| 159 |
+ </c:when> |
|
| 160 |
+ <c:otherwise> |
|
| 161 |
+ <p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.regdate}" /></p>
|
|
| 162 |
+ </c:otherwise> |
|
| 163 |
+ </c:choose> |
|
| 156 | 164 |
</td> |
| 157 | 165 |
<td> |
| 158 | 166 |
<p> |
--- src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgAllListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgAllListAjax.jsp
... | ... | @@ -202,7 +202,16 @@ |
| 202 | 202 |
<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllResList.regdate}" /></p>
|
| 203 | 203 |
</td> |
| 204 | 204 |
<td> |
| 205 |
- <p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllResList.reqdate}" /></p>
|
|
| 205 |
+ <c:choose> |
|
| 206 |
+ <c:when test="${resultAllResList.delayYn eq 'Y' && resultAllResList.delayCompleteYn eq 'N'}">
|
|
| 207 |
+ <%-- 30분 딜레이 된 건으로 관리자 승인/취소 처리가 완료 되지 않은 건에 대해서 -30분 처리하여 원래 사용자가 보내려던 시간을 표시해줌 --%> |
|
| 208 |
+ <p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllResList.delayOrgTime}" /></p>
|
|
| 209 |
+ </c:when> |
|
| 210 |
+ <c:otherwise> |
|
| 211 |
+ <p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllResList.reqdate}" /></p>
|
|
| 212 |
+ </c:otherwise> |
|
| 213 |
+ </c:choose> |
|
| 214 |
+ |
|
| 206 | 215 |
</td> |
| 207 | 216 |
<td> |
| 208 | 217 |
<p> |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?