From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel
---
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TActivityGeneralizationMapper.xml | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 8a15dec..72a9555 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
@@ -25,7 +25,16 @@
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
+ LEFT join (SELECT
+ couponActivityId,
+ activityType,
+ COUNT(DISTINCT userId) AS count
+ FROM
+ t_user_coupon_record
+ WHERE
+ activityType = 5
+ GROUP BY
+ couponActivityId ) b
ON a.id = b.couponActivityId
WHERE a.isDelete = 1
<if test="beginTime != null and beginTime !='' and endTime != null and endTime != ''">
@@ -37,6 +46,7 @@
<if test="state != null">
and a.state=#{state}
</if>
+ order by a.insertTime desc
</select>
</mapper>
--
Gitblit v1.7.1