From ec0f2528f83ee7c6ec64537d561a697ffff5b5c3 Mon Sep 17 00:00:00 2001 From: 侯瑞军 <411269194@kidgrow.com> Date: Tue, 21 Apr 2020 15:27:04 +0800 Subject: [PATCH] 1.组织,医院,科室的编辑业务调整,增加了联动编辑功能(创建医院自动创建组织数据,修改同理) 2.重新优化,调整了医院/科室编辑过程中对名称的检查,数据间依赖关系的调整 3.调整优化了区域联动插件,自动完成插件的通用性 --- kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml | 67 +++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 1 deletions(-) diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml index 17d30d1..1c51631 100644 --- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml +++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml @@ -16,7 +16,7 @@ and id = #{p.id} </if> <if test="p.hospitalName != null and p.hospitalName !=''"> - and hospital_name = #{p.hospitalName} + and hospital_name =#{p.hospitalName}% </if> <if test="p.orgId != null and p.orgId !=''"> and org_id = #{p.orgId} @@ -118,6 +118,7 @@ from sys_hospital <include refid="where"/> order by id desc + limit 1 </select> <!--定义根据-SysHospital当作查询条件返回对象集合--> @@ -128,4 +129,68 @@ <include refid="where"/> order by id desc </select> + <sql id="whereList"> + <where> + DEP.is_del = 0 + AND HOS.is_del = 0 + <if test="p.isScreen != null and p.isScreen !=''"> + and is_screen = #{p.isScreen} + </if> + <if test="p.isAnswer != null and p.isAnswer !=''"> + and is_answer = #{p.isAnswer} + </if> + <if test="p.hospitalState != null and p.hospitalState !=''"> + and hospital_state = #{p.hospitalState} + </if> + <if test="p.hospitalProvince != null and p.hospitalProvince !=''"> + and hospital_province = #{p.hospitalProvince} + </if> + <if test="p.hospitalCity != null and p.hospitalCity !=''"> + and hospital_city = #{p.hospitalCity} + </if> + <if test="p.hospitalArea != null and p.hospitalArea !=''"> + and hospital_area = #{p.hospitalArea} + </if> + <if test="p.hospitalName != null and p.hospitalName !=''"> + and hospital_name LIKE concat('%',#{p.hospitalName},'%') + </if> + </where> + </sql> + <select id="findHospitalList" resultType="com.kidgrow.usercenter.vo.HospitalListVo"> + SELECT + DEP.department_name, + DEP.id department_id, + DEP.server_user_name, + DEP.server_user_id, + DEP.org_id, + DEP.is_del, + DEP.enabled, + HOS.id hospital_id, + HOS.hospital_name, + HOS.hospital_code, + HOS.hospital_province, + HOS.hospital_city, + HOS.hospital_area, + HOS.hospital_tel, + HOS.hospital_state, + HOS.hospital_link, + HOS.org_id hospital_org_id, + HOS.is_screen, + HOS.is_answer, + HOS.tenant_id, + HOS.area_code, + HOS.create_time + FROM + sys_department DEP + LEFT JOIN sys_hospital HOS ON DEP.hospital_id = HOS.id + <include refid="whereList"/> + order by create_time desc + </select> + <select id="findByName" resultType="com.kidgrow.usercenter.model.SysHospital"> + select id, + hospital_name + from sys_hospital + where hospital_name LIKE concat('%',#{hospitalName},'%') + order by hospital_name desc + </select> </mapper> \ No newline at end of file -- Gitblit v1.8.0