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

Merge branch 'master_tolag3'

Browse Source
This commit is contained in:
leejunho 2025-04-09 10:14:09 +09:00
commit e7e66cbbfb
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java
View File

@ -132,7 +132,7 @@ public class KakaoSentController {
endDate = format.format(cal.getTime()); endDate = format.format(cal.getTime());
//시작일은 전날로 셋팅 //시작일은 전날로 셋팅
cal.add(Calendar.DATE, -1); cal.add(Calendar.DATE, -90);
startDate = format.format(cal.getTime()); startDate = format.format(cal.getTime());
kakaoSentVO.setStartDate(startDate); kakaoSentVO.setStartDate(startDate);

6
src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml
View File

@ -1384,7 +1384,8 @@
t1.atDelayCompleteYn, t1.atDelayCompleteYn,
t1.msgNoticetalkSenderKey, t1.msgNoticetalkSenderKey,
t1.bizKakaoResendYn, t1.bizKakaoResendYn,
t1.atDelayOrgTime t1.atDelayOrgTime,
t1.divideYN
FROM ( FROM (
SELECT COUNT(B.USER_ID) OVER() AS totMsgCnt, SELECT COUNT(B.USER_ID) OVER() AS totMsgCnt,
B.USER_ID AS userId , B.USER_ID AS userId ,
@ -1420,7 +1421,8 @@
B.AT_DELAY_COMPLETE_YN AS atDelayCompleteYn, B.AT_DELAY_COMPLETE_YN AS atDelayCompleteYn,
A.MSG_NOTICETALK_SENDER_KEY AS msgNoticetalkSenderKey, A.MSG_NOTICETALK_SENDER_KEY AS msgNoticetalkSenderKey,
A.BIZ_KAKAO_RESEND_YN AS bizKakaoResendYn, A.BIZ_KAKAO_RESEND_YN AS bizKakaoResendYn,
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 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,
CASE WHEN COUNT(DISTINCT A.REQ_DATE) > 1 THEN 'Y' ELSE 'N' END AS divideYN
FROM MJ_MSG_DATA A FROM MJ_MSG_DATA A
JOIN MJ_MSG_GROUP_DATA B JOIN MJ_MSG_GROUP_DATA B
ON A.MSG_GROUP_ID = B.MSG_GROUP_ID ON A.MSG_GROUP_ID = B.MSG_GROUP_ID

9
src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp
View File

@ -185,7 +185,14 @@ function fn_sentDetailView(msgGroupId) {
<tr> <tr>
<td> <td>
<label for="msgSentDel${status.count}" class="label">선택</label> <label for="msgSentDel${status.count}" class="label">선택</label>
<input type="checkbox" id="msgSentDel${status.count}" name="msgSentDel" value="${resultAllSentList.msgGroupId}" <c:if test="${resultAllSentList.curState eq '0'}">disabled</c:if>> <c:choose>
<c:when test="${resultAllSentList.statusCd eq '03' or resultAllSentList.statusCd eq '01'}">
<input type="checkbox" disabled>
</c:when>
<c:otherwise>
<input type="checkbox" id="msgSentDel${status.count}" name="msgSentDel" value="${resultAllSentList.msgGroupId}" >
</c:otherwise>
</c:choose>
</td> </td>
<td> <td>
<c:choose> <c:choose>