From 7b6741f6ccf11d0043ad94914d41a9bd23452d00 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 29 五月 2026 15:13:24 +0800
Subject: [PATCH] feat(sales): 添加销售台账审核反审功能 1.在销售台账下新增子级菜单:未审批订单和反审核数据。分别进行订单审 核和查看反审核的历史数据。 2.在销售台账页面，新增一个编辑按钮，可以对已审核的订单进行单价修 改。 3.新增反审核按钮，对已审核的订单进行反审核，反审核之后会保存当前订 单的数据快照，便于在反审核菜单进行查看。反审核的订单重新生成一条销 售订单数据进行编辑。
---
src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml b/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml
index 17419a4..2130c09 100644
--- a/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml
+++ b/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml
@@ -2,18 +2,44 @@
"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.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>
<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