--- src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java
+++ src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java
... | ... | @@ -132,7 +132,7 @@ |
| 132 | 132 |
endDate = format.format(cal.getTime()); |
| 133 | 133 |
|
| 134 | 134 |
//시작일은 전날로 셋팅 |
| 135 |
- cal.add(Calendar.DATE, -1); |
|
| 135 |
+ cal.add(Calendar.DATE, -90); |
|
| 136 | 136 |
startDate = format.format(cal.getTime()); |
| 137 | 137 |
|
| 138 | 138 |
kakaoSentVO.setStartDate(startDate); |
--- src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml
... | ... | @@ -1384,7 +1384,8 @@ |
| 1384 | 1384 |
t1.atDelayCompleteYn, |
| 1385 | 1385 |
t1.msgNoticetalkSenderKey, |
| 1386 | 1386 |
t1.bizKakaoResendYn, |
| 1387 |
- t1.atDelayOrgTime |
|
| 1387 |
+ t1.atDelayOrgTime, |
|
| 1388 |
+ t1.divideYN |
|
| 1388 | 1389 |
FROM ( |
| 1389 | 1390 |
SELECT COUNT(B.USER_ID) OVER() AS totMsgCnt, |
| 1390 | 1391 |
B.USER_ID AS userId , |
... | ... | @@ -1420,7 +1421,8 @@ |
| 1420 | 1421 |
B.AT_DELAY_COMPLETE_YN AS atDelayCompleteYn, |
| 1421 | 1422 |
A.MSG_NOTICETALK_SENDER_KEY AS msgNoticetalkSenderKey, |
| 1422 | 1423 |
A.BIZ_KAKAO_RESEND_YN AS bizKakaoResendYn, |
| 1423 |
- IF(B.AT_DELAY_YN = 'Y' and B.AT_DELAY_COMPLETE_YN = 'N', DATE_ADD(B.REQ_DATE, INTERVAL -30 MINUTE), B.REQ_DATE) AS atDelayOrgTime |
|
| 1424 |
+ IF(B.AT_DELAY_YN = 'Y' and B.AT_DELAY_COMPLETE_YN = 'N', DATE_ADD(B.REQ_DATE, INTERVAL -30 MINUTE), B.REQ_DATE) AS atDelayOrgTime, |
|
| 1425 |
+ CASE WHEN COUNT(DISTINCT A.REQ_DATE) > 1 THEN 'Y' ELSE 'N' END AS divideYN |
|
| 1424 | 1426 |
FROM MJ_MSG_DATA A |
| 1425 | 1427 |
JOIN MJ_MSG_GROUP_DATA B |
| 1426 | 1428 |
ON A.MSG_GROUP_ID = B.MSG_GROUP_ID |
--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp
... | ... | @@ -185,7 +185,14 @@ |
| 185 | 185 |
<tr> |
| 186 | 186 |
<td> |
| 187 | 187 |
<label for="msgSentDel${status.count}" class="label">선택</label>
|
| 188 |
- <input type="checkbox" id="msgSentDel${status.count}" name="msgSentDel" value="${resultAllSentList.msgGroupId}" <c:if test="${resultAllSentList.curState eq '0'}">disabled</c:if>>
|
|
| 188 |
+ <c:choose> |
|
| 189 |
+ <c:when test="${resultAllSentList.statusCd eq '03' or resultAllSentList.statusCd eq '01'}">
|
|
| 190 |
+ <input type="checkbox" disabled> |
|
| 191 |
+ </c:when> |
|
| 192 |
+ <c:otherwise> |
|
| 193 |
+ <input type="checkbox" id="msgSentDel${status.count}" name="msgSentDel" value="${resultAllSentList.msgGroupId}" >
|
|
| 194 |
+ </c:otherwise> |
|
| 195 |
+ </c:choose> |
|
| 189 | 196 |
</td> |
| 190 | 197 |
<td> |
| 191 | 198 |
<c:choose> |
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?