Merge branch 'feat-dingwf-mvp616' into develop

project-order/src/main/java/com/alibaba/cloud/integration/order/controller/WorkbenchController.java

@@ -29,8 +29,9 @@ public class WorkbenchController {
         return res;
         return res;
     }
     }
 
 
-    @GetMapping("/workbench/engineer/schedule/gantt")
+    @GetMapping("/engineer/schedule/gantt")
     public Result<?> getEngineersGanttList(@Validated WorkbenchEngineersGanttReqDTO reqDTO) {
     public Result<?> getEngineersGanttList(@Validated WorkbenchEngineersGanttReqDTO reqDTO) {
+        // todo 待移到 controller的engineer中
         log.info("getEngineersGanttList: {}", reqDTO);
         log.info("getEngineersGanttList: {}", reqDTO);
         Result<?> res = null;
         Result<?> res = null;
         try {
         try {

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

@@ -80,7 +80,7 @@ public class OrderAppointmentEntity {
     /**
     /**
      * pre-预排班/confirm-已确认
      * pre-预排班/confirm-已确认
      */
      */
-    private String preState;
+    private String preStatus;
 
 
     /**
     /**
      * bean预约单状态（pre-预指派/虚拟指派 contact-已联系 depart-已出发 start-已开始 finish-已完成 undone-已上门未完成 reschedule-已改约）
      * bean预约单状态（pre-预指派/虚拟指派 contact-已联系 depart-已出发 start-已开始 finish-已完成 undone-已上门未完成 reschedule-已改约）