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/PrizeRecordMapper.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/framework/src/main/resources/mapper/lmk/PrizeRecordMapper.xml b/framework/src/main/resources/mapper/lmk/PrizeRecordMapper.xml
index bfc4500..9dda94e 100644
--- a/framework/src/main/resources/mapper/lmk/PrizeRecordMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/PrizeRecordMapper.xml
@@ -17,6 +17,7 @@
<result column="prize_num_id" property="prizeNumId" />
<result column="activity_prize_ref_id" property="activityPrizeRefId" />
<result column="distribute_status" property="distributeStatus" />
+ <result column="distribute_status" property="distributeStatus"/>
</resultMap>
@@ -60,11 +61,56 @@
LPR.prize_img,
LPR.prize_num_id,
LPR.activity_prize_ref_id,
+ LPR.distribute_status,
LPR.id
FROM
lmk_prize_record LPR
WHERE
LPR.delete_flag = 0
+ <if test="query.nickName != null and query.nickName !=''">
+ AND LPR.nick_name like CONCAT('%',#{query.nickName},'%')
+ </if>
+ <if test="query.activityName != null and query.activityName !=''">
+ AND LPR.prize_activity_name like CONCAT('%',#{query.activityName},'%')
+ </if>
+ <if test="query.prizeStatus != null and query.prizeStatus !=''">
+ AND LPR.prize_status = #{query.prizeStatus}
+ </if>
+ <if test="query.distributeStatus != null and query.distributeStatus !=''">
+ AND LPR.distribute_status = #{query.distributeStatus}
+ </if>
+ </select>
+ <select id="getExportData" resultMap="BaseResultMap">
+ SELECT
+ LPR.user_id,
+ LPR.nick_name,
+ LPR.prize_activity_id,
+ LPR.prize_activity_name,
+ LPR.prize_activity_cover,
+ LPR.prize_status,
+ LPR.prize_content,
+ LPR.prize_id,
+ LPR.prize_img,
+ LPR.prize_num_id,
+ LPR.activity_prize_ref_id,
+ LPR.distribute_status,
+ LPR.id
+ FROM
+ lmk_prize_record LPR
+ WHERE
+ LPR.delete_flag = 0
+ <if test="query.nickName != null and query.nickName !=''">
+ AND LPR.nick_name like CONCAT('%',#{query.nickName},'%')
+ </if>
+ <if test="query.activityName != null and query.activityName !=''">
+ AND LPR.prize_activity_name like CONCAT('%',#{query.activityName},'%')
+ </if>
+ <if test="query.prizeStatus != null and query.prizeStatus !=''">
+ AND LPR.prize_status = #{query.prizeStatus}
+ </if>
+ <if test="query.distributeStatus != null and query.distributeStatus !=''">
+ AND LPR.distribute_status = #{query.distributeStatus}
+ </if>
</select>
<resultMap id="getPrizeRecordListByTimeMap" type="cn.lili.modules.lmk.domain.vo.PrizeRecordTimeVO">
<result property="activityPrizeRefId" column="activity_prize_ref_id"/>
--
Gitblit v1.8.0