From 7aad06fedc12f0183734088fa44c929ac6ff42b3 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 10 十月 2026 11:54:01 +0800
Subject: [PATCH] feat: 增加多个查询的排序功能以优化数据检索
---
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 169 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 109 insertions(+), 60 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index cffeca8..c90cff2 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -4,10 +4,10 @@
<select id="listProcurementBySalesLedgerId" resultType="com.ruoyi.procurementrecord.dto.ProcurementDto">
select
- t1.supplier_name,
+ ANY_VALUE(t1.supplier_name) as supplier_name,
t2.product_category,
t2.id,
- t3.id as recordId,
+ ANY_VALUE(t3.id) as recordId,
t2.specification_model,
t2.unit,
t2.quantity,
@@ -18,9 +18,9 @@
t2.tax_inclusive_unit_price,
t2.tax_inclusive_total_price,
t2.tax_exclusive_total_price,
- t3.inbound_num as quantityStock
+ ANY_VALUE(t3.inbound_num) as quantityStock
from purchase_ledger t1
- left join sales_ledger_product t2 on t1.id = t2.sales_ledger_id
+ left join sales_ledger_product t2 on t1.id = t2.sales_ledger_id and t2.type = 2
left join procurement_record_storage t3 on t2.id = t3.sales_ledger_product_id
where t1.purchase_contract_number = #{req.purchaseContractNumber}
<if test="req.id != null and req.id != ''">
@@ -120,28 +120,28 @@
<select id="listPageCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
select
t3.supplier_name,
- t3.purchase_contract_number,
+ ANY_VALUE(t3.purchase_contract_number) as purchase_contract_number,
t2.product_category,
- t1.id,
- t1.sales_ledger_product_id,
- t1.create_user,
+ ANY_VALUE(t1.id) as id,
+ ANY_VALUE(t1.sales_ledger_product_id) as sales_ledger_product_id,
+ ANY_VALUE(t1.create_user) as create_user,
t2.specification_model,
- t2.unit,
- t2.min_stock,
- t2.tax_rate,
- t2.tax_inclusive_unit_price,
- t2.tax_inclusive_total_price,
- t2.tax_exclusive_total_price,
- t1.inbound_batches,
+ ANY_VALUE(t2.unit) as unit,
+ ANY_VALUE(t2.min_stock) as min_stock,
+ ANY_VALUE(t2.tax_rate) as tax_rate,
+ ANY_VALUE(t2.tax_inclusive_unit_price) as tax_inclusive_unit_price,
+ ANY_VALUE(t2.tax_inclusive_total_price) as tax_inclusive_total_price,
+ ANY_VALUE(t2.tax_exclusive_total_price) as tax_exclusive_total_price,
+ ANY_VALUE(t1.inbound_batches) as inbound_batches,
t1.unit_price as unitPrice,
sum(t1.total_price) as totalPrice,
sum(t1.inbound_num) as inboundNum,
sum(t1.inbound_num) as inboundNum0,
- t1.inbound_num as totalInboundNum,
- t1.create_time,
- t1.update_time,
- t1.create_by,
- t2.warn_num
+ ANY_VALUE(t1.inbound_num) as totalInboundNum,
+ ANY_VALUE(t1.create_time) as create_time,
+ ANY_VALUE(t1.update_time) as update_time,
+ ANY_VALUE(t1.create_by) as create_by,
+ ANY_VALUE(t2.warn_num) as warn_num
from procurement_record_storage t1
left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id and t2.type = 2
left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
@@ -178,25 +178,25 @@
<select id="listCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
select
t3.supplier_name,
- t3.purchase_contract_number,
+ ANY_VALUE(t3.purchase_contract_number) as purchase_contract_number,
t2.product_category,
- t1.id,
- t1.sales_ledger_product_id,
- t1.create_user,
- t2.specification_model,
- t2.unit,
- t2.tax_rate,
- t2.tax_inclusive_unit_price,
- t2.tax_inclusive_total_price,
- t2.tax_exclusive_total_price,
- t1.inbound_batches,
- t1.inbound_num,
- t1.inbound_num as inboundNum0,
- t1.create_time,
- t1.update_time,
- t1.create_time as cTime,
- t1.update_time as uTime,
- t1.create_by
+ ANY_VALUE(t1.id) as id,
+ ANY_VALUE(t1.sales_ledger_product_id) as sales_ledger_product_id,
+ ANY_VALUE(t1.create_user) as create_user,
+ ANY_VALUE(t2.specification_model) as specification_model,
+ ANY_VALUE(t2.unit) as unit,
+ ANY_VALUE(t2.tax_rate) as tax_rate,
+ ANY_VALUE(t2.tax_inclusive_unit_price) as tax_inclusive_unit_price,
+ ANY_VALUE(t2.tax_inclusive_total_price) as tax_inclusive_total_price,
+ ANY_VALUE(t2.tax_exclusive_total_price) as tax_exclusive_total_price,
+ ANY_VALUE(t1.inbound_batches) as inbound_batches,
+ ANY_VALUE(t1.inbound_num) as inbound_num,
+ ANY_VALUE(t1.inbound_num) as inboundNum0,
+ ANY_VALUE(t1.create_time) as create_time,
+ ANY_VALUE(t1.update_time) as update_time,
+ ANY_VALUE(t1.create_time) as cTime,
+ ANY_VALUE(t1.update_time) as uTime,
+ ANY_VALUE(t1.create_by) as create_by
from procurement_record_storage t1
left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id and t2.type = 2
left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
@@ -205,27 +205,27 @@
</select>
<select id="listCopyOne" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
select
- t3.customer_contract_no,
- t3.sales_contract_no,
+ ANY_VALUE(t3.customer_contract_no) as customer_contract_no,
+ ANY_VALUE(t3.sales_contract_no) as sales_contract_no,
t3.customer_name,
t2.product_category,
- t1.id,
- t1.sales_ledger_product_id,
- t1.create_user,
- t2.specification_model,
- t2.unit,
- t2.tax_rate,
- t2.tax_inclusive_unit_price,
- t2.tax_inclusive_total_price,
- t2.tax_exclusive_total_price,
- t1.inbound_batches,
- t1.inbound_num,
- t1.inbound_num as inboundNum0,
- t1.create_time,
- t1.update_time,
- t1.create_time as cTime,
- t1.update_time as uTime,
- t1.create_by
+ ANY_VALUE(t1.id) as id,
+ ANY_VALUE(t1.sales_ledger_product_id) as sales_ledger_product_id,
+ ANY_VALUE(t1.create_user) as create_user,
+ ANY_VALUE(t2.specification_model) as specification_model,
+ ANY_VALUE(t2.unit) as unit,
+ ANY_VALUE(t2.tax_rate) as tax_rate,
+ ANY_VALUE(t2.tax_inclusive_unit_price) as tax_inclusive_unit_price,
+ ANY_VALUE(t2.tax_inclusive_total_price) as tax_inclusive_total_price,
+ ANY_VALUE(t2.tax_exclusive_total_price) as tax_exclusive_total_price,
+ ANY_VALUE(t1.inbound_batches) as inbound_batches,
+ ANY_VALUE(t1.inbound_num) as inbound_num,
+ ANY_VALUE(t1.inbound_num) as inboundNum0,
+ ANY_VALUE(t1.create_time) as create_time,
+ ANY_VALUE(t1.update_time) as update_time,
+ ANY_VALUE(t1.create_time) as cTime,
+ ANY_VALUE(t1.update_time) as uTime,
+ ANY_VALUE(t1.create_by) as create_by
from procurement_record_storage t1
left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id and t2.type = 1
left join sales_ledger t3 on t3.id = t2.sales_ledger_id
@@ -255,12 +255,13 @@
t1.create_time,
t1.update_time,
t1.create_by,
- t2.warn_num
+ t2.warn_num,
+ t2.product_id
from procurement_record_storage t1
left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id and t2.type = 1
left join sales_ledger t3 on t3.id = t2.sales_ledger_id
<where>
- t1.type = 2
+ t1.type = 2 and t1.sales_ledger_product_id != 0
<if test="req.customerName != null and req.customerName != ''">
and t3.customer_name like concat('%',#{req.customerName},'%')
</if>
@@ -297,7 +298,8 @@
t1.create_time,
t1.update_time,
t1.create_by,
- t2.warn_num
+ t2.warn_num,
+ t2.product_id
from procurement_record_storage t1
left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id and t2.type = 1
left join sales_ledger t3 on t3.id = t2.sales_ledger_id
@@ -311,6 +313,9 @@
</if>
<if test="req.timeStr != null and req.timeStr != ''">
and t1.create_time like concat('%',#{req.timeStr},'%')
+ </if>
+ <if test="req.salesLedgerProductId != null and req.salesLedgerProductId != ''">
+ and t1.sales_ledger_product_id = #{req.salesLedgerProductId}
</if>
<if test="req.reportDate != null">
and t1.create_time >= #{req.reportDate} and t1.create_time < DATE_ADD(#{req.reportDate}, INTERVAL 1 DAY)
@@ -331,4 +336,48 @@
group by t2.product_category,t2.specification_model,t1.unit_price
order by t1.create_time desc
</select>
+ <select id="listPagePRS" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
+ select *
+ from procurement_record_storage t1
+ left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
+ <where>
+ 1=1
+ <if test="req.productCategory != null and req.productCategory != ''">
+ and t2.product_category like concat('%',#{req.productCategory},'%')
+ </if>
+ <if test="req.timeStr != null and req.timeStr != ''">
+ and t1.create_time like concat('%',#{req.timeStr},'%')
+ </if>
+ <if test="req.salesLedgerProductId != null and req.salesLedgerProductId != ''">
+ and t1.sales_ledger_product_id = #{req.salesLedgerProductId}
+ </if>
+ </where>
+ </select>
+ <select id="getSumQuantity" resultType="BigDecimal">
+ select COALESCE(sum(inbound_num), 0)
+ from procurement_record_storage
+ where product_model_id = #{productModelId}
+ </select>
+ <select id="listPageByProductProduction" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
+ select
+ t1.*,
+ t1.inbound_num as inboundNum0,
+ t2.model as specification_model ,
+ t2.unit,
+ t3.product_name as product_category
+ from procurement_record_storage t1
+ left join product_model t2 on t1.product_model_id = t2.id
+ left join product t3 on t2.product_id = t3.id
+ <where>
+ t1.type = 2 and t1.sales_ledger_product_id = 0
+ <if test="req.productCategory != null and req.productCategory != ''">
+ and t3.product_name like concat('%',#{req.productCategory},'%')
+ </if>
+
+ <if test="req.timeStr != null and req.timeStr != ''">
+ and t1.create_time like concat('%',#{req.timeStr},'%')
+ </if>
+ </where>
+ order by t1.create_time desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3