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

이지우 - 알림톡 전송리스트 수정, 알림톡 예약리스트 수정

Browse Source
This commit is contained in:
JIWOO 2025-06-26 15:29:13 +09:00
parent 3cacf09142
commit 1c0c5b2574
3 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java
View File

@ -134,6 +134,8 @@ public class MjonKakaoATController {
} }
// resultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserList(kakaoVO); // resultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserList(kakaoVO);
/* 전송리스트, 예약리스트 구분 값 */
kakaoVO.setPageType("send");
resultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserList_advc(kakaoVO); resultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserList_advc(kakaoVO);
int totCnt = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserListCnt_advc(kakaoVO); int totCnt = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserListCnt_advc(kakaoVO);
@ -332,6 +334,8 @@ public class MjonKakaoATController {
searchVO.setNtceBgnde(beforeMonthDay); searchVO.setNtceBgnde(beforeMonthDay);
} }
/* 전송리스트, `` 구분 값 */
searchVO.setPageType("reserve");
List<KakaoVO> resultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserList_advc(searchVO); List<KakaoVO> resultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserList_advc(searchVO);
int totCnt = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserListCnt_advc(searchVO); int totCnt = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserListCnt_advc(searchVO);

68
src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml
View File

@ -2629,19 +2629,24 @@
AND MMGD.REQ_DATE < DATE_ADD(#ntceEndde#, INTERVAL 1 DAY) AND MMGD.REQ_DATE < DATE_ADD(#ntceEndde#, INTERVAL 1 DAY)
]]> ]]>
</isNotEmpty> </isNotEmpty>
<![CDATA[ <isEqual property="pageType" compareValue="send">
AND ( <![CDATA[
(MMGD.RESERVE_YN = 'N' AND (
and MMGD.REQ_DATE <= DATE_ADD(NOW(), interval 60 minute)) (MMGD.RESERVE_YN = 'N')
or OR
(MMGD.RESERVE_YN = 'Y' (MMGD.RESERVE_YN = 'Y' and MMGD.REQ_DATE <= NOW())
and ( OR
MMGD.REQ_DATE <= NOW() (MMGD.RESERVE_YN = 'Y' and MMGD.AT_DELAY_YN = 'Y' AND MMGD.AT_DELAY_COMPLETE_YN = 'N')
or (MMGD.AT_DELAY_YN = 'Y' )
and MMGD.AT_DELAY_COMPLETE_YN = 'N') ]]>
)) </isEqual>
) <isEqual property="pageType" compareValue="reserve">
]]> AND (
(MMGD.RESERVE_YN = 'Y')
AND
(MMGD.AT_DELAY_YN = 'N' or (MMGD.AT_DELAY_YN = 'Y' AND MMGD.AT_DELAY_COMPLETE_YN = 'Y'))
)
</isEqual>
<isEqual property="searchCondition2" compareValue="N"> <isEqual property="searchCondition2" compareValue="N">
AND IFNULL(MMGD.RESERVE_YN, 'N') = 'N' AND IFNULL(MMGD.RESERVE_YN, 'N') = 'N'
</isEqual> </isEqual>
@ -2666,7 +2671,11 @@
AND MMGD.SMS_TXT LIKE CONCAT ('%', #searchKeyword#,'%') AND MMGD.SMS_TXT LIKE CONCAT ('%', #searchKeyword#,'%')
</isEqual> </isEqual>
</isNotEmpty> </isNotEmpty>
ORDER BY 1=1 ORDER BY
CASE
WHEN MMGD.AT_DELAY_YN = 'Y' and MMGD.AT_DELAY_COMPLETE_YN = 'N' THEN 0
ELSE 1
END
<isNotEmpty property="searchSortCnd"> <isNotEmpty property="searchSortCnd">
<isEqual property="searchSortCnd" compareValue="curState"> <isEqual property="searchSortCnd" compareValue="curState">
, curState $searchSortOrd$ , curState $searchSortOrd$
@ -2708,19 +2717,24 @@
AND MMGD.REQ_DATE < DATE_ADD(#ntceEndde#, INTERVAL 1 DAY) AND MMGD.REQ_DATE < DATE_ADD(#ntceEndde#, INTERVAL 1 DAY)
]]> ]]>
</isNotEmpty> </isNotEmpty>
<![CDATA[ <isEqual property="pageType" compareValue="send">
AND ( <![CDATA[
(MMGD.RESERVE_YN = 'N' AND (
and MMGD.REQ_DATE <= DATE_ADD(NOW(), interval 60 minute)) (MMGD.RESERVE_YN = 'N')
or OR
(MMGD.RESERVE_YN = 'Y' (MMGD.RESERVE_YN = 'Y' and MMGD.REQ_DATE <= NOW())
and ( OR
MMGD.REQ_DATE <= NOW() (MMGD.RESERVE_YN = 'Y' and MMGD.AT_DELAY_YN = 'Y' AND MMGD.AT_DELAY_COMPLETE_YN = 'N')
or (MMGD.AT_DELAY_YN = 'Y' )
and MMGD.AT_DELAY_COMPLETE_YN = 'N') ]]>
)) </isEqual>
) <isEqual property="pageType" compareValue="reserve">
]]> AND (
(MMGD.RESERVE_YN = 'Y')
AND
(MMGD.AT_DELAY_YN = 'N' or (MMGD.AT_DELAY_YN = 'Y' AND MMGD.AT_DELAY_COMPLETE_YN = 'Y'))
)
</isEqual>
<isEqual property="searchCondition2" compareValue="N"> <isEqual property="searchCondition2" compareValue="N">
AND IFNULL(MMGD.RESERVE_YN, 'N') = 'N' AND IFNULL(MMGD.RESERVE_YN, 'N') = 'N'
</isEqual> </isEqual>

4
src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp
View File

@ -733,9 +733,9 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) {
<c:if test="${result.reserveCYn eq 'N' && result.atDelayYn eq 'Y' && result.atDelayCompleteYn eq 'N'}"> <c:if test="${result.reserveCYn eq 'N' && result.atDelayYn eq 'Y' && result.atDelayCompleteYn eq 'N'}">
<br /> <br />
<fmt:formatDate value="${now}" pattern="yyyyMMddhhmm" var="nowDate" /> <fmt:formatDate value="${now}" pattern="yyyyMMddHHmm" var="nowDate" />
<fmt:parseDate value="${result.reqDate}" pattern="yyyy-MM-dd HH:mm" var="checkValue" /> <fmt:parseDate value="${result.reqDate}" pattern="yyyy-MM-dd HH:mm" var="checkValue" />
<fmt:formatDate value="${checkValue}" pattern="yyyyMMddhhmm" var="checkDate"/> <fmt:formatDate value="${checkValue}" pattern="yyyyMMddHHmm" var="checkDate"/>
<c:if test="${nowDate < checkDate}"> <c:if test="${nowDate < checkDate}">
<button type="button" class="fillBlue" onclick="kakaoATDelaySend('<c:out value="${result.msgGroupId}"/>','<c:out value="${result.userId}"/>'); return false;">발송승인</button> <button type="button" class="fillBlue" onclick="kakaoATDelaySend('<c:out value="${result.msgGroupId}"/>','<c:out value="${result.userId}"/>'); return false;">발송승인</button>
<button type="button" class="fillRed" onclick="kakaoATDelayCancel('<c:out value="${result.msgGroupId}"/>','<c:out value="${result.userId}"/>'); return false;">발송취소</button> <button type="button" class="fillRed" onclick="kakaoATDelayCancel('<c:out value="${result.msgGroupId}"/>','<c:out value="${result.userId}"/>'); return false;">발송취소</button>