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/HospitalScreeningMapper.xml | 63 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml
index 681379b..a17426a 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml
@@ -12,51 +12,52 @@
<where>
<!--查询条件自行添加-->
p.is_del=0
- <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.hospitalLogo != null and p.hospitalLogo !=''">
- and hospital_logo = #{p.hospitalLogo}
+ <if test="p.hospitalLogo != null and p.hospitalLogo !=''">
+ and hospital_logo = #{p.hospitalLogo}
</if>
- <if test="p.hospitalQrImage != null and p.hospitalQrImage !=''">
- and hospital_qr_image = #{p.hospitalQrImage}
+ <if test="p.hospitalQrImage != null and p.hospitalQrImage !=''">
+ and hospital_qr_image = #{p.hospitalQrImage}
</if>
- <if test="p.createTime != null and p.createTime !=''">
- and create_time = #{p.createTime}
+ <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.updateTime != null and p.updateTime !=''">
+ and update_time = #{p.updateTime}
</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.tenantId != null and p.tenantId !=''">
- and tenant_id = #{p.tenantId}
+ <if test="p.tenantId != null and p.tenantId !=''">
+ and tenant_id = #{p.tenantId}
</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>
- </where>
+ </where>
</sql>
<!--定义根据-HospitalScreening当作查询条件返回对象-->
- <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.HospitalScreening">
- select <include refid="Column_List"/>
+ <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.HospitalScreening">
+ select
+ <include refid="Column_List"/>
from hospital_screening
<include refid="where"/>
order by id desc
@@ -64,8 +65,10 @@
<!--定义根据-HospitalScreening当作查询条件返回对象集合-->
<select id="findList" resultType="com.kidgrow.oprationcenter.model.HospitalScreening">
- select <include refid="Column_List"/>
+ select
+ <include refid="Column_List"/>
from hospital_screening
+ <include refid="where"/>
order by id desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0