From f802cb9f7ed452142fa001511621dff08ca77585 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 09 五月 2026 16:35:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
index 0232873..77435ad 100644
--- a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
@@ -18,16 +18,18 @@
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
</resultMap>
-
- <select id="listPage" resultType="com.ruoyi.purchase.vo.PurchaseReturnOrderVo">
+ <sql id="getPurchaseReturnOrderHasAllInfoFormAndColumn">
SELECT
- pro.*,
- sm.supplier_name as supplierName,
- pl.purchase_contract_number as purchaseContractNumber
+ pro.*,
+ sm.supplier_name as supplier_name,
+ pl.purchase_contract_number as purchase_contract_number
FROM purchase_return_orders pro
- LEFT JOIN supplier_manage sm ON pro.supplier_id = sm.id
- LEFT JOIN purchase_ledger pl ON pl.id = pro.purchase_ledger_id
- where 1=1
+ LEFT JOIN supplier_manage sm ON pro.supplier_id = sm.id
+ LEFT JOIN purchase_ledger pl ON pl.id = pro.purchase_ledger_id
+ </sql>
+ <select id="listPage" resultType="com.ruoyi.purchase.dto.PurchaseReturnOrderHasAllInfoDto">
+ <include refid="getPurchaseReturnOrderHasAllInfoFormAndColumn"/>
+ <where>
<if test="params.no != null and params.no != '' ">
AND pro.no LIKE CONCAT('%',#{params.no},'%')
</if>
@@ -43,6 +45,12 @@
<if test="params.createUser != null">
AND pro.create_user = #{params.createUser}
</if>
+ </where>
ORDER BY pro.create_time DESC
</select>
+ <select id="getPurchaseReturnOrderHasAllInfoById"
+ resultType="com.ruoyi.purchase.dto.PurchaseReturnOrderHasAllInfoDto">
+ <include refid="getPurchaseReturnOrderHasAllInfoFormAndColumn"/>
+ where pro.id = #{id}
+ </select>
</mapper>
--
Gitblit v1.9.3