From 0989ec1e6b465141f99ed67e40fa2a0b928dce94 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 29 四月 2026 16:54:51 +0800
Subject: [PATCH] feat(production): 新增生产核算和生产工单功能模块 - 添加生产核算控制器、服务接口及实现类 - 实现生产核算分页查询和工人生产工资信息查询功能 - 添加生产工单控制器、服务接口及实现类 - 实现生产工单的增删改查和状态统计功能 - 集成工单流转卡下载和二维码生成功能 - 添加工单相关的数据传输对象和值对象 - 实现工单与用户关联的分配功能 - 完善工单附件图片处理和展示功能
---
src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml b/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml
index 41cd6ca..2130c09 100644
--- a/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml
+++ b/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml
@@ -2,11 +2,20 @@
"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 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}
@@ -17,6 +26,20 @@
<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