From 42f3840facd16813f216ac8451345a942505bb7a Mon Sep 17 00:00:00 2001 From: donqi Date: Fri, 17 Jun 2022 18:33:03 +0800 Subject: [PATCH] =?UTF-8?q?detail=E8=A1=A8=E6=9B=B4=E6=96=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ghy/web/controller/order/OrderDetailController.java | 7 ++++--- .../main/java/com/ghy/web/pojo/vo/OrderListResponse.java | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) 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 7f08543f..ca18dfdd 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 @@ -140,7 +140,6 @@ public class OrderDetailController extends BaseController { orderListResponse.setWorkerPhone(worker.getPhone()); orderListResponse.setCustomerName(customer.getName()); orderListResponse.setCustomerPhone(customer.getPhone()); - orderListResponse.setServerTime(detail.getWorkBeginTime()); orderListResponse.setOrderStatus(detail.getOrderStatus()); orderListResponse.setPayStatus(orderMaster.getPayStatus()); orderListResponse.setPayType(orderMaster.getPayType()); @@ -148,6 +147,8 @@ public class OrderDetailController extends BaseController { orderListResponse.setAddress(customerAddress.getAddress()); orderListResponse.setServerTime(detail.getRevTime()); orderListResponse.setCreateTime(detail.getCreateTime()); + orderListResponse.setWorkBeginTime(detail.getWorkBeginTime()); + orderListResponse.setWorkFinishTime(detail.getWorkFinishTime()); return AjaxResult.success(orderListResponse); }catch (Exception e){ @@ -216,15 +217,15 @@ public class OrderDetailController extends BaseController { orderListResponse.setWorkerPhone(worker.getPhone()); orderListResponse.setCustomerName(customer.getName()); orderListResponse.setCustomerPhone(customer.getPhone()); - orderListResponse.setServerTime(detail.getWorkBeginTime()); orderListResponse.setOrderStatus(detail.getOrderStatus()); orderListResponse.setPayStatus(orderMaster.getPayStatus()); orderListResponse.setPayType(orderMaster.getPayType()); orderListResponse.setStandardList(standardList); orderListResponse.setAddress(customerAddress.getAddress()); orderListResponse.setServerTime(detail.getRevTime()); + orderListResponse.setWorkBeginTime(detail.getWorkBeginTime()); + orderListResponse.setWorkFinishTime(detail.getWorkFinishTime()); orderListResponses.add(orderListResponse); - }); return voDataTable(orderListResponses, list); } diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java index 2c0d781f..7d95cf42 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java @@ -28,6 +28,10 @@ public class OrderListResponse { private Date serverTime; + private Date workBeginTime; + + private Date workFinishTime; + private String goodsName; private Integer orderStatus;