Merge branch 'feature_mvp616_wangl' into 'develop'

Feature mvp616 wangl

See merge request !78

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

@@ -18,6 +18,7 @@ public class OrderAppointment {
 	private Timestamp actualTime;
 	private Timestamp actualTime;
 	private Timestamp startTime;
 	private Timestamp startTime;
 	private Timestamp endTime;
 	private Timestamp endTime;
+	private String pre_status;
 	private String status;
 	private String status;
 	private String memo;
 	private String memo;
 	private Timestamp createTime;
 	private Timestamp createTime;

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

@@ -120,9 +120,12 @@ public class DispatchServiceImpl implements DispatchService {
 
 
 		List<DispatchEngineerOrderListResp.EngineerInfo> egs = new ArrayList<>();
 		List<DispatchEngineerOrderListResp.EngineerInfo> egs = new ArrayList<>();
 		for (EngineerInfo e : engineers) {
 		for (EngineerInfo e : engineers) {
-			// 获取技术员指派单的订单列表
+
 			List<DispatchEngineerOrderListResp.OrderInfo> items = new ArrayList<>();
 			List<DispatchEngineerOrderListResp.OrderInfo> items = new ArrayList<>();
-			for (OrderAppointment r : engineerOrders.get(e.getEngineerCode())) {
+			// 技术员已指派的订单列表
+			List<OrderAppointment> records = engineerOrders.getOrDefault(e.getEngineerCode(), List.of());
+			// 获取技术员指派单的订单列表
+			for (OrderAppointment r : records) {
 				DispatchEngineerOrderListResp.OrderInfo item = new DispatchEngineerOrderListResp.OrderInfo();
 				DispatchEngineerOrderListResp.OrderInfo item = new DispatchEngineerOrderListResp.OrderInfo();
 				// 获取订单信息
 				// 获取订单信息
 				OrderRequest o = orders.get(r.getEngineerCode()).get(0);
 				OrderRequest o = orders.get(r.getEngineerCode()).get(0);