From 07e9852265c7424c1540c3187567c73c5a254754 Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Sat, 23 Nov 2024 11:11:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=BB=93=E7=AE=97=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E8=A1=A5=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/tickets/DlRepairTicketsMapper.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml b/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml
index 7cc96744..f8af711a 100644
--- a/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml
+++ b/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml
@@ -169,11 +169,17 @@
     </select>
     <select id="getTicketsPage" resultMap="BaseResultMap">
         <include refid="Base_SQL"/>
-        <if test="map.ticketsStatus != null and map.ticketsStatus != '' and map.ticketsStatus != '01'">
+        -- 已结算的
+        <if test="map.ticketsStatus != null and map.ticketsStatus != '' and map.ticketsStatus == '02'">
+            and drt.tickets_status in ('08', #{map.ticketsStatus})
+        </if>
+        -- 已作废的
+        <if test="map.ticketsStatus != null and map.ticketsStatus != '' and map.ticketsStatus == '03'">
             and drt.tickets_status = #{map.ticketsStatus}
         </if>
+        -- 待结算的
         <if test="map.ticketsStatus != null and map.ticketsStatus != '' and map.ticketsStatus == '01'">
-            and (drt.tickets_status = #{map.ticketsStatus} or drt.tickets_status = '06')
+            and (drt.tickets_status = #{map.ticketsStatus})
         </if>
         <if test="map.ticketNo != null and map.ticketNo != ''">
             and (