From 803a61d1d89e75f0b5d72785069b3dceb579f3ca Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 27 八月 2025 10:25:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/resources/mapper/lmk/PrizeGrantRecordMapper.xml |   37 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 36 insertions(+), 1 deletions(-)

diff --git a/framework/src/main/resources/mapper/lmk/PrizeGrantRecordMapper.xml b/framework/src/main/resources/mapper/lmk/PrizeGrantRecordMapper.xml
index b1a97a7..e9e8ace 100644
--- a/framework/src/main/resources/mapper/lmk/PrizeGrantRecordMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/PrizeGrantRecordMapper.xml
@@ -60,6 +60,41 @@
             lmk_prize_grant_record LPGR
         WHERE
             LPGR.delete_flag = 0
+        <if test="query.nickName != null and query.nickName !=''">
+            AND LPGR.nick_name like CONCAT('%',#{query.nickName},'%')
+        </if>
+        <if test="query.activityName != null and query.activityName !=''">
+            AND LPGR.activity_name like CONCAT('%',#{query.activityName},'%')
+        </if>
+        <if test="query.grantStatus != null and query.grantStatus !=''">
+            AND LPGR.grant_status  = #{query.grantStatus}
+        </if>
     </select>
-
+    <select id="getExportData" resultMap="BaseResultMap">
+        SELECT
+        LPGR.user_id,
+        LPGR.nick_name,
+        LPGR.activity_id,
+        LPGR.activity_name,
+        LPGR.prize_id,
+        LPGR.prize_name,
+        LPGR.prize_content,
+        LPGR.grant_status,
+        LPGR.prize_num_id,
+        LPGR.des,
+        LPGR.id
+        FROM
+        lmk_prize_grant_record LPGR
+        WHERE
+        LPGR.delete_flag = 0
+        <if test="query.nickName != null and query.nickName !=''">
+            AND LPGR.nick_name like CONCAT('%',#{query.nickName},'%')
+        </if>
+        <if test="query.activityName != null and query.activityName !=''">
+            AND LPGR.activity_name like CONCAT('%',#{query.activityName},'%')
+        </if>
+        <if test="query.grantStatus != null and query.grantStatus !=''">
+            AND LPGR.grant_status  = #{query.grantStatus}
+        </if>
+    </select>
 </mapper>

--
Gitblit v1.8.0