From d8cf4b3db03a4a4c2d12ef21eaec78cb7d3b10d1 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 20 五月 2026 09:22:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_山西_晋和园_pro
---
src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml b/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml
index 68e5909..2130c09 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>
--
Gitblit v1.9.3