From 6e8c95d31d85b53857e4e3ce12ea303eb0ea42eb Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 19 八月 2021 00:47:48 +0800
Subject: [PATCH] 优化代码

---
 java110-db/src/main/resources/mapper/user/QuestionAnswerServiceDaoImplMapper.xml |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 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 3154c5b..9214f13
--- a/java110-db/src/main/resources/mapper/user/QuestionAnswerServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/QuestionAnswerServiceDaoImplMapper.xml
@@ -17,14 +17,21 @@
 
     <!-- 鏌ヨ绛斿嵎淇℃伅 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 objId,t.qa_id,t.qa_id qaId,td.`name` qaTypeName
+        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= #{qaName}
+            and t.qa_name like  concat('%',#{qaName},'%')
         </if>
         <if test="qaType !=null and qaType != ''">
             and t.qa_type= #{qaType}
@@ -38,8 +45,8 @@
         <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="objType !=null and objType != ''">
             and t.obj_type= #{objType}
@@ -104,7 +111,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}

--
Gitblit v1.8.0