From 0ed29a9b6e7cdeeea5f736d5cbe196849b4f22f7 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期三, 19 七月 2023 09:40:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xinghong-dev
---
java110-db/src/main/resources/mapper/user/UserQuestionAnswerV1ServiceDaoImplMapper.xml | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/UserQuestionAnswerV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/UserQuestionAnswerV1ServiceDaoImplMapper.xml
index 50dd87c..b8edb06 100644
--- a/java110-db/src/main/resources/mapper/user/UserQuestionAnswerV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/UserQuestionAnswerV1ServiceDaoImplMapper.xml
@@ -155,8 +155,22 @@
<if test="qaId !=null and qaId != ''">
and t.qa_id= #{qaId}
</if>
-
-
+ </select>
+ <select id="queryOwnerQuestionAnswers" parameterType="Map" resultType="Map">
+ select qa.qa_name qaName,qa.qa_type qaType,qa.start_time startTime,qa.end_time endTime,qa.remark,
+ qa.community_id communityId,qa.qa_id qaId,td.`name` qaTypeName,qa.content,
+ t.owner_name ownerName,t.link,t.room_name roomName,t.user_qa_id userQaId
+ from user_question_answer t
+ left join question_answer qa on t.qa_id = qa.qa_id and qa.status_cd = '0'
+ LEFT JOIN t_dict td on td.status_cd = qa.qa_type and td.table_name = 'question_answer' and td.table_columns = 'qa_type'
+ where 1=1
+ and t.status_cd = '0'
+ and t.community_id = #{communityId}
+ and t.link = #{link}
+ and qa.qa_type = #{qaType}
+ and qa.state = 'C'
+ and qa.start_time < NOW()
+ and qa.end_time > NOW()
</select>
</mapper>
--
Gitblit v1.8.0