tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

사용자 발송결과, 예약발송결과 화면 30분 딜레이시 발송시간을 30분 추가 되지 않은 시간으로 표시 되도록 변경

Browse Source
This commit is contained in:
rosewiper 2024-09-04 10:16:10 +09:00
parent a580f68727
commit d3232e2ceb
9 changed files with 71 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java
View File

@ -73,6 +73,7 @@ public class MjonMsgSentVO extends UserDefaultVO{
private String msgKind; //문자종류(일반:N, 광고:A , 선거:C, 관리자:S, 이벤트:E)
private String delayYn; //지연 문자 유무
private String delayCompleteYn; //지연문자 처리 완료 여부
private Date delayOrgTime; //30분 딜레이된 발송시간에서 -30분 처리하여 원래 보내려던 발송시간 처리
private String msgId; //문자아이디
private String atchFiles; // 그림문자 파일정보
@ -473,5 +474,11 @@ public class MjonMsgSentVO extends UserDefaultVO{
public void setResultWFValue(String resultWFValue) {
this.resultWFValue = resultWFValue;
}
public Date getDelayOrgTime() {
return delayOrgTime;
}
public void setDelayOrgTime(Date delayOrgTime) {
this.delayOrgTime = delayOrgTime;
}
}

9
src/main/java/itn/let/mjo/reservmsg/service/MjonResvMsgVO.java
View File

@ -64,6 +64,8 @@ public class MjonResvMsgVO extends UserDefaultVO{
private String delayYn; //30분 딜레이 유무
private String delayCompleteYn; //30분 딜레이 문자 처리 완료 유무
private Date delayOrgTime; //30분 딜레이된 발송시간에서 -30분 처리하여 원래 보내려던 발송시간 처리
public String getCallFromComma() {
return callFromComma;
}
@ -334,6 +336,13 @@ public class MjonResvMsgVO extends UserDefaultVO{
public void setDelayCompleteYn(String delayCompleteYn) {
this.delayCompleteYn = delayCompleteYn;
}
public Date getDelayOrgTime() {
return delayOrgTime;
}
public void setDelayOrgTime(Date delayOrgTime) {
this.delayOrgTime = delayOrgTime;
}

1
src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml
View File

@ -202,6 +202,7 @@
M2.subject,
M2.regdate,
M2.reqdate,
IF(delayYn = 'Y' and delayCompleteYn = 'N', DATE_ADD(M2.reqdate, INTERVAL -30 MINUTE), M2.reqdate) AS delayOrgTime,
M2.diffMin,
M2.callFrom,
FN_GETHYPHEN(M2.callFrom) AS callFromComma,

8
src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
View File

@ -233,6 +233,7 @@
, M2.subject
, M2.regdate
, M2.reqdate
, IF(delayYn = 'Y' and delayCompleteYn = 'N', DATE_ADD(M2.reqdate, INTERVAL -30 MINUTE), M2.reqdate) AS delayOrgTime
, M2.callFrom
, M2.callTo
, FN_GETHYPHEN(M2.callFrom) AS callFromComma
@ -628,6 +629,7 @@
, M2.subject
, M2.regdate
, M2.reqdate
, IF(delayYn = 'Y' and delayCompleteYn = 'N', DATE_ADD(M2.reqdate, INTERVAL -30 MINUTE), M2.reqdate) AS delayOrgTime
, M2.callFrom
, M2.callTo
, FN_GETHYPHEN(M2.callFrom) AS callFromComma
@ -647,6 +649,8 @@
, M2.msgId
, M2.msgResult
, M2.sendKind
, M2.delayYn
, M2.delayCompleteYn
FROM
(
SELECT
@ -667,6 +671,8 @@
, CUR_STATE AS curState
, RSLT_CODE AS rsltCode
, RSLT_CODE2 AS rsltCode2
, DELAY_YN AS delayYn
, DELAY_COMPLETE_YN AS delayCompleteYn
, IF( (RSLT_CODE != '0'
AND RSLT_CODE != '100'
AND RSLT_CODE != '101'
@ -713,6 +719,8 @@
, MD.CUR_STATE
, MD.RSLT_CODE
, MD.RSLT_CODE2
, MGD.DELAY_YN
, MGD.DELAY_COMPLETE_YN
, MGD.SEND_KIND AS sendKind
,(<include refid="MjonMsgSentDAO.selectAgentResultQuery_MD"/>) AS RESULT
FROM

10
src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
View File

@ -173,7 +173,15 @@ $(document).ready(function(){
</td>
<td name="listTd">
<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.reqdate}" /></p>
<c:choose>
<c:when test="${resultAllSentList.delayYn eq 'Y' && resultAllSentList.delayCompleteYn eq 'N'}">
<%-- 30분 딜레이 된 건으로 관리자 승인/취소 처리가 완료 되지 않은 건에 대해서 -30분 처리하여 원래 사용자가 보내려던 시간을 표시해줌 --%>
<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.delayOrgTime}" /></p>
</c:when>
<c:otherwise>
<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.reqdate}" /></p>
</c:otherwise>
</c:choose>
</td>
<td name="listTd">
<p>

10
src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentCompleteListAjax.jsp
View File

@ -152,7 +152,15 @@ $(document).ready(function(){
</td>
<td>
<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.reqdate}" /></p>
<c:choose>
<c:when test="${resultAllSentList.delayYn eq 'Y' && resultAllSentList.delayCompleteYn eq 'N'}">
<%-- 30분 딜레이 된 건으로 관리자 승인/취소 처리가 완료 되지 않은 건에 대해서 -30분 처리하여 원래 사용자가 보내려던 시간을 표시해줌 --%>
<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.delayOrgTime}" /></p>
</c:when>
<c:otherwise>
<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.reqdate}" /></p>
</c:otherwise>
</c:choose>
</td>
<td>
<p>

10
src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp
View File

@ -140,7 +140,15 @@ $(document).ready(function(){
</td>
<td>
<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.reqdate}" /></p>
<c:choose>
<c:when test="${resultAllSentList.delayYn eq 'Y' && resultAllSentList.delayCompleteYn eq 'N'}">
<%-- 30분 딜레이 된 건으로 관리자 승인/취소 처리가 완료 되지 않은 건에 대해서 -30분 처리하여 원래 사용자가 보내려던 시간을 표시해줌 --%>
<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.delayOrgTime}" /></p>
</c:when>
<c:otherwise>
<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.reqdate}" /></p>
</c:otherwise>
</c:choose>
</td>
<td>
<p>

10
src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp
View File

@ -152,7 +152,15 @@ $(document).ready(function(){
</td>
<td>
<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.regdate}" /></p>
<c:choose>
<c:when test="${resultAllSentList.delayYn eq 'Y' && resultAllSentList.delayCompleteYn eq 'N'}">
<%-- 30분 딜레이 된 건으로 관리자 승인/취소 처리가 완료 되지 않은 건에 대해서 -30분 처리하여 원래 사용자가 보내려던 시간을 표시해줌 --%>
<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.delayOrgTime}" /></p>
</c:when>
<c:otherwise>
<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllSentList.regdate}" /></p>
</c:otherwise>
</c:choose>
</td>
<td>
<p>

11
src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgAllListAjax.jsp
View File

@ -202,7 +202,16 @@ $(document).ready(function(){
<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllResList.regdate}" /></p>
</td>
<td>
<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllResList.reqdate}" /></p>
<c:choose>
<c:when test="${resultAllResList.delayYn eq 'Y' && resultAllResList.delayCompleteYn eq 'N'}">
<%-- 30분 딜레이 된 건으로 관리자 승인/취소 처리가 완료 되지 않은 건에 대해서 -30분 처리하여 원래 사용자가 보내려던 시간을 표시해줌 --%>
<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllResList.delayOrgTime}" /></p>
</c:when>
<c:otherwise>
<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${resultAllResList.reqdate}" /></p>
</c:otherwise>
</c:choose>
</td>
<td>
<p>