From fbda2f16d63dcad15de13ab0997ef51257e5815b Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 26 六月 2026 10:53:52 +0800
Subject: [PATCH] feat: 更新定时任务调度逻辑,支持启用状态下重新调度任务

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

diff --git a/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml b/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml
index 68e5909..10f43e4 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 feedback_date desc
     </select>
     <select id="countAfterSalesService" resultType="com.ruoyi.aftersalesservice.dto.CountDto">
         select

--
Gitblit v1.9.3