From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/report/ReportUserQuestionAnswerValueServiceDaoImplMapper.xml | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportUserQuestionAnswerValueServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportUserQuestionAnswerValueServiceDaoImplMapper.xml
index 679708d..a79f715 100644
--- a/java110-db/src/main/resources/mapper/report/ReportUserQuestionAnswerValueServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportUserQuestionAnswerValueServiceDaoImplMapper.xml
@@ -30,6 +30,12 @@
<if test="objId !=null and objId != ''">
and t.obj_id= #{objId}
</if>
+ <if test="objIds !=null">
+ and t.obj_id in
+ <foreach collection="objIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="userQaId !=null and userQaId != ''">
and t.user_qa_id= #{userQaId}
</if>
@@ -50,6 +56,15 @@
</if>
<if test="qaId !=null and qaId != ''">
and t.qa_id= #{qaId}
+ </if>
+ <if test="qaType !=null and qaType != ''">
+ and qa.qa_type= #{qaType}
+ </if>
+ <if test="startTime != null and startTime != ''">
+ and t.create_time > #{startTime}
+ </if>
+ <if test="endTime != null and endTime != ''">
+ and t.create_time < #{endTime}
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
@@ -84,6 +99,12 @@
<if test="objId !=null and objId != ''">
and t.obj_id= #{objId}
</if>
+ <if test="objIds !=null">
+ and t.obj_id in
+ <foreach collection="objIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="userQaId !=null and userQaId != ''">
and t.user_qa_id= #{userQaId}
</if>
@@ -102,6 +123,15 @@
<if test="userTitleId !=null and userTitleId != ''">
and t.user_title_id= #{userTitleId}
</if>
+ <if test="qaType !=null and qaType != ''">
+ and qa.qa_type= #{qaType}
+ </if>
+ <if test="startTime != null and startTime != ''">
+ and t.create_time > #{startTime}
+ </if>
+ <if test="endTime != null and endTime != ''">
+ and t.create_time < #{endTime}
+ </if>
<if test="qaId !=null and qaId != ''">
and t.qa_id= #{qaId}
</if>
--
Gitblit v1.8.0