Merge branch 'feat-dingwf-mvp616' into develop

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

@@ -60,9 +60,9 @@ public class WorkbenchEngineersGanttRespDTO {
          */
          */
         private String orderStatus;
         private String orderStatus;
         /**
         /**
-         * 工单状态描述
+         * 派单状态
          */
          */
-        private String orderStatusDesc;
+        private String appointmentStatus;
         /**
         /**
          * 开始时间
          * 开始时间
          */
          */

project-order/src/main/java/com/alibaba/cloud/integration/order/interceptor/RequestInterceptor.java

@@ -44,7 +44,7 @@ public class RequestInterceptor implements HandlerInterceptor {
         // 打印请求的 IP
         // 打印请求的 IP
         log.info("Request IP             : {}", request.getRemoteAddr());
         log.info("Request IP             : {}", request.getRemoteAddr());
         // 打印请求入参
         // 打印请求入参
-        log.info("Request Args   : {}", joinPoint.getArgs());
+        log.info("Request Args   : {}", new ObjectMapper().writeValueAsString(joinPoint.getArgs()));
     }
     }
 
 
     /**
     /**

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

@@ -83,7 +83,7 @@ public class WorkbenchServiceImpl implements WorkbenchService {
             order.setStartTime(entity.getExpectStartTime()).setEndTime(entity.getExpectEndTime());
             order.setStartTime(entity.getExpectStartTime()).setEndTime(entity.getExpectEndTime());
             order.setOrderId(entity.getOrderId()).setOrderStatus(entity.getStatus());
             order.setOrderId(entity.getOrderId()).setOrderStatus(entity.getStatus());
             order.setTips(getOrderTips(entity.getOrderId()));
             order.setTips(getOrderTips(entity.getOrderId()));
-
+            //todo 查询order-request表，获取 appointment_status字段
             List<WorkbenchEngineersGanttRespDTO.Order> orders = null;
             List<WorkbenchEngineersGanttRespDTO.Order> orders = null;
             if (mapEngineers.containsKey(entity.getEngineerCode())) {
             if (mapEngineers.containsKey(entity.getEngineerCode())) {
                 orders = mapEngineers.get(entity.getEngineerCode());
                 orders = mapEngineers.get(entity.getEngineerCode());