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/user/QuestionAnswerServiceDaoImplMapper.xml | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/QuestionAnswerServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/QuestionAnswerServiceDaoImplMapper.xml
index dbad180..674b1eb 100755
--- a/java110-db/src/main/resources/mapper/user/QuestionAnswerServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/QuestionAnswerServiceDaoImplMapper.xml
@@ -5,15 +5,16 @@
<!-- 淇濆瓨绛斿嵎淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveQuestionAnswerInfo" parameterType="Map">
- insert into question_answer(qa_name, qa_type, start_time, end_time, remark, obj_type, obj_id, qa_id)
- values (#{qaName}, #{qaType}, #{startTime}, #{endTime}, #{remark}, #{objType}, #{objId}, #{qaId})
+ insert into question_answer(qa_name, qa_type, start_time, end_time, remark, obj_type, obj_id, qa_id, content)
+ values (#{qaName}, #{qaType}, #{startTime}, #{endTime}, #{remark}, #{objType}, #{objId}, #{qaId}, #{content})
</insert>
<!-- 鏌ヨ绛斿嵎淇℃伅 add by wuxw 2018-07-03 -->
<select id="getQuestionAnswerInfo" parameterType="Map" resultType="Map">
select t.qa_name,t.qa_name qaName,t.qa_type,t.qa_type qaType,t.status_cd,t.status_cd
statusCd,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,t.remark,
- t.obj_type,t.obj_type objType,t.obj_id,t.obj_id objId,t.qa_id,t.qa_id qaId,td.`name` qaTypeName
+ t.obj_type,t.obj_type objType,t.obj_id,t.obj_id objId,t.qa_id,t.qa_id qaId,td.`name` qaTypeName,
+ t.content
<if test="userId !=null and userId != ''">
,uqa.person_id userId
</if>
@@ -42,6 +43,9 @@
</if>
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
+ </if>
+ <if test="content != null and content != ''">
+ and t.content= #{content}
</if>
<if test="objType !=null and objType != ''">
and t.obj_type= #{objType}
@@ -85,6 +89,9 @@
<if test="remark !=null and remark != ''">
, t.remark= #{remark}
</if>
+ <if test="content != null and content != ''">
+ , t.content= #{content}
+ </if>
<if test="objType !=null and objType != ''">
, t.obj_type= #{objType}
</if>
@@ -120,6 +127,9 @@
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
</if>
+ <if test="content != null and content != ''">
+ and t.content= #{content}
+ </if>
<if test="objType !=null and objType != ''">
and t.obj_type= #{objType}
</if>
@@ -136,5 +146,4 @@
and t.qa_id= #{qaId}
</if>
</select>
-
</mapper>
--
Gitblit v1.8.0