From 6172a682abd46f76d4f083782bc383daae05bb96 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Mon, 27 Mar 2023 22:20:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E4=B8=AD=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=8A=E8=AE=A2=E5=8D=95=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8E=92=E9=99=A4workFinishTime=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ghy/web/controller/order/OrderController.java  | 2 ++
 .../src/main/java/com/ghy/order/domain/OrderDetail.java     | 2 ++
 .../src/main/resources/mapper/order/OrderDetailMapper.xml   | 6 ++++++
 3 files changed, 10 insertions(+)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index d96e8600..3eb92efc 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -662,7 +662,9 @@ public class OrderController extends BaseController {
             response.setServingOrderNum(orderDetailService.countOrderDetailList(orderDetail));
             // 统计待确认单量
             orderDetail.setOrderStatus(OrderStatus.FINISH_CHECK.code());
+            orderDetail.setWorkFinishTimeExisted(true);
             response.setWaitSureOrderNum(orderDetailService.countOrderDetailList(orderDetail));
+            orderDetail.setWorkFinishTimeExisted(false);
             // 统计已完成子单量
             orderDetail.setOrderStatus(OrderStatus.FINISH.code());
             response.setFinishedOrderNum(orderDetailService.countOrderDetailList(orderDetail));
diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
index c8b5733a..c12ed3be 100644
--- a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
+++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
@@ -128,4 +128,6 @@ public class OrderDetail extends BaseEntity {
     private BigDecimal financialMasterMoney;
     private BigDecimal financialDetailMoney;
     private BigDecimal changeMoney;
+
+    private boolean workFinishTimeExisted;
 }
diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
index b253d43a..e9788e59 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
@@ -140,6 +140,9 @@
             <if test="drawCashStatus != null">
                 AND od.draw_cash_status = ${drawCashStatus}
             </if>
+            <if test="workFinishTimeExisted">
+                AND od.work_finish_time is not null
+            </if>
         </where>
         order by od.create_time
         <trim suffixOverrides=",">
@@ -193,6 +196,9 @@
             <if test="shelveStatus != null">
                 AND od.shelve_status = ${shelveStatus}
             </if>
+            <if test="workFinishTimeExisted">
+                AND od.work_finish_time is not null
+            </if>
         </where>
         order by od.create_time
         <trim suffixOverrides=",">