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 bd06cc2d..c84681a0 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;