From f3d0cf42321bb6f0f3c03a66c3d33c260f5d593e Mon Sep 17 00:00:00 2001
From: zhang_nuo <zhang_12370@163.com>
Date: 星期日, 13 九月 2026 13:18:17 +0800
Subject: [PATCH] feat[production]: 生产作业任务新增领料状态字段
---
src/main/resources/mapper/sales/SalesQuotationMapper.xml | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesQuotationMapper.xml b/src/main/resources/mapper/sales/SalesQuotationMapper.xml
index a39cd45..a407a0b 100644
--- a/src/main/resources/mapper/sales/SalesQuotationMapper.xml
+++ b/src/main/resources/mapper/sales/SalesQuotationMapper.xml
@@ -4,16 +4,21 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.sales.mapper.SalesQuotationMapper">
<select id="listPage" resultType="com.ruoyi.sales.dto.SalesQuotationDto">
- SELECT * FROM sales_quotation
+ SELECT t1.*,
+ t2.approve_user_ids
+ FROM sales_quotation t1
+ LEFT JOIN approve_process t2 ON t1.quotation_no = t2.approve_reason and t2.approve_type = 6
WHERE 1=1
+ and t2.approve_delete = 0
<if test="salesQuotationDto.quotationNo != null and salesQuotationDto.quotationNo != '' ">
- AND quotation_no LIKE CONCAT('%',#{salesQuotationDto.quotationNo},'%')
+ AND t1.quotation_no LIKE CONCAT('%',#{salesQuotationDto.quotationNo},'%')
</if>
<if test="salesQuotationDto.customer != null and salesQuotationDto.customer != '' ">
- AND customer = #{salesQuotationDto.customer}
+ AND t1.customer = #{salesQuotationDto.customer}
</if>
<if test="salesQuotationDto.status != null and salesQuotationDto.status != '' ">
- AND status = #{salesQuotationDto.status}
+ AND t1.status = #{salesQuotationDto.status}
</if>
+ order by t1.quotation_no desc
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3