From 0d7c3e7923c420ae6d3f8feff280bf4fcaac5ce7 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 28 五月 2026 11:22:06 +0800
Subject: [PATCH] feat 人员合同、设备定时保养、排班之后APP推送通知

---
 src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml b/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml
index 68e5909..1d36599 100644
--- a/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml
+++ b/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml
@@ -11,6 +11,12 @@
         <if test="req.feedbackDate != null">
             AND feedback_date BETWEEN #{req.feedbackDate} AND #{req.feedbackDate}
         </if>
+        <if test="req.afterSalesServiceNo != null and req.afterSalesServiceNo != ''">
+            AND ass.after_sales_service_no like CONCAT('%', #{req.afterSalesServiceNo}, '%')
+        </if>
+        <if test="req.orderNo != null and req.orderNo != '' ">
+            AND sl.sales_contract_no like CONCAT('%', #{req.orderNo}, '%')
+        </if>
         <if test="req.disDate != null">
             AND dis_date BETWEEN #{req.disDate} AND #{req.disDate}
         </if>
@@ -26,7 +32,7 @@
         <if test="req.serviceType != null">
             and service_type = #{req.serviceType}
         </if>
-        order by update_time desc
+        order by create_time desc
     </select>
     <select id="countAfterSalesService" resultType="com.ruoyi.aftersalesservice.dto.CountDto">
         select
@@ -36,4 +42,4 @@
         group by status
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3