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

Merge branch 'wyh'

Browse Source
This commit is contained in:
wyh 2023-07-10 17:52:54 +09:00
commit 5a8a9ff2cc
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -745,9 +745,9 @@
THEN '단문' THEN '단문'
ELSE '장문' ELSE '장문'
END BIZ_KAKAO_RESEND_TYPE END BIZ_KAKAO_RESEND_TYPE
, A.BIZ_KAKAO_RESEND_DATA , A.BIZ_KAKAO_RESEND_DATA
, A.BIZ_KAKAO_JSON_FILE , A.BIZ_KAKAO_JSON_FILE
, A.BIZ_UMID , A.BIZ_UMID
<include refid="KakaoSentDAO.selectJoinQuery"/> <include refid="KakaoSentDAO.selectJoinQuery"/>
<isNotEmpty property="userId"> <isNotEmpty property="userId">
AND B.USER_ID = #userId# AND B.USER_ID = #userId#
@ -767,7 +767,12 @@
AND A.MSG_TYPE IN ('8','9') AND A.MSG_TYPE IN ('8','9')
</isEmpty> </isEmpty>
<![CDATA[ <![CDATA[
AND B.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE) AND CASE
WHEN B.RESERVE_YN = 'N'
THEN (B.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE))
WHEN B.RESERVE_YN = 'Y'
THEN (B.REQ_DATE <= NOW() OR (B.AT_DELAY_YN = 'Y' AND B.AT_DELAY_COMPLETE_YN = 'N'))
END
]]> ]]>
)M )M
LEFT JOIN MJ_KAKAO_PROFILE_INFO MKPI LEFT JOIN MJ_KAKAO_PROFILE_INFO MKPI