Merge branch 'dev_rescheduling20230711' into 'develop'

修改

See merge request !197

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

@@ -25,6 +25,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 javax.annotation.Resource;
 import java.sql.Timestamp;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.ArrayList;
@@ -52,6 +53,9 @@ public class OrderAssignImpl implements OrderAssign {
 	@Autowired
 	@Autowired
 	private OrderEventMPDao orderEventMPDao;
 	private OrderEventMPDao orderEventMPDao;
 
 
+	@Resource
+	private OrderAssignCheck orderAssignCheck;
+
 	@Transactional
 	@Transactional
 	@Override
 	@Override
 	public Result<?> getOrderAssignRecommendEngineers(String orderId, String key, String distance, String recommend) {
 	public Result<?> getOrderAssignRecommendEngineers(String orderId, String key, String distance, String recommend) {
@@ -131,8 +135,7 @@ public class OrderAssignImpl implements OrderAssign {
 			throw new BusinessException(String.format("订单已指派个技术员[%s], 不必重复指派给同一个技术员", engineer.getName()));
 			throw new BusinessException(String.format("订单已指派个技术员[%s], 不必重复指派给同一个技术员", engineer.getName()));
 		}
 		}
 
 
-		OrderAssignCheck ck = new OrderAssignCheck();
-		OrderAssignCheck.Result result = ck.orderAssignCheck(orderId, engineerCode);
+		OrderAssignCheck.Result result = orderAssignCheck.orderAssignCheck(orderId, engineerCode);
 		log.info("指派检查结果:{}", result);
 		log.info("指派检查结果:{}", result);
 		if(!result.getCanAssign()){
 		if(!result.getCanAssign()){
 			throw new BusinessException("指派失败, 未能找到合适的时间段, 请选择其他技术员");
 			throw new BusinessException("指派失败, 未能找到合适的时间段, 请选择其他技术员");