From 18d1f4bc4f4f77c8883702a00896dd99469db648 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 25 八月 2023 16:06:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/user/QuestionAnswerV1ServiceDaoImplMapper.xml |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/user/QuestionAnswerV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/QuestionAnswerV1ServiceDaoImplMapper.xml
index d752532..a9d4e6e 100644
--- a/java110-db/src/main/resources/mapper/user/QuestionAnswerV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/QuestionAnswerV1ServiceDaoImplMapper.xml
@@ -19,10 +19,9 @@
     <select id="getQuestionAnswerInfo" parameterType="Map" resultType="Map">
         select t.qa_name,t.qa_name qaName,t.qa_type,t.qa_type qaType,t.start_time,t.start_time
         startTime,t.remark,t.status_cd,t.status_cd statusCd,t.end_time,t.end_time endTime,t.community_id,t.community_id
-        communityId,t.content,t.qa_id,t.qa_id qaId,t.create_time createTime,t.state,count(uqa1.user_qa_id) voteCount,count(uqa2.user_qa_id) votedCount
+        communityId,t.content,t.qa_id,t.qa_id qaId,t.create_time createTime,t.state,count(uqa1.user_qa_id) voteCount
         from question_answer t
         left join user_question_answer uqa1 on t.qa_id = uqa1.qa_id and uqa1.status_cd = '0'
-        left join user_question_answer uqa2 on t.qa_id = uqa2.qa_id and uqa2.status_cd = '0' and uqa2.state = '1202'
         where 1 =1
         <if test="qaName !=null and qaName != ''">
             and t.qa_name= #{qaName}
@@ -139,4 +138,16 @@
 
     </select>
 
+
+    <select id="queryVotedCountAndScore" parameterType="Map" resultType="Map">
+        select qa_id qaId, count(1) votedCount,SUM(t.score) score
+        from user_question_answer t
+        where
+        t.state = '1202'
+        and t.qa_id in
+        <foreach collection="qaIds" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        GROUP BY qa_id
+    </select>
 </mapper>

--
Gitblit v1.8.0