From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/user/QuestionAnswerTitleValueServiceDaoImplMapper.xml |   44 +++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/user/QuestionAnswerTitleValueServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/QuestionAnswerTitleValueServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 5986cba..1b2a923
--- a/java110-db/src/main/resources/mapper/user/QuestionAnswerTitleValueServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/QuestionAnswerTitleValueServiceDaoImplMapper.xml
@@ -14,12 +14,11 @@
         )
     </insert>
 
-
     <!-- 鏌ヨ绛斿嵎閫夐」淇℃伅 add by wuxw 2018-07-03 -->
-    <select id="getQuestionAnswerTitleValueInfo" parameterType="Map" resultType="Map">
-        select t.value_id,t.value_id valueId,t.title_id,t.title_id titleId,t.obj_id,t.obj_id
-        objId,t.status_cd,t.status_cd statusCd,t.obj_type,t.obj_type objType,t.qa_value,t.qa_value qaValue,t.seq
+    <select id="queryQuestionAnswerTitleValueResult" parameterType="Map" resultType="Map">
+        select t.value_id valueId,t.qa_value qaValue,count(uqav.person_id) userCount
         from question_answer_title_value t
+        LEFT JOIN user_question_answer_value uqav on t.value_id = uqav.value_id and uqav.status_cd = '0'
         where 1 =1
         <if test="valueId !=null and valueId != ''">
             and t.value_id= #{valueId}
@@ -49,7 +48,42 @@
         <if test="seq !=null and seq != ''">
             and t.seq= #{seq}
         </if>
-        order by t.create_time desc
+        GROUP BY t.value_id,t.qa_value
+    </select>
+    <!-- 鏌ヨ绛斿嵎閫夐」淇℃伅 add by wuxw 2018-07-03 -->
+    <select id="getQuestionAnswerTitleValueInfo" parameterType="Map" resultType="Map">
+        select t.value_id,t.value_id valueId,t.title_id,t.title_id titleId,t.obj_id,t.obj_id
+        objId,t.status_cd,t.status_cd statusCd,t.obj_type,t.obj_type objType,t.qa_value,t.qa_value qaValue,t.seq
+        from question_answer_title_value t
+        where 1 =1
+        <if test="valueId !=null and valueId != ''">
+            and t.value_id= #{valueId}
+        </if>
+        <if test="titleId !=null and titleId != ''">
+            and t.title_id= #{titleId}
+        </if>
+        <if test="titleIds !=null">
+            and t.title_id in
+            <foreach collection="titleIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="objId !=null and objId != ''">
+            and t.obj_id= #{objId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="objType !=null and objType != ''">
+            and t.obj_type= #{objType}
+        </if>
+        <if test="qaValue !=null and qaValue != ''">
+            and t.qa_value= #{qaValue}
+        </if>
+        <if test="seq !=null and seq != ''">
+            and t.seq= #{seq}
+        </if>
+        order by t.seq
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>

--
Gitblit v1.8.0