From 9018bdb6ede7bccd16d78dd2de51bf88754012df Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 07 七月 2025 16:49:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/S7_master'
---
hangzhoumesParent/common/servicebase/src/main/resources/mapper/OrderMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/OrderMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/OrderMapper.xml
index 521aeff..7eafcca 100644
--- a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/OrderMapper.xml
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/OrderMapper.xml
@@ -17,7 +17,8 @@
a.area,
a.quantity,
a.create_time,
- round(ifnull(d.finishNum, 0) / a.quantity * 100) as 'percent'
+ round(ifnull(d.finishNum, 0) / a.quantity * 100) as 'percent',
+ ifnull(d.finishNum, 0)
from sd.`order` as a
LEFT JOIN (
SELECT sum(c.reporting_work_num) as 'finishNum',order_id
@@ -28,6 +29,7 @@
GROUP BY c.order_id
) as d
on a.order_id = d.order_id
- where a.warehousing != 2 and a.warehousing > 0
+ where a.warehousing != 2 and a.warehousing >= 0
+ ORDER BY a.order_id desc
</select>
</mapper>
--
Gitblit v1.8.0