From cf7bc2d68e7d86e7d4b896acf1400f534d594daa Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 10 三月 2026 17:59:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml b/src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml
new file mode 100644
index 0000000..a58e90f
--- /dev/null
+++ b/src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.account.mapper.SalesRefundAmountOrderMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.account.pojo.SalesRefundAmountOrder">
+ <id column="id" property="id" />
+ <result column="return_management_id" property="returnManagementId" />
+ <result column="status" property="status" />
+ <result column="refund_amount" property="refundAmount" />
+ <result column="refunded_amount" property="refundedAmount" />
+ <result column="not_refunded_amount" property="notRefundedAmount" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="create_user_id" property="createUserId" />
+ <result column="update_user_id" property="updateUserId" />
+ </resultMap>
+ <select id="pageSalesRefundAmountOrderDto" resultType="com.ruoyi.account.dto.SalesRefundAmountOrderDto">
+ select sl.sales_contract_no,
+ sl.customer_contract_no,
+ slp.specification_model,
+ slp.product_category as product_name,
+ slp.unit,
+ sl.customer_name,
+ rm.return_no as return_management_no,
+ srao.*
+ from sales_refund_amount_order srao
+ left join return_management rm on srao.return_management_id = rm.id
+ left join return_sale_product rs on rm.id = rs.return_management_id
+ left join sales_ledger_product slp on rs.return_sale_ledger_product_id = slp.id
+ left join sales_ledger sl on slp.sales_ledger_id = sl.id
+ <where>
+ <if test="ew.salesContractNo != null and ew.salesContractNo !=''">
+ and sl.sales_contract_no like concat('%',#{ew.salesContractNo},'%')
+ </if>
+ <if test="ew.returnManagementNo != null and ew.returnManagementNo !=''">
+ and rm.return_no like concat('%',#{ew.returnManagementNo},'%')
+ </if>
+ </where>
+ </select>
+
+</mapper>
--
Gitblit v1.9.3