From 630a1b4dd4de45b43bca9a69aa4b2d048d60998b Mon Sep 17 00:00:00 2001 From: "kuang.yifei@iwhalecloud.com" Date: Wed, 15 Jun 2022 16:43:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/web/controller/order/OrderDetailController.java | 1 + ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandard.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index 174fb1cb..f195bd1f 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -195,6 +195,7 @@ public class OrderDetailController extends BaseController { orderStandard.setStandardNum(orderGoods.getGoodsNum()); orderStandard.setServerNum(orderGoods.getServerGoodsNum()); orderStandard.setFinishTime(orderGoods.getFinishTime()); + orderStandard.setWaitServerNum(orderGoods.getGoodsNum() - orderGoods.getServerGoodsNum()); standardList.add(orderStandard); } diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandard.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandard.java index af6aa646..e0ae4080 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandard.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandard.java @@ -14,6 +14,8 @@ public class OrderStandard { private Integer serverNum; + private Integer waitServerNum; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date finishTime;