From ba2d8fdc04d32bd18552c124338520afad4db508 Mon Sep 17 00:00:00 2001 From: bingbing <zhaobingliang@aliyun.com> Date: Wed, 18 Nov 2020 23:41:50 +0800 Subject: [PATCH] Merge branch 'dev' --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 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 045182d..a501e7e 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 @@ -33,9 +33,6 @@ <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> <if test="p.enabled != null and p.enabled !=''"> and enabled = #{p.enabled} </if> @@ -51,6 +48,21 @@ <if test="p.updateUserName != null and p.updateUserName !=''"> and update_user_name = #{p.updateUserName} </if> + <if test="p.isScreeningPush != null and p.isScreeningPush !=''"> + and is_screening_push = #{p.isScreeningPush} + </if> + <if test="p.pushTitle != null and p.pushTitle !=''"> + and push_title = #{p.pushTitle} + </if> + <if test="p.pushDescription != null and p.pushDescription !=''"> + and push_description = #{p.pushDescription} + </if> + <if test="p.pushBackImage != null and p.pushBackImage !=''"> + and push_back_image = #{p.pushBackImage} + </if> + <if test="p.homePage != null and p.homePage !=''"> + and home_page = #{p.homePage} + </if> </where> </sql> @@ -61,6 +73,7 @@ from hospital_screening <include refid="where"/> order by id desc + limit 1 </select> <!--定义根据-HospitalScreening当作查询条件返回对象集合--> @@ -71,4 +84,12 @@ <include refid="where"/> order by id desc </select> + + <select id="findByName" resultType="com.kidgrow.oprationcenter.model.HospitalScreening"> + select id, + hospital_name + from hospital_screening + where is_del=0 and enabled=1 and hospital_name LIKE concat('%',#{hospitalName},'%') + order by hospital_name desc,id desc + </select> </mapper> \ No newline at end of file -- Gitblit v1.8.0