From d866e43afbe901bfc640776e02f767b9045acbc2 Mon Sep 17 00:00:00 2001 From: 赵文轩 <1652863494@qq.com> Date: 星期三, 12 六月 2024 09:04:56 +0800 Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peis --- ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml index 5a914e2..2cf9135 100644 --- a/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml +++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml @@ -83,11 +83,12 @@ <if test="name != null and name != ''">and name =#{name}</if> <if test="idCard != null and idCard != ''">and id_card = #{idCard}</if> <if test="phoe != null and phoe != ''">and phoe = #{phoe}</if> - <if test="company != null and company != ''">and company like "%"#{company}"%"</if> + <if test="company != null and company != ''">and company like concat('%', #{company}, '%')</if> <if test="reservationTime != null ">and reservation_time BETWEEN #{reservationTime} and now()</if> <if test="isExpire != null ">and is_expire = #{isExpire}</if> and deleted = '0' </where> + ORDER BY create_time desc </select> @@ -96,14 +97,14 @@ <where> <if test="name != null and name != ''">and name = #{name}</if> <if test="phoe != null and phoe != ''">and phoe = #{phoe}</if> - <if test="company != null and company != ''">and company like "%"#{company}"%"</if> + <if test="company != null and company != ''">and company like concat('%', #{company}, '%')</if> <if test="reservationTime != null ">and reservation_time = #{reservationTime}</if> and deleted = '1' </where> </select> - <select id="selectTjReservationById" parameterType="Long" resultMap="TjReservationResult"> + <select id="selectTjReservationById" parameterType="String" resultMap="TjReservationResult"> <include refid="selectTjReservationVo"/> where id = #{id} </select> -- Gitblit v1.8.0