From adea7e1993f61292370e256f8d5ef4ca33201a1a Mon Sep 17 00:00:00 2001 From: ijunho Date: Wed, 9 Apr 2025 10:13:37 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AC=B8=EC=9E=90=EC=98=A8=20=EC=95=8C?= =?UTF-8?q?=EB=A6=BC=ED=86=A1=20=EB=B0=9C=EC=86=A1=EA=B2=B0=EA=B3=BC=20?= =?UTF-8?q?=EC=88=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itn/let/kakao/user/sent/web/KakaoSentController.java | 2 +- .../sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml | 6 ++++-- .../WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp | 9 ++++++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java b/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java index 39dddf44..ef4ff662 100644 --- a/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java +++ b/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java @@ -132,7 +132,7 @@ public class KakaoSentController { endDate = format.format(cal.getTime()); //시작일은 전날로 셋팅 - cal.add(Calendar.DATE, -1); + cal.add(Calendar.DATE, -90); startDate = format.format(cal.getTime()); kakaoSentVO.setStartDate(startDate); diff --git a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml index 07788c08..e7880b70 100644 --- a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml @@ -1384,7 +1384,8 @@ t1.atDelayCompleteYn, t1.msgNoticetalkSenderKey, t1.bizKakaoResendYn, - t1.atDelayOrgTime + t1.atDelayOrgTime, + t1.divideYN FROM ( SELECT COUNT(B.USER_ID) OVER() AS totMsgCnt, B.USER_ID AS userId , @@ -1420,7 +1421,8 @@ B.AT_DELAY_COMPLETE_YN AS atDelayCompleteYn, A.MSG_NOTICETALK_SENDER_KEY AS msgNoticetalkSenderKey, 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 JOIN MJ_MSG_GROUP_DATA B ON A.MSG_GROUP_ID = B.MSG_GROUP_ID diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp index c9493122..ca73f3bf 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp @@ -185,7 +185,14 @@ function fn_sentDetailView(msgGroupId) { - disabled> + + + + + + + +