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 @@ AND od.draw_cash_status = ${drawCashStatus} + + AND od.work_finish_time is not null + order by od.create_time @@ -193,6 +196,9 @@ AND od.shelve_status = ${shelveStatus} + + AND od.work_finish_time is not null + order by od.create_time