From 0e2879d8e3110b777bcdcff9d7e8e8a44bf95e7d Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Thu, 02 Apr 2020 15:46:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DataNeedMapper.xml | 91 +++++++++++++++++++++++----------------------
1 files changed, 47 insertions(+), 44 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DataNeedMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DataNeedMapper.xml
index 00a451b..5884ea3 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DataNeedMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DataNeedMapper.xml
@@ -12,72 +12,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="needType != null and needType !=''">
- and need_type = #{needType}
+ <if test="p.needType != null and p.needType !=''">
+ and need_type = #{p.needType}
</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 '%${p.doctorName}%'
</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="departmentName != null and departmentName !=''">
- and department_name = #{departmentName}
+ <if test="p.departmentName != null and p.departmentName !=''">
+ and department_name = #{p.departmentName}
</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="needBegintime != null and needBegintime !=''">
- and need_begintime = #{needBegintime}
+ <if test="p.needBegintime != null and p.needBegintime !=''">
+ and need_begintime >= #{p.needBegintime}
</if>
- <if test="needEndtime != null and needEndtime !=''">
- and need_endtime = #{needEndtime}
+ <if test="p.needEndtime != null and p.needEndtime !=''">
+ and need_endtime <= #{p.needEndtime}
</if>
- <if test="needTags != null and needTags !=''">
- and need_tags = #{needTags}
+ <if test="p.needTags != null and p.needTags !=''">
+ and need_tags = #{p.needTags}
</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="dataFile != null and dataFile !=''">
- and data_file = #{dataFile}
+ <if test="p.dataFile != null and p.dataFile !=''">
+ and data_file = #{p.dataFile}
</if>
- <if test="downTime != null and downTime !=''">
- and down_time = #{downTime}
+ <if test="p.downTime != null and p.downTime !=''">
+ and down_time = #{p.downTime}
</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 create_time = #{p.createTime}
</if>
- <if test="updateTime != null and updateTime !=''">
- and update_time = #{updateTime}
+ <if test="p.updateTime != null and p.updateTime !=''">
+ and update_time = #{p.updateTime}
</if>
- </where>
+ </where>
</sql>
<!--定义根据-DataNeed当作查询条件返回对象-->
- <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.DataNeed">
- select <include refid="Column_List"/>
+ <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.DataNeed">
+ select
+ <include refid="Column_List"/>
from data_need
<include refid="where"/>
order by id desc
@@ -85,8 +86,10 @@
<!--定义根据-DataNeed当作查询条件返回对象集合-->
<select id="findList" resultType="com.kidgrow.oprationcenter.model.DataNeed">
- select <include refid="Column_List"/>
+ select
+ <include refid="Column_List"/>
from data_need
+ <include refid="where"/>
order by id desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0