From afda84e68de9fb078ef5a5c9fcf794bde579d2ce Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Sun, 27 Apr 2025 16:54:36 +0800
Subject: [PATCH] fix(votesActivity): 修复富文本编辑器内容字段错误
---
src/main/resources/mapper/modules/HappyActivityOptionMapper.xml | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml b/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
index 5a464a5..767b05a 100644
--- a/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
+++ b/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
@@ -11,7 +11,7 @@
a.type,
a.name,
a.state,
- a.join_cnt,
+ (select count(z.id) from happy_follow z where z.source_id = a.id) as join_cnt,
a.start_time,
a.end_time
from happy_activity a
@@ -30,7 +30,13 @@
</if>
</if>
</where>
- order by a.order_cnt asc, a.id desc
+ <if test="record.hotState != null">
+ order by (select count(y.id) from happy_follow y where y.source_id = a.id and type in (2,3)) desc,a.order_cnt asc
+ </if>
+ <if test="record.hotState == null">
+ order by a.order_cnt asc,a.id desc
+ </if>
+
</select>
<select id="getVoteRecordInPage" resultType="cc.mrbird.febs.mall.vo.ApiVoteRecordInPageVo">
@@ -49,9 +55,15 @@
update happy_activity_option set likes_cnt = likes_cnt + 1 where id = #{id}
</update>
+
+ <update id="updateHappyActivitySurplusCnt" >
+ update happy_activity set surplus_cnt = likes_cnt + #{cnt} where id = #{id}
+ </update>
+
<select id="getVoteOptionInPage" resultType="cc.mrbird.febs.mall.vo.ApiActivityOptionListVo">
select
a.id as id,
+ a.order_cnt as orderCnt,
a.option_name as optionName,
a.image as image,
a.likes_cnt as likesCnt
@@ -63,7 +75,7 @@
<if test="record != null">
<if test="record.query != null and record.query != ''">
and (
- a.name like CONCAT('%', CONCAT(#{record.query}, '%'))
+ a.option_name like CONCAT('%', CONCAT(#{record.query}, '%'))
or
a.order_cnt = #{record.query}
)
@@ -114,7 +126,7 @@
<if test="record != null">
<if test="record.query != null and record.query != ''">
and (
- a.name like CONCAT('%', CONCAT(#{record.query}, '%'))
+ a.option_name like CONCAT('%', CONCAT(#{record.query}, '%'))
or
a.order_cnt = #{record.query}
)
--
Gitblit v1.9.1