From a44f98aefc7d6057e01da6634b6245aea59005cc Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Wed, 23 Aug 2023 14:55:44 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=BC=EB=B3=84=20=ED=9A=8C=EC=9B=90?=
 =?UTF-8?q?=EC=A0=84=ED=99=98=EB=A5=A0=20=ED=86=B5=EA=B3=84=20=EC=84=B1?=
 =?UTF-8?q?=EB=8A=A5=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../let/mjo/msg/web/MjonMsgController.java    |  3 ++-
 .../sqlmap/let/msg/MjonMsgData_SQL_mysql.xml  | 26 +++++--------------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java b/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java
index 004ccc10..fe30c976 100644
--- a/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java
+++ b/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java
@@ -4585,7 +4585,8 @@ public class MjonMsgController {
     	
     	//한달 전    
     	Calendar mon = Calendar.getInstance();    
-    	mon.add(Calendar.MONTH , -1);    
+    	//mon.add(Calendar.MONTH , -1);
+    	mon.add(Calendar.WEEK_OF_MONTH , -2);
     	String beforeMonthDay = new java.text.SimpleDateFormat("yyyy-MM-dd").format(mon.getTime());    
     	
     	if (null == mjonMsgVO.getNtceBgnde() || mjonMsgVO.getNtceBgnde().equals("")) {
diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
index 01e9624f..ad371fab 100644
--- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
@@ -5545,10 +5545,10 @@
 					SELECT COUNT(0) FROM LETTNGNRLMBER S1 
 					WHERE 1=1 
 				        <isNotEmpty property="ntceBgnde">
-						AND <![CDATA[ DATE_FORMAT(S1.APPROVAL_PNTTM, '%Y-%m-%d')  >=   #ntceBgnde# ]]>
+						AND <![CDATA[ S1.APPROVAL_PNTTM >= #ntceBgnde# ]]>
 						</isNotEmpty>
 				        <isNotEmpty property="ntceEndde">
-						AND <![CDATA[ DATE_FORMAT(S1.APPROVAL_PNTTM, '%Y-%m-%d') <= #ntceEndde# ]]>
+						AND <![CDATA[ S1.APPROVAL_PNTTM <= DATE_FORMAT(#ntceEndde# + INTERVAL 1 DAY, '%Y-%m-%d') ]]>
 						</isNotEmpty>
 						AND DATE_FORMAT(L.CREAT_DT, '%Y-%m-%d') = DATE_FORMAT(S1.APPROVAL_PNTTM, '%Y-%m-%d') 
 						AND S1.MBER_STTUS = 'Y'
@@ -5557,10 +5557,10 @@
 			WHERE 1=1 
 			AND L.DEVICE_TYPE = 'P'
 	        <isNotEmpty property="ntceBgnde">
-			AND <![CDATA[ DATE_FORMAT(L.CREAT_DT, '%Y-%m-%d')  >=   #ntceBgnde# ]]>
+			AND <![CDATA[ L.CREAT_DT >= #ntceBgnde# ]]>
 			</isNotEmpty>
 	        <isNotEmpty property="ntceEndde">
-			AND <![CDATA[ DATE_FORMAT(L.CREAT_DT, '%Y-%m-%d') <= #ntceEndde# ]]>
+			AND <![CDATA[ L.CREAT_DT <= DATE_FORMAT(#ntceEndde# + INTERVAL 1 DAY, '%Y-%m-%d') ]]>
 			</isNotEmpty>
 			AND <![CDATA[ L.CREAT_DT < DATE_FORMAT(NOW() + INTERVAL 1 DAY, '%Y-%m-%d') ]]>
 			GROUP BY DATE_FORMAT(L.CREAT_DT, '%Y-%m-%d')
@@ -5576,31 +5576,17 @@
 		FROM (
 			SELECT 
 				DATE_FORMAT(L.CREAT_DT, '%Y-%m-%d') regDate
-				, COUNT(DISTINCT L.CONECT_IP) visitCnt
-				, (
-					SELECT COUNT(0) FROM LETTNGNRLMBER S1 
-					WHERE 1=1 
-				        <isNotEmpty property="ntceBgnde">
-						AND <![CDATA[ DATE_FORMAT(S1.APPROVAL_PNTTM, '%Y-%m-%d')  >=   #ntceBgnde# ]]>
-						</isNotEmpty>
-				        <isNotEmpty property="ntceEndde">
-						AND <![CDATA[ DATE_FORMAT(S1.APPROVAL_PNTTM, '%Y-%m-%d') <= #ntceEndde# ]]>
-						</isNotEmpty>
-						AND DATE_FORMAT(L.CREAT_DT, '%Y-%m-%d') = DATE_FORMAT(S1.APPROVAL_PNTTM, '%Y-%m-%d') 
-						AND S1.MBER_STTUS = 'Y'
-				) AS memCnt			
 			FROM LETTNLOGINLOG L
 			WHERE 1=1 
 			AND L.DEVICE_TYPE = 'P'
 	        <isNotEmpty property="ntceBgnde">
-			AND <![CDATA[ DATE_FORMAT(L.CREAT_DT, '%Y-%m-%d')  >=   #ntceBgnde# ]]>
+			AND <![CDATA[ L.CREAT_DT >= #ntceBgnde# ]]>
 			</isNotEmpty>
 	        <isNotEmpty property="ntceEndde">
-			AND <![CDATA[ DATE_FORMAT(L.CREAT_DT, '%Y-%m-%d') <= #ntceEndde# ]]>
+			AND <![CDATA[ L.CREAT_DT <= DATE_FORMAT(#ntceEndde# + INTERVAL 1 DAY, '%Y-%m-%d') ]]>
 			</isNotEmpty>
 			AND <![CDATA[ L.CREAT_DT < DATE_FORMAT(NOW() + INTERVAL 1 DAY, '%Y-%m-%d') ]]>
 			GROUP BY DATE_FORMAT(L.CREAT_DT, '%Y-%m-%d')
-			ORDER BY DATE_FORMAT(L.CREAT_DT, '%Y-%m-%d') DESC
 		) M
 	</select>