From b7265cdd6f3e1fbb0d428c27e5b5e29e34d56953 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 17 Nov 2020 17:55:21 +0800
Subject: [PATCH] Merge branch 'dev'
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml | 89 ++++++++++++++++++++++++--------------------
1 files changed, 48 insertions(+), 41 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 05cb018..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,80 +4,87 @@
<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查询片段-->
<sql id="where">
<where>
<!--查询条件自行添加-->
- p.is_del=0
- <if test="p.id != null and p.id !=''">
- and id = #{p.id}
+ is_del=0
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
</if>
- <if test="p.doctorId != null and p.doctorId !=''">
- and doctor_id = #{p.doctorId}
+ <if test="p.doctorId != null and p.doctorId !=''">
+ and doctor_id = #{p.doctorId}
</if>
- <if test="p.doctorName != null and p.doctorName !=''">
- and doctor_name = #{p.doctorName}
+ <if test="p.doctorName != null and p.doctorName !=''">
+ and doctor_name like concat('%', #{p.doctorName}, '%')
</if>
- <if test="p.doctorTel != null and p.doctorTel !=''">
- and doctor_tel = #{p.doctorTel}
+ <if test="p.doctorTel != null and p.doctorTel !=''">
+ and doctor_tel = #{p.doctorTel}
</if>
- <if test="p.departmentId != null and p.departmentId !=''">
- and department_id = #{p.departmentId}
+ <if test="p.departmentId != null and p.departmentId !=''">
+ and department_id = #{p.departmentId}
</if>
- <if test="p.departmentName != null and p.departmentName !=''">
- and department_name = #{p.departmentName}
+ <if test="p.departmentName != null and p.departmentName !=''">
+ and department_name = #{p.departmentName}
</if>
- <if test="p.hospitalId != null and p.hospitalId !=''">
- and hospital_id = #{p.hospitalId}
+ <if test="p.hospitalId != null and p.hospitalId !=''">
+ and hospital_id = #{p.hospitalId}
</if>
- <if test="p.hospitalName != null and p.hospitalName !=''">
- and hospital_name = #{p.hospitalName}
+ <if test="p.hospitalName != null and p.hospitalName !=''">
+ and hospital_name = #{p.hospitalName}
</if>
- <if test="p.feedbackNote != null and p.feedbackNote !=''">
- and feedback_note = #{p.feedbackNote}
+ <if test="p.feedbackNote != null and p.feedbackNote !=''">
+ and feedback_note = #{p.feedbackNote}
</if>
- <if test="p.isDel != null and p.isDel !=''">
- and is_del = #{p.isDel}
+ <if test="p.isDel != null and p.isDel !=''">
+ and is_del = #{p.isDel}
</if>
- <if test="p.enabled != null and p.enabled !=''">
- and enabled = #{p.enabled}
+ <if test="p.enabled != null and p.enabled !=''">
+ and enabled = #{p.enabled}
</if>
- <if test="p.createUserId != null and p.createUserId !=''">
- and create_user_id = #{p.createUserId}
+ <if test="p.createUserId != null and p.createUserId !=''">
+ and create_user_id = #{p.createUserId}
</if>
- <if test="p.createUserName != null and p.createUserName !=''">
- and create_user_name = #{p.createUserName}
+ <if test="p.createUserName != null and p.createUserName !=''">
+ and create_user_name = #{p.createUserName}
</if>
- <if test="p.updateUserId != null and p.updateUserId !=''">
- and update_user_id = #{p.updateUserId}
+ <if test="p.updateUserId != null and p.updateUserId !=''">
+ and update_user_id = #{p.updateUserId}
</if>
- <if test="p.updateUserName != null and p.updateUserName !=''">
- and update_user_name = #{p.updateUserName}
+ <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 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="p.updateTime != null and p.updateTime !=''">
- and update_time = #{p.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