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/QuestionAnswerServiceDaoImplMapper.xml | 225 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 121 insertions(+), 104 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/QuestionAnswerServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/QuestionAnswerServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index bb56113..9214f13
--- a/java110-db/src/main/resources/mapper/user/QuestionAnswerServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/QuestionAnswerServiceDaoImplMapper.xml
@@ -5,129 +5,146 @@
<mapper namespace="questionAnswerServiceDaoImpl">
-
-
-
<!-- 淇濆瓨绛斿嵎淇℃伅 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},#{storeId},#{objType},#{objTd},#{qaId}
-)
+ qa_name,qa_type,start_time,end_time,remark,obj_type,obj_id,qa_id
+ ) values (
+ #{qaName},#{qaType},#{startTime},#{endTime},#{storeId},#{objType},#{objId},#{qaId}
+ )
</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.remark storeId,t.obj_type,t.obj_type objType,t.obj_id,t.obj_id objTd,t.qa_id,t.qa_id qaId
-from question_answer t
-where 1 =1
-<if test="qaName !=null and qaName != ''">
- and t.qa_name= #{qaName}
-</if>
-<if test="qaType !=null and qaType != ''">
- and t.qa_type= #{qaType}
-</if>
-<if test="statusCd !=null and statusCd != ''">
- and t.status_cd= #{statusCd}
-</if>
-<if test="startTime !=null and startTime != ''">
- and t.start_time= #{startTime}
-</if>
-<if test="endTime !=null and endTime != ''">
- and t.end_time= #{endTime}
-</if>
-<if test="storeId !=null and storeId != ''">
- and t.remark= #{storeId}
-</if>
-<if test="objType !=null and objType != ''">
- and t.obj_type= #{objType}
-</if>
-<if test="objTd !=null and objTd != ''">
- and t.obj_id= #{objTd}
-</if>
-<if test="qaId !=null and qaId != ''">
- and t.qa_id= #{qaId}
-</if>
-order by t.create_time desc
-<if test="page != -1 and page != null ">
- limit #{page}, #{row}
-</if>
+
+ 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
+ <if test="userId !=null and userId != ''">
+ ,uqa.person_id userId
+ </if>
+ from question_answer t
+ LEFT JOIN t_dict td on td.status_cd = t.qa_type and td.table_name = 'question_answer' and td.table_columns = 'qa_type'
+ <if test="userId !=null and userId != ''">
+ LEFT JOIN user_question_answer uqa on t.qa_id = uqa.qa_id and uqa.status_cd = '0' and uqa.person_id = #{userId}
+ </if>
+ where 1 =1
+ <if test="qaName !=null and qaName != ''">
+ and t.qa_name like concat('%',#{qaName},'%')
+ </if>
+ <if test="qaType !=null and qaType != ''">
+ and t.qa_type= #{qaType}
+ </if>
+ <if test="statusCd !=null and statusCd != ''">
+ and t.status_cd= #{statusCd}
+ </if>
+ <if test="startTime !=null and startTime != ''">
+ and t.start_time= #{startTime}
+ </if>
+ <if test="endTime !=null and endTime != ''">
+ and t.end_time= #{endTime}
+ </if>
+ <if test="remark !=null and remark != ''">
+ and t.remark= #{remark}
+ </if>
+ <if test="objType !=null and objType != ''">
+ and t.obj_type= #{objType}
+ </if>
+ <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="qaId !=null and qaId != ''">
+ and t.qa_id= #{qaId}
+ </if>
+ order by t.create_time desc
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
</select>
-
-
<!-- 淇敼绛斿嵎淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateQuestionAnswerInfo" parameterType="Map">
- update question_answer t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if>
-<if test="qaName !=null and qaName != ''">
-, t.qa_name= #{qaName}
-</if>
-<if test="qaType !=null and qaType != ''">
-, t.qa_type= #{qaType}
-</if>
-<if test="startTime !=null and startTime != ''">
-, t.start_time= #{startTime}
-</if>
-<if test="endTime !=null and endTime != ''">
-, t.end_time= #{endTime}
-</if>
-<if test="storeId !=null and storeId != ''">
-, t.remark= #{storeId}
-</if>
-<if test="objType !=null and objType != ''">
-, t.obj_type= #{objType}
-</if>
-<if test="objTd !=null and objTd != ''">
-, t.obj_id= #{objTd}
-</if>
- where 1=1 <if test="qaId !=null and qaId != ''">
-and t.qa_id= #{qaId}
-</if>
+ update question_answer t set t.status_cd = #{statusCd}
+ <if test="newBId != null and newBId != ''">
+ ,t.b_id = #{newBId}
+ </if>
+ <if test="qaName !=null and qaName != ''">
+ , t.qa_name= #{qaName}
+ </if>
+ <if test="qaType !=null and qaType != ''">
+ , t.qa_type= #{qaType}
+ </if>
+ <if test="startTime !=null and startTime != ''">
+ , t.start_time= #{startTime}
+ </if>
+ <if test="endTime !=null and endTime != ''">
+ , t.end_time= #{endTime}
+ </if>
+ <if test="storeId !=null and storeId != ''">
+ , t.remark= #{storeId}
+ </if>
+ <if test="objType !=null and objType != ''">
+ , t.obj_type= #{objType}
+ </if>
+ <if test="objId !=null and objId != ''">
+ , t.obj_id= #{objId}
+ </if>
+ where 1=1
+ <if test="qaId !=null and qaId != ''">
+ and t.qa_id= #{qaId}
+ </if>
</update>
<!-- 鏌ヨ绛斿嵎鏁伴噺 add by wuxw 2018-07-03 -->
- <select id="queryQuestionAnswersCount" parameterType="Map" resultType="Map">
- select count(1) count
-from question_answer t
-where 1 =1
-<if test="qaName !=null and qaName != ''">
- and t.qa_name= #{qaName}
-</if>
-<if test="qaType !=null and qaType != ''">
- and t.qa_type= #{qaType}
-</if>
-<if test="statusCd !=null and statusCd != ''">
- and t.status_cd= #{statusCd}
-</if>
-<if test="startTime !=null and startTime != ''">
- and t.start_time= #{startTime}
-</if>
-<if test="endTime !=null and endTime != ''">
- and t.end_time= #{endTime}
-</if>
-<if test="storeId !=null and storeId != ''">
- and t.remark= #{storeId}
-</if>
-<if test="objType !=null and objType != ''">
- and t.obj_type= #{objType}
-</if>
-<if test="objTd !=null and objTd != ''">
- and t.obj_id= #{objTd}
-</if>
-<if test="qaId !=null and qaId != ''">
- and t.qa_id= #{qaId}
-</if>
+ <select id="queryQuestionAnswersCount" parameterType="Map" resultType="Map">
+ select count(1) count
+ from question_answer t
+ where 1 =1
+ <if test="qaName !=null and qaName != ''">
+ and t.qa_name like concat('%',#{qaName},'%')
+ </if>
+ <if test="qaType !=null and qaType != ''">
+ and t.qa_type= #{qaType}
+ </if>
+ <if test="statusCd !=null and statusCd != ''">
+ and t.status_cd= #{statusCd}
+ </if>
+ <if test="startTime !=null and startTime != ''">
+ and t.start_time= #{startTime}
+ </if>
+ <if test="endTime !=null and endTime != ''">
+ and t.end_time= #{endTime}
+ </if>
+ <if test="storeId !=null and storeId != ''">
+ and t.remark= #{storeId}
+ </if>
+ <if test="objType !=null and objType != ''">
+ and t.obj_type= #{objType}
+ </if>
+ <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="qaId !=null and qaId != ''">
+ and t.qa_id= #{qaId}
+ </if>
- </select>
+ </select>
</mapper>
--
Gitblit v1.8.0