From 6beedcff97476af1d562fdb8c99b1a2e418c4e4a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 12 五月 2026 13:35:24 +0800
Subject: [PATCH] fix(account): 修复PurchaseInboundDto日期格式双重注解问题
---
src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
index 77435ad..2152244 100644
--- a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
@@ -53,4 +53,28 @@
<include refid="getPurchaseReturnOrderHasAllInfoFormAndColumn"/>
where pro.id = #{id}
</select>
+ <select id="listPageAccountPurchaseReturn"
+ resultType="com.ruoyi.account.bean.vo.PurchaseReturnVo">
+ select pro.id,
+ pro.no returnNo,
+ sm.supplier_name,
+ pro.prepared_at,
+ pro.total_amount,
+ CASE pro.return_type WHEN 0 THEN '閫�璐ч��娆�' WHEN 1 THEN '鎷掓敹' END AS returnType,
+ pl.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 pro.purchase_ledger_id = pl.id
+ where 1=1
+ <if test="req.returnNo != null and req.returnNo != ''">
+ and pro.no like concat('%',#{req.returnNo},'%')
+ </if>
+ <if test="req.supplierName != null and req.supplierName != ''">
+ and sm.supplier_name like concat('%',#{req.supplierName},'%')
+ </if>
+ <if test="req.startDate != null and req.endDate != null">
+ AND DATE_FORMAT(pro.prepared_at, '%Y-%m-%d') BETWEEN #{req.startDate} AND #{req.endDate}
+ </if>
+ order by pro.id DESC
+ </select>
</mapper>
--
Gitblit v1.9.3