From fe1b02a121c173e9b2d56bbe5a1982e0e69e0548 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 28 四月 2026 18:06:08 +0800
Subject: [PATCH] feat(production): 新增生产工单管理功能 - 创建 ProductionOperationTask 实体类定义工单数据结构 - 实现 ProductionOperationTaskController 提供工单的增删改查接口 - 开发 ProductionOperationTaskService 和实现类处理业务逻辑 - 配置 ProductionOperationTaskMapper 及 XML 文件实现数据库操作 - 添加 ProductionOperationTaskVo 视图对象用于数据展示 - 扩展 ProductionOrder 实体类增加生产订单相关属性 - 更新 ProductionOrderMapper.xml 完善订单查询映射配置 - 优化 ProductionOrderPickRecordMapper.xml 记录物料领取明细 - 新增 ProductionOrderRoutingOperationParam 参数配置实体 - 完善 工序参数处理逻辑
---
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