Merge branch 'feat-dingwf-mvp616' into develop

project-order/src/main/java/com/alibaba/cloud/integration/order/dto/WorkbenchEngineersGanttRespDTO.java

 package com.alibaba.cloud.integration.order.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
@@ -63,6 +64,7 @@ public class WorkbenchEngineersGanttRespDTO {
         /**
          * 开始时间
          */
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
         private Date startTime;
         /**
          * 结束时间

project-order/src/main/java/com/alibaba/cloud/integration/order/entity/OrderAppointmentEntity.java

@@ -60,8 +60,9 @@ public class OrderAppointmentEntity {
     /**
      * 客户预约上门时间
      */
-    private Date expectTime;
+    private Date expectBeginTime;
 
+    private Date expectEndTime;
     /**
      * 实际上门时间
      */
@@ -70,12 +71,12 @@ public class OrderAppointmentEntity {
     /**
      * 开始服务时间
      */
-    private Date startTime;
+    private Date actualStartTime;
 
     /**
      * 结束服务时间
      */
-    private Date endTime;
+    private Date actualEndTime;
 
     /**
      * pre-预排班/confirm-已确认

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/WorkbenchServiceImpl.java

@@ -82,12 +82,9 @@ public class WorkbenchServiceImpl implements WorkbenchService {
             OrderAppointmentEntity entity = (OrderAppointmentEntity) e;
             log.info("===== order_id: [{}]", entity.getOrderId());
             WorkbenchEngineersGanttRespDTO.Order order = new WorkbenchEngineersGanttRespDTO.Order();
-            order.setStartTime(entity.getStartTime())
-                    .setEndTime(entity.getEndTime())
-                    .setOrderId(entity.getOrderId())
-                    .setOrderStatus(entity.getStatus())
-                    .setStartTime(entity.getStartTime())
-                    .setEndTime(entity.getEndTime());
+            // todo 需要根据订单时间和状态，采用expectXXXX或者actualXXXX
+            order.setStartTime(entity.getExpectBeginTime()).setEndTime(entity.getExpectEndTime());
+            order.setOrderId(entity.getOrderId()).setOrderStatus(entity.getStatus());
             order.setTips(getOrderTips(entity.getOrderId()));
 
             List<WorkbenchEngineersGanttRespDTO.Order> orders = null;
@@ -105,8 +102,8 @@ public class WorkbenchServiceImpl implements WorkbenchService {
             EngineerInfoEntity engineerInfo = engineerInfoDao.getByEngineerCode(engineerCode);
             WorkbenchEngineersGanttRespDTO.GanttChart engineer = new WorkbenchEngineersGanttRespDTO.GanttChart();
             engineer.setEngineerCode(engineerCode)
-                    .setStartTime(String.format("%s 00:00", reqDTO.getDate()))
-                    .setEndTime(String.format("%s 23:59", reqDTO.getDate()))
+                    .setStartTime(String.format("%s 08:00", reqDTO.getDate()))
+                    .setEndTime(String.format("%s 18:00", reqDTO.getDate()))
                     .setHoliday(false) // todo
                     .setOrders(mapEngineers.get(engineerCode))
                     .setEngineerName(engineerInfo.getName())