From a35a3d9d6ce42cd3a483a2204bc52479520bbb72 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Sun, 26 Apr 2020 10:18:47 +0800
Subject: [PATCH] 1.增加试用套餐授权功能页面 2.增加诊断记录列表页面(接口待提供)

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml |   87 +++++++++++++++++++++++--------------------
 1 files changed, 47 insertions(+), 40 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 9a05a17..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查询片段-->
@@ -12,72 +18,73 @@
         <where>
             <!--查询条件自行添加-->
             is_del=0
-                                    <if test="id != null and id !=''">
-                and  id =  #{id}
+            <if test="p.id != null and p.id !=''">
+                and id = #{p.id}
             </if>
-                                                <if test="doctorId != null and doctorId !=''">
-                and  doctor_id =  #{doctorId}
+            <if test="p.doctorId != null and p.doctorId !=''">
+                and doctor_id = #{p.doctorId}
             </if>
-                                                <if test="doctorName != null and doctorName !=''">
-                and  doctor_name =  #{doctorName}
+            <if test="p.doctorName != null and p.doctorName !=''">
+                and doctor_name  like concat('%', #{p.doctorName}, '%')
             </if>
-                                                <if test="doctorTel != null and doctorTel !=''">
-                and  doctor_tel =  #{doctorTel}
+            <if test="p.doctorTel != null and p.doctorTel !=''">
+                and doctor_tel = #{p.doctorTel}
             </if>
-                                                <if test="departmentId != null and departmentId !=''">
-                and  department_id =  #{departmentId}
+            <if test="p.departmentId != null and p.departmentId !=''">
+                and department_id = #{p.departmentId}
             </if>
-                                                <if test="departmentName != null and departmentName !=''">
-                and  department_name =  #{departmentName}
+            <if test="p.departmentName != null and p.departmentName !=''">
+                and department_name = #{p.departmentName}
             </if>
-                                                <if test="hospitalId != null and hospitalId !=''">
-                and  hospital_id =  #{hospitalId}
+            <if test="p.hospitalId != null and p.hospitalId !=''">
+                and hospital_id = #{p.hospitalId}
             </if>
-                                                <if test="hospitalName != null and hospitalName !=''">
-                and  hospital_name =  #{hospitalName}
+            <if test="p.hospitalName != null and p.hospitalName !=''">
+                and hospital_name = #{p.hospitalName}
             </if>
-                                                <if test="feedbackNote != null and feedbackNote !=''">
-                and  feedback_note =  #{feedbackNote}
+            <if test="p.feedbackNote != null and p.feedbackNote !=''">
+                and feedback_note = #{p.feedbackNote}
             </if>
-                                                <if test="isDel != null and isDel !=''">
-                and  is_del =  #{isDel}
+            <if test="p.isDel != null and p.isDel !=''">
+                and is_del = #{p.isDel}
             </if>
-                                                <if test="enabled != null and enabled !=''">
-                and  enabled =  #{enabled}
+            <if test="p.enabled != null and p.enabled !=''">
+                and enabled = #{p.enabled}
             </if>
-                                                <if test="createUserId != null and createUserId !=''">
-                and  create_user_id =  #{createUserId}
+            <if test="p.createUserId != null and p.createUserId !=''">
+                and create_user_id = #{p.createUserId}
             </if>
-                                                <if test="createUserName != null and createUserName !=''">
-                and  create_user_name =  #{createUserName}
+            <if test="p.createUserName != null and p.createUserName !=''">
+                and create_user_name = #{p.createUserName}
             </if>
-                                                <if test="updateUserId != null and updateUserId !=''">
-                and  update_user_id =  #{updateUserId}
+            <if test="p.updateUserId != null and p.updateUserId !=''">
+                and update_user_id = #{p.updateUserId}
             </if>
-                                                <if test="updateUserName != null and updateUserName !=''">
-                and  update_user_name =  #{updateUserName}
+            <if test="p.updateUserName != null and p.updateUserName !=''">
+                and update_user_name = #{p.updateUserName}
             </if>
-                                                <if test="createTime != null and createTime !=''">
-                and  create_time =  #{createTime}
+            <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>
-                                                <if test="updateTime != null and updateTime !=''">
-                and  update_time =  #{updateTime}
-            </if>
-                                </where>
+        </where>
     </sql>
 
     <!--定义根据-SysFeedback当作查询条件返回对象-->
-    <select id="findByObject"  resultType="com.kidgrow.oprationcenter.model.SysFeedback">
-        select <include refid="Column_List"/>
+    <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.SysFeedback">
+        select
+        <include refid="Column_List"/>
         from sys_feedback
         <include refid="where"/>
         order by id desc
+        limit 1
     </select>
 
     <!--定义根据-SysFeedback当作查询条件返回对象集合-->
     <select id="findList" resultType="com.kidgrow.oprationcenter.model.SysFeedback">
-        select <include refid="Column_List"/>
+        select
+        <include refid="Column_List"/>
         from sys_feedback
+        <include refid="where"/>
         order by id desc
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0