From e70bbf83e3231d1608dcd9c84a6129e86f64ef17 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Tue, 07 Apr 2020 17:52:27 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml
index de5684f..50c3397 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml
@@ -4,7 +4,13 @@
 <mapper namespace="com.kidgrow.oprationcenter.mapper.SysFeedbackMapper">
     <!--定义查询列-->
     <sql id="Column_List">
-	   *
+	    id,
+        doctor_name,
+        doctor_tel,
+        department_name,
+        hospital_name,
+        enabled,
+        create_time
 	</sql>
 
     <!--sql查询片段-->
@@ -19,7 +25,7 @@
                 and doctor_id = #{p.doctorId}
             </if>
             <if test="p.doctorName != null and p.doctorName !=''">
-                and doctor_name = #{p.doctorName}
+                and doctor_name  like concat('%', #{p.doctorName}, '%')
             </if>
             <if test="p.doctorTel != null and p.doctorTel !=''">
                 and doctor_tel = #{p.doctorTel}
@@ -57,11 +63,8 @@
             <if test="p.updateUserName != null and p.updateUserName !=''">
                 and update_user_name = #{p.updateUserName}
             </if>
-            <if test="p.createTime != null and p.createTime !=''">
-                and create_time = #{p.createTime}
-            </if>
-            <if test="p.updateTime != null and p.updateTime !=''">
-                and update_time = #{p.updateTime}
+            <if test="p.createTime != null and p.createTime !='' and p.updateTime != null and p.updateTime !=''">
+                and (create_time between #{p.createTime} and #{p.updateTime})
             </if>
         </where>
     </sql>

--
Gitblit v1.8.0