From 4980a87bde84be945f13dcaeb9b3f3c36f84953b Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期五, 13 九月 2024 15:11:07 +0800
Subject: [PATCH] 优化

---
 src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
index aac2aed..024312f 100644
--- a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
+++ b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
@@ -101,9 +101,18 @@
     <select id="selectDoItemList4Check" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItem4CheckDTO">
         SELECT oi.id, q.delivery_id, oi.flower_name, oi.flower_unit, oi.flower_color
         , oi.flower_cover, oi.num , oi.supplier_price price, oi.flower_level, oi.status
-        , (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'replace') replaceNum
-        , (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'reduce') reduceNum
-        , (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'lack') lackNum
+        , (select oic.num from t_order_item_check oic
+            where oic.order_item_id = oi.id and oic.type = 'replace'
+            and (oic.audit_status = 'AGREED' or oic.audit_status is null)
+        ) replaceNum
+        , (select oic.num from t_order_item_check oic
+            where oic.order_item_id = oi.id and oic.type = 'reduce'
+            and (oic.audit_status = 'AGREED' or oic.audit_status is null)
+        ) reduceNum
+        , (select oic.num from t_order_item_check oic
+            where oic.order_item_id = oi.id and oic.type = 'lack'
+            and (oic.audit_status = 'AGREED' or oic.audit_status is null)
+        ) lackNum
         FROM t_delivery_order_item q
         join t_order_item oi on oi.id = q.order_item_id
         WHERE q.deleted = 0 and oi.deleted = 0

--
Gitblit v1.9.3