Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/mjon_advc/mjon_admin

src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml

@@ -523,10 +523,10 @@
 			</isNotEmpty>
 			
 			<isNotEmpty property="ntceBgnde">
-				AND <![CDATA[ DATE_FORMAT(A.REQ_DATE, '%Y-%m-%d')  >=   #ntceBgnde# ]]>
+				AND <![CDATA[ A.REQ_DATE  >=   #ntceBgnde# ]]>
 			</isNotEmpty>
 			<isNotEmpty property="ntceEndde">
-				AND <![CDATA[ DATE_FORMAT(A.REQ_DATE, '%Y-%m-%d')  <=   #ntceEndde# ]]>
+				AND <![CDATA[ A.REQ_DATE  <=   #ntceEndde# ]]>
 			</isNotEmpty>
 					
 			<isNotEmpty property="reserveYn">
@@ -1005,7 +1005,7 @@
 		WHERE 1=1
 		AND A.MSG_TYPE IN (4, 6)
  		<![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 (
 				SELECT M2.USER_ID
 				FROM (
@@ -6435,10 +6435,10 @@
 		                 ON      mgd.MSG_TYPE = mgt.CODE
 		         WHERE  1                       =1
 		         <isNotEmpty property="ntceBgnde">
-					AND <![CDATA[ DATE_FORMAT(mgd.REQ_DATE, '%Y-%m-%d')  >=   #ntceBgnde# ]]>
+					AND <![CDATA[ mgd.REQ_DATE  >=   #ntceBgnde# ]]>
 				 </isNotEmpty>
 				 <isNotEmpty property="ntceEndde">
-					AND <![CDATA[ DATE_FORMAT(mgd.REQ_DATE, '%Y-%m-%d')  <=   #ntceEndde# ]]>
+					AND <![CDATA[ mgd.REQ_DATE  <=   #ntceEndde# ]]>
 				 </isNotEmpty>
 		         AND    mgd.USER_ID = 'system'
 		         )

src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml

@@ -285,6 +285,16 @@
 			INNER JOIN LETTNGNRLMBER LM
 			ON A.USER_ID = LM.MBER_ID						
 		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 '문자 실패로%'
 			/**SMS 문자 발송, 환불처리, 맞춤문자 신청, 문자 실패 환불에 따른 금액 처리는 제외하고 리스트를 보여줌*/
 		<isNotEmpty property="searchKeyword">
@@ -308,16 +318,6 @@
 		<isNotEmpty property="searchCondition2">
 			AND DEL_FLAG = #searchCondition2#
 		</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
 		<isNotEmpty property="searchSortCnd">
 			,$searchSortCnd$

src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMenuManage_SQL_Mysql.xml

@@ -265,6 +265,7 @@
             	, EMPLYR_ID = #emplyrId#
             </isNotEmpty>
 			, MENU_NO = #menuNo#
+			, LAST_UPDT_PNTTM = now()
 			WHERE MENU_NO=#tmp_Id#
 			
 	</update>