Merge branch 'dev_orderlist0717' into 'develop'

Dev orderlist0717

See merge request !254

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

@@ -402,7 +402,7 @@ public class DispatchServiceImpl implements DispatchService {
 		lqw.eq(EngineerInfo::getBeanStatus, 1);
 		lqw.eq(EngineerInfo::getBeanStatus, 1);
 		lqw.in(ListUtils.isNotEmpty(engineerCodes), EngineerInfo::getEngineerCode, engineerCodes);
 		lqw.in(ListUtils.isNotEmpty(engineerCodes), EngineerInfo::getEngineerCode, engineerCodes);
 
 
-		String inTeamIds = teamIds.stream().map(Object::toString).collect(Collectors.joining(","));
+		String inTeamIds = "'" + teamIds.stream().map(Object::toString).collect(Collectors.joining("','")) + "'";
 		String sql = String.format("select 1 from org_team_engineer ot where ot.engineer_code = engineer_info.engineer_code and ot.team_id in (%s)", inTeamIds);
 		String sql = String.format("select 1 from org_team_engineer ot where ot.engineer_code = engineer_info.engineer_code and ot.team_id in (%s)", inTeamIds);
 		lqw.exists(sql);
 		lqw.exists(sql);
 
 

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

@@ -77,13 +77,13 @@ public class OrderAssignImpl implements OrderAssign {
 		List<OrderAssignRecommendResp.Engineer> items = new ArrayList<>();
 		List<OrderAssignRecommendResp.Engineer> items = new ArrayList<>();
 
 
 		for (EngineerInfo engineer : engineers) {
 		for (EngineerInfo engineer : engineers) {
-
 			OrderAssignCheck.Result result = orderAssignCheck.orderAssignCheck(orderId, engineer.getEngineerCode());
 			OrderAssignCheck.Result result = orderAssignCheck.orderAssignCheck(orderId, engineer.getEngineerCode());
 			log.info("指派检查结果:{}", result);
 			log.info("指派检查结果:{}", result);
 			if (!result.getCanAssign()) {
 			if (!result.getCanAssign()) {
 				continue;
 				continue;
 			}
 			}
 
 
+			// 获取已技术员已指派订单列表
 			List<OrderAppointment> orderAppointments = orderAppointmentMPDao.selectByEngineerCodeAndDt(engineer.getEngineerCode(), order.getDt());
 			List<OrderAppointment> orderAppointments = orderAppointmentMPDao.selectByEngineerCodeAndDt(engineer.getEngineerCode(), order.getDt());
 
 
 			// 获取订单tips
 			// 获取订单tips