Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderAssignImpl.java

 package com.dituhui.pea.order.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.dituhui.pea.common.BusinessException;
 import com.dituhui.pea.common.Result;
@@ -25,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -74,7 +72,7 @@ public class OrderAssignImpl implements OrderAssign {
 
 		OrderRecommend or = new OrderRecommend();
 		for (EngineerInfo engineer : engineers) {
-			List<OrderAppointment> orderAppointments = this.queryOrderAppointments(engineer.getEngineerCode(), date);
+			List<OrderAppointment> orderAppointments = orderAppointmentMPDao.selectByEngineerCodeAndDt(engineer.getEngineerCode(), order.getDt());
 			RecommendResult rr = or.recommend(order, orderAppointments);
 			if (rr.getIndex() == -1) {
 				continue;
@@ -214,10 +212,8 @@ public class OrderAssignImpl implements OrderAssign {
 		return Result.success(null);
 	}
 
-	private List<OrderAppointment> queryOrderAppointments(String engineerCode, String date) {
-		LambdaQueryWrapper<OrderAppointment> lqw = new LambdaQueryWrapper<>();
-		lqw.eq(OrderAppointment::getEngineerCode, engineerCode);
-		return orderAppointmentMPDao.selectList(lqw);
+	private List<String> searchEngineerCodes(Integer distance, String key, String recommend){
+		return null;
 	}
 
 	private List<TimeLineDTO> packTimelines(List<OrderAppointment> orders, HashMap<String, List<LabelValueDTO>> orderTips) {