From 28c2126249a35ded0b816a07d80c015caa45a4f3 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 11 二月 2025 09:40:27 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
index 2d45565..e3855d1 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -102,8 +102,8 @@
</update>
<select id="getOrderList">
- select
- *,
+ select * from (select
+ o.*,
ifnull(sum(fgi.quantity_available),0) as goodsQuantity
from
sd.`order` as o
@@ -196,16 +196,38 @@
and o.processing_note REGEXP #{order.processingNote}
</if>
group by o.id
- order by o.id desc
+ ) as acc
+ order by
+ <if test="orderBy == null ">
+ id desc
+ </if>
+ <if test="orderBy == 'desc'">
+ ${field} desc
+ </if>
+ <if test="orderBy == 'asc'">
+ ${field}
+ </if>
limit #{offset},#{pageSize}
</select>
<select id="getPageTotal">
select
CEILING(count(o.id)/#{pageSize}) as 'pageTotal',
- count(o.id) as 'total'
+ count(o.id) as 'dataTotal',
+ sum(o.quantity) as quantity,
+ sum(o.area) as area,
+ sum(o.money) as money,
+ ifnull(fgi.goodsQuantity ,0) as goodsQuantity ,
+ ROUND(sum(perimeter),2) as perimeter,
+ #{pageSize} as pageSize
from
`order` as o
+ left join(
+ select order_id,
+ ifnull(sum(quantity_available),0) as goodsQuantity
+ from mm.finished_goods_inventory group by order_id
+ ) as fgi
+ on o.order_id = fgi.order_id
where date (o.create_time)>=#{startDate} and date(o.create_time) <= #{endDate}
<if test="orderType!= null and orderType != 0">
and o.create_order = #{orderType}
--
Gitblit v1.8.0