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 | 52 +++++++++++++++++++++++++++++-----------------------
1 files changed, 29 insertions(+), 23 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 77f9584..674b1eb
--- a/java110-db/src/main/resources/mapper/user/QuestionAnswerServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/QuestionAnswerServiceDaoImplMapper.xml
@@ -1,30 +1,33 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<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},#{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>
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'
+ 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= #{qaName}
+ and t.qa_name like concat('%',#{qaName},'%')
</if>
<if test="qaType !=null and qaType != ''">
and t.qa_type= #{qaType}
@@ -40,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}
@@ -60,9 +66,7 @@
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
-
<!-- 淇敼绛斿嵎淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateQuestionAnswerInfo" parameterType="Map">
@@ -82,8 +86,11 @@
<if test="endTime !=null and endTime != ''">
, t.end_time= #{endTime}
</if>
- <if test="storeId !=null and storeId != ''">
- , t.remark= #{storeId}
+ <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}
@@ -95,7 +102,6 @@
<if test="qaId !=null and qaId != ''">
and t.qa_id= #{qaId}
</if>
-
</update>
<!-- 鏌ヨ绛斿嵎鏁伴噺 add by wuxw 2018-07-03 -->
@@ -104,7 +110,7 @@
from question_answer t
where 1 =1
<if test="qaName !=null and qaName != ''">
- and t.qa_name= #{qaName}
+ and t.qa_name like concat('%',#{qaName},'%')
</if>
<if test="qaType !=null and qaType != ''">
and t.qa_type= #{qaType}
@@ -118,8 +124,11 @@
<if test="endTime !=null and endTime != ''">
and t.end_time= #{endTime}
</if>
- <if test="storeId !=null and storeId != ''">
- and t.remark= #{storeId}
+ <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}
@@ -136,8 +145,5 @@
<if test="qaId !=null and qaId != ''">
and t.qa_id= #{qaId}
</if>
-
-
</select>
-
</mapper>
--
Gitblit v1.8.0