From 4bd9195ff5beeb416792b50bbaea84c56a1b500b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 30 五月 2024 11:05:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TActivityGeneralizationMapper.xml | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TActivityGeneralizationMapper.xml b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TActivityGeneralizationMapper.xml
index 472d027..8a15dec 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TActivityGeneralizationMapper.xml
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TActivityGeneralizationMapper.xml
@@ -20,5 +20,23 @@
<sql id="Base_Column_List">
id, activityName, participateCount, startTime, endTime, couponId, userGrantCount, monthUseCount, useExplain, isDelete
</sql>
+ <select id="getList" resultType="java.util.Map">
+ select a.id,a.insertTime,a.activityName,CONCAT(DATE_FORMAT(a.startTime, '%Y-%m-%d')," — ",DATE_FORMAT(a.endTime, '%Y-%m-%d')) as `time`,
+ a.qrCode,
+ a.participateCount,a.state,IFNULL(b.count, 0) AS `count`
+ from t_activity_generalization a
+ LEFT join (SELECT userId,couponActivityId, activityType,COUNT(*) AS `count` FROM t_user_coupon_record where activityType = 5 GROUP BY userId) b
+ ON a.id = b.couponActivityId
+ WHERE a.isDelete = 1
+ <if test="beginTime != null and beginTime !='' and endTime != null and endTime != ''">
+ and (a.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="activityName != null and activityName !=''">
+ and a.activityName like CONCAT('%',#{activityName},'%')
+ </if>
+ <if test="state != null">
+ and a.state=#{state}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.7.1