Merge branch 'feature_mvp616_wangl' into 'develop'

Feature mvp616 wangl

See merge request !58

project-interface/src/main/java/com/alibaba/cloud/integration/common/Result.java

@@ -73,11 +73,11 @@ public class Result<T> {
 		this.message = message;
 		this.message = message;
 	}
 	}
 
 
-	public T getData() {
+	public T getResult() {
 		return this.result;
 		return this.result;
 	}
 	}
 
 
-	public void setData(T result) {
+	public void setResult(T result) {
 		this.result = result;
 		this.result = result;
 	}
 	}
 
 
@@ -85,7 +85,7 @@ public class Result<T> {
 		Result<T> r = new Result<>();
 		Result<T> r = new Result<>();
 		r.setCode(code);
 		r.setCode(code);
 		r.setMessage(message);
 		r.setMessage(message);
-		r.setData(result);
+		r.setResult(result);
 		return r;
 		return r;
 	}
 	}
 }
 }

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

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
+import java.lang.management.PlatformManagedObject;
 import java.sql.Timestamp;
 import java.sql.Timestamp;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.ArrayList;
@@ -98,6 +99,8 @@ public class DispatchServiceImpl implements DispatchService {
 
 
 		List<String> orderIds = this.queryOrderAppointmentOrderIds(engineerCodes, date);
 		List<String> orderIds = this.queryOrderAppointmentOrderIds(engineerCodes, date);
 
 
+		List<OrderRequest> orders = this.queryOrderRequestByOrderId(orderIds);
+
 		return null;
 		return null;
 	}
 	}
 
 
@@ -122,6 +125,16 @@ public class DispatchServiceImpl implements DispatchService {
 		return orderRequestMPDao.selectList(lqw);
 		return orderRequestMPDao.selectList(lqw);
 	}
 	}
 
 
+	private List<OrderRequest> queryOrderRequestByOrderId(List<String> orderIds) {
+		List<OrderRequest> orders = new ArrayList<>();
+		if (orderIds.isEmpty()){
+			return orders;
+		}
+		LambdaQueryWrapper<OrderRequest> lqw = new LambdaQueryWrapper<>();
+		lqw.in(OrderRequest::getOrderId, orderIds);
+		return orderRequestMPDao.selectList(lqw);
+	}
+
 	private List<String> queryOrderAppointmentOrderIds(List<String> engineerCodes, String date) {
 	private List<String> queryOrderAppointmentOrderIds(List<String> engineerCodes, String date) {
 		// 获取工程师服务单列表
 		// 获取工程师服务单列表
 		List<String> orderIds = new ArrayList<>();
 		List<String> orderIds = new ArrayList<>();