From b83df5a43c563bac919dee41d3a8b794f22f1030 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 13 十二月 2024 19:20:45 +0800
Subject: [PATCH] zjh202412013

---
 ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml |    8 +++++---
 1 files changed, 5 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..62d6251 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
@@ -83,11 +83,13 @@
             <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="companyId != null  and companyId != ''">and company_id = #{companyId} </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 +98,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