From 04c359a40d51c391fdfea626e7f147422a33b89f Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 19 Jun 2020 09:43:08 +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/DataNeedMapper.xml | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 b569c67..59a3051 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
@@ -11,7 +11,6 @@
<sql id="where">
<where>
<!--查询条件自行添加-->
- is_del=0
<if test="p.id != null and p.id !=''">
and id = #{p.id}
</if>
@@ -24,8 +23,14 @@
<if test="p.doctorName != null and p.doctorName !=''">
and doctor_name like '%${p.doctorName}%'
</if>
+ <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>
+ <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}
@@ -93,4 +98,16 @@
<include refid="where"/>
order by id desc
</select>
+ <!--定义根据-DataNeed当作查询条件返回对象集合-->
+ <select id="findHList" resultType="com.kidgrow.oprationcenter.model.DataNeed">
+ select
+ <include refid="H_Column_List"/>
+ from data_need
+ <include refid="where"/>
+ order by id desc
+ </select>
+ <!--定义查询列-->
+ <sql id="H_Column_List">
+ id,need_type,doctor_name,hospital_id,department_id,need_begintime,need_endtime,data_file,down_time,enabled
+ </sql>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0