From 3b0ddfa0b1c3490fbbf421a84e0431a60fb58387 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 01 四月 2021 12:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
java110-db/src/main/resources/mapper/user/QuestionAnswerServiceDaoImplMapper.xml | 8 ++++----
1 files changed, 4 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 3154c5b..77f9584 100644
--- a/java110-db/src/main/resources/mapper/user/QuestionAnswerServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/QuestionAnswerServiceDaoImplMapper.xml
@@ -18,8 +18,8 @@
<!-- 鏌ヨ绛斿嵎淇℃伅 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
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'
where 1 =1
@@ -38,8 +38,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}
--
Gitblit v1.8.0