From b0bebe6cf83eb5724e0d257bfc5583c45e8ef725 Mon Sep 17 00:00:00 2001
From: rosewiper <rosehips@iten.co.kr>
Date: Tue, 13 May 2025 17:10:26 +0900
Subject: [PATCH] =?UTF-8?q?=ED=9A=8C=EC=9B=90=20=EC=83=81=EC=84=B8=20?=
 =?UTF-8?q?=ED=8C=9D=EC=97=85=20=EB=B3=B4=EC=9C=A0=EC=BA=90=EC=8B=9C=20?=
 =?UTF-8?q?=EC=9E=94=EC=95=A1=20=EC=A1=B0=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20=20=20-=20=EB=AC=B8?=
 =?UTF-8?q?=EC=9E=90/=EC=95=8C=EB=A6=BC=ED=86=A1=20=EB=B0=9C=EC=86=A1?=
 =?UTF-8?q?=EC=8B=9C=20=EC=B5=9C=EC=B4=88=20=EC=82=AC=EC=9A=A9=20=EA=B8=88?=
 =?UTF-8?q?=EC=95=A1=20=EB=B0=8F=20=ED=99=98=EB=B6=88=EA=B8=88=EC=95=A1?=
 =?UTF-8?q?=EC=97=90=20=EB=8C=80=ED=95=9C=20=ED=95=A9=EC=82=B0=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EC=B5=9C=EC=A2=85=20=EC=B0=A8=EA=B0=90=EB=90=98?=
 =?UTF-8?q?=EB=8A=94=20=EA=B8=88=EC=95=A1=EC=9C=BC=EB=A1=9C=20=ED=91=9C?=
 =?UTF-8?q?=EC=8B=9C=EB=90=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqlmap/let/pay/MjonPay_SQL_mysql.xml      | 77 ++++++++++++++++++-
 .../umt/EgovGnrlUserSelectCashDataListPop.jsp |  1 +
 2 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml
index c33da6a..3110bae 100644
--- a/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml
@@ -542,6 +542,81 @@
 
 	</select>			
 	
+	<select id="mjonPayDAO.selectMemberCashList" parameterClass="mjonPayVO" resultClass="mjonPayVO">
+	/*  문자/알림톡 발송 및 환불금액에 대해서  MSG_GROUP_ID 별 그룹으로 사용캐시를 합산함. */
+	/*  문자/알림톡발송에 사용된 CASH 이외의 금액도 함께 조회.*/
+	/*  20250513 우영두  수정  */
+	
+		<![CDATA[
+			SELECT   COUNT(CASH_ID) OVER() AS totCnt ,
+			         CASH_ID AS cashId,
+			         USER_ID AS userId,
+			         MBER_NM AS userName,
+			         cash,
+			         MEMO              AS memo,
+			         MSG_GROUP_ID      AS msgGroupId,
+			         FRST_REGIST_PNTTM AS frstRegistPnttm
+			FROM     ( SELECT  A.CASH_ID,
+			                  A.USER_ID,
+			                  B.MBER_NM,
+			                  SUM(A.CASH) AS cash ,
+			                  A.MEMO,
+			                  A.MSG_GROUP_ID,
+			                  MIN(A.FRST_REGIST_PNTTM) AS FRST_REGIST_PNTTM
+			         FROM     MJ_CASH A
+			                  LEFT OUTER JOIN LETTNGNRLMBER B
+			                  ON       A.USER_ID = B.MBER_ID
+			                  LEFT OUTER JOIN MJ_MSG_GROUP_DATA MGD
+			                  ON       A.MSG_GROUP_ID    = MGD.MSG_GROUP_ID
+			         WHERE    1                          =1
+			         AND      A.USER_ID                  = #userId#
+			         AND      MGD.MSG_GROUP_ID IS NOT NULL
+			         GROUP BY A.MSG_GROUP_ID
+			         
+			         UNION
+			         
+			         SELECT A.CASH_ID,
+			                A.USER_ID,
+			                B.MBER_NM,
+			                A.CASH AS cash ,
+			                A.MEMO,
+			                A.MSG_GROUP_ID,
+			                A.FRST_REGIST_PNTTM AS FRST_REGIST_PNTTM
+			         FROM   MJ_CASH A
+			                LEFT OUTER JOIN LETTNGNRLMBER B
+			                ON     A.USER_ID = B.MBER_ID
+			                LEFT OUTER JOIN MJ_MSG_GROUP_DATA MGD
+			                ON     A.MSG_GROUP_ID  = MGD.MSG_GROUP_ID
+			         WHERE  1                      =1
+			         AND    A.USER_ID              = #userId#
+			         AND    MGD.MSG_GROUP_ID IS NULL
+			         )
+			         D
+			         WHERE 1=1 
+			         AND D.cash < 0
+		]]> 
+	
+		<isNotEmpty prepend="AND" property="ntceBgnde">
+			<![CDATA[ 
+				DATE_FORMAT(FRST_REGIST_PNTTM, '%Y-%m-%d') >= DATE_FORMAT(#ntceBgnde#, '%Y-%m-%d')
+			]]>
+		</isNotEmpty>
+		<isNotEmpty prepend="AND" property="ntceEndde">
+			<![CDATA[ 
+				DATE_FORMAT(FRST_REGIST_PNTTM, '%Y-%m-%d') <= DATE_FORMAT(#ntceEndde#, '%Y-%m-%d')  
+			]]>
+		</isNotEmpty>
+		
+		ORDER BY 1=1
+		, FRST_REGIST_PNTTM 
+			
+			DESC
+			
+		LIMIT  #recordCountPerPage# OFFSET #firstIndex#
+	</select>
+	
+	<!-- 
+	//기존 회원상세 보유캐시잔액 조회 화면 쿼리 백업 20250513
 	<select id="mjonPayDAO.selectMemberCashList" parameterClass="mjonPayVO" resultClass="mjonPayVO">
 	<![CDATA[
 		SELECT
@@ -578,7 +653,7 @@
 			DESC
 			
 		LIMIT  #recordCountPerPage# OFFSET #firstIndex#
-	</select>
+	</select> -->
 	
 	<select id="mjonPayDAO.selectCashVO" parameterClass="mjonPayVO" resultClass="mjonPayVO">
 		SELECT 
diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectCashDataListPop.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectCashDataListPop.jsp
index 1b338e4..05f0467 100644
--- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectCashDataListPop.jsp
+++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectCashDataListPop.jsp
@@ -166,6 +166,7 @@
 								<option value='10' <c:if test="${searchVO.pageUnit == '10' or searchVO.pageUnit == ''}">selected</c:if>>10줄</option>
 								<option value='20' <c:if test="${searchVO.pageUnit == '20'}">selected</c:if>>20줄</option>
 								<option value='30' <c:if test="${searchVO.pageUnit == '30'}">selected</c:if>>30줄</option>
+								<option value='100' <c:if test="${searchVO.pageUnit == '100'}">selected</c:if>>100줄</option>
 							</select>
 						</div>
 					</div>