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

Merge branch 'tolag3'

Browse Source
This commit is contained in:
leejunho 2025-05-28 15:07:13 +09:00
commit 323e68e225
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
View File

@ -523,10 +523,10 @@
</isNotEmpty> </isNotEmpty>
<isNotEmpty property="ntceBgnde"> <isNotEmpty property="ntceBgnde">
AND <![CDATA[ DATE_FORMAT(A.REQ_DATE, '%Y-%m-%d') >= #ntceBgnde# ]]> AND <![CDATA[ A.REQ_DATE >= #ntceBgnde# ]]>
</isNotEmpty> </isNotEmpty>
<isNotEmpty property="ntceEndde"> <isNotEmpty property="ntceEndde">
AND <![CDATA[ DATE_FORMAT(A.REQ_DATE, '%Y-%m-%d') <= #ntceEndde# ]]> AND <![CDATA[ A.REQ_DATE <= #ntceEndde# ]]>
</isNotEmpty> </isNotEmpty>
<isNotEmpty property="reserveYn"> <isNotEmpty property="reserveYn">
@ -1005,7 +1005,7 @@
WHERE 1=1 WHERE 1=1
AND A.MSG_TYPE IN (4, 6) AND A.MSG_TYPE IN (4, 6)
<![CDATA[ <![CDATA[
AND ABS((DATEDIFF(a.REQ_DATE, now())-1)) <= 7 AND a.REQ_DATE BETWEEN CURDATE() - INTERVAL 6 DAY AND CURDATE() + INTERVAL 8 DAY
AND A.USER_ID IN ( AND A.USER_ID IN (
SELECT M2.USER_ID SELECT M2.USER_ID
FROM ( FROM (
@ -6435,10 +6435,10 @@
ON mgd.MSG_TYPE = mgt.CODE ON mgd.MSG_TYPE = mgt.CODE
WHERE 1 =1 WHERE 1 =1
<isNotEmpty property="ntceBgnde"> <isNotEmpty property="ntceBgnde">
AND <![CDATA[ DATE_FORMAT(mgd.REQ_DATE, '%Y-%m-%d') >= #ntceBgnde# ]]> AND <![CDATA[ mgd.REQ_DATE >= #ntceBgnde# ]]>
</isNotEmpty> </isNotEmpty>
<isNotEmpty property="ntceEndde"> <isNotEmpty property="ntceEndde">
AND <![CDATA[ DATE_FORMAT(mgd.REQ_DATE, '%Y-%m-%d') <= #ntceEndde# ]]> AND <![CDATA[ mgd.REQ_DATE <= #ntceEndde# ]]>
</isNotEmpty> </isNotEmpty>
AND mgd.USER_ID = 'system' AND mgd.USER_ID = 'system'
) )

20
src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml
View File

@ -285,6 +285,16 @@
INNER JOIN LETTNGNRLMBER LM INNER JOIN LETTNGNRLMBER LM
ON A.USER_ID = LM.MBER_ID ON A.USER_ID = LM.MBER_ID
WHERE 1=1 WHERE 1=1
<isNotEmpty prepend="AND" property="searchStartDate">
<![CDATA[
A.FRST_REGIST_PNTTM >= #searchStartDate#
]]>
</isNotEmpty>
<isNotEmpty prepend="AND" property="searchEndDate">
<![CDATA[
A.FRST_REGIST_PNTTM <= #searchEndDate#
]]>
</isNotEmpty>
AND MEMO NOT LIKE '%발송' AND MEMO NOT LIKE '%환불' AND MEMO NOT LIKE '맞춤문자%' AND MEMO NOT LIKE '문자 실패로%' AND MEMO NOT LIKE '%발송' AND MEMO NOT LIKE '%환불' AND MEMO NOT LIKE '맞춤문자%' AND MEMO NOT LIKE '문자 실패로%'
/**SMS 문자 발송, 환불처리, 맞춤문자 신청, 문자 실패 환불에 따른 금액 처리는 제외하고 리스트를 보여줌*/ /**SMS 문자 발송, 환불처리, 맞춤문자 신청, 문자 실패 환불에 따른 금액 처리는 제외하고 리스트를 보여줌*/
<isNotEmpty property="searchKeyword"> <isNotEmpty property="searchKeyword">
@ -308,16 +318,6 @@
<isNotEmpty property="searchCondition2"> <isNotEmpty property="searchCondition2">
AND DEL_FLAG = #searchCondition2# AND DEL_FLAG = #searchCondition2#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend="AND" property="searchStartDate">
<![CDATA[
DATE_FORMAT(A.FRST_REGIST_PNTTM, '%Y-%m-%d') >= DATE_FORMAT(#searchStartDate#, '%Y-%m-%d')
]]>
</isNotEmpty>
<isNotEmpty prepend="AND" property="searchEndDate">
<![CDATA[
DATE_FORMAT(A.FRST_REGIST_PNTTM, '%Y-%m-%d') <= DATE_FORMAT(#searchEndDate#, '%Y-%m-%d')
]]>
</isNotEmpty>
ORDER BY 1=1 ORDER BY 1=1
<isNotEmpty property="searchSortCnd"> <isNotEmpty property="searchSortCnd">
,$searchSortCnd$ ,$searchSortCnd$