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 | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
index 8976a3a..77435ad 100644
--- a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
@@ -18,22 +18,39 @@
<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,
- su.user_name as returnUserName,
- su1.user_name as createUserName
+ 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
- LEFT JOIN sys_user su ON su.user_id = pro.return_user_id
- LEFT JOIN sys_user su1 ON su1.user_id = pro.prepared_user_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>
+ <if test="params.deptId != null">
+ AND pro.dept_id = #{params.deptId}
+ </if>
+ <if test="params.deptIds != null and params.deptIds.length > 0">
+ AND pro.dept_id IN
+ <foreach collection="params.deptIds" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
+ <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