From d611ae157097e36ab80106c24f4d5966c6ff8109 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 05 三月 2026 15:33:15 +0800
Subject: [PATCH] 售后服务

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

diff --git a/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml b/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml
index 17419a4..68e5909 100644
--- a/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml
+++ b/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml
@@ -2,18 +2,38 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.aftersalesservice.mapper.AfterSalesServiceMapper">
 
-    <select id="listPage" resultType="com.ruoyi.aftersalesservice.pojo.AfterSalesService">
-        select * from after_sales_service
+    <select id="listPage" resultType="com.ruoyi.aftersalesservice.dto.AfterSalesServiceNewDto">
+        select ass.*,
+        sl.sales_contract_no
+        from after_sales_service ass
+        left join sales_ledger sl  on ass.sales_ledger_id = sl.id
         where 1 = 1
-        <if test="req.feedbackDate != null and req.feedbackDate != ''">
-            and feedback_date like concat('%', #{req.feedbackDate}, '%')
+        <if test="req.feedbackDate != null">
+            AND feedback_date BETWEEN #{req.feedbackDate} AND #{req.feedbackDate}
         </if>
-        <if test="req.disDate != null and req.disDate != ''">
-            and dis_date like concat('%', #{req.disDate}, '%')
+        <if test="req.disDate != null">
+            AND dis_date BETWEEN #{req.disDate} AND #{req.disDate}
         </if>
         <if test="req.tenantId != null and req.tenantId != ''">
             and tenant_id = #{req.tenantId}
         </if>
+        <if test="req.status != null and req.status != ''">
+            and status = #{req.status}
+        </if>
+        <if test="req.urgency != null">
+            and urgency = #{req.urgency}
+        </if>
+        <if test="req.serviceType != null">
+            and service_type = #{req.serviceType}
+        </if>
         order by update_time desc
     </select>
+    <select id="countAfterSalesService" resultType="com.ruoyi.aftersalesservice.dto.CountDto">
+        select
+            status,
+            count(1) as count
+        from after_sales_service
+        group by status
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3