Merge branch 'feat-dingwf-mvp616' into develop

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

@@ -77,7 +77,7 @@ public class WorkbenchServiceImpl implements WorkbenchService {
         // 按日期返回技术员们当天的服务甘特图，不需要翻页
         // 按日期返回技术员们当天的服务甘特图，不需要翻页
         log.info("getEngineersGanttList: {}", reqDTO);
         log.info("getEngineersGanttList: {}", reqDTO);
         List<?> orderAppointments = orderAppointmentDao.findByDateAndEngineerCodeIn(reqDTO.getDate(), reqDTO.getEngineerCodes());
         List<?> orderAppointments = orderAppointmentDao.findByDateAndEngineerCodeIn(reqDTO.getDate(), reqDTO.getEngineerCodes());
-        HashMap<String, List<?>> mapEngineers = new HashMap<>();
+        HashMap<String, List<WorkbenchEngineersGanttRespDTO.Order>> mapEngineers = new HashMap<>();
         for (Object e : orderAppointments) {
         for (Object e : orderAppointments) {
             OrderAppointmentEntity entity = (OrderAppointmentEntity) e;
             OrderAppointmentEntity entity = (OrderAppointmentEntity) e;
             log.info("===== order_id: [{}]", entity.getOrderId());
             log.info("===== order_id: [{}]", entity.getOrderId());
@@ -88,7 +88,7 @@ public class WorkbenchServiceImpl implements WorkbenchService {
                     .setOrderStatus(entity.getStatus());
                     .setOrderStatus(entity.getStatus());
             order.setTips(getOrderTips(entity.getOrderId()));
             order.setTips(getOrderTips(entity.getOrderId()));
 
 
-            List<?> 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());
             } else {
             } else {