fix: 修复指定排除工程师逻辑

project-dispatch/src/main/java/com/dituhui/pea/dispatch/constraint/DispatchConstraintProvider.java

@@ -93,16 +93,18 @@ public class DispatchConstraintProvider implements ConstraintProvider {
                 .asConstraint(ConstraintNameEnum.technicianCapacityMatch.name());
                 .asConstraint(ConstraintNameEnum.technicianCapacityMatch.name());
     }
     }
 
 
-    protected Constraint dispatchedMatch(ConstraintFactory factory) {
-        return factory.forEach(Customer.class).filter(customer ->
-                        // 已分配
-                        (customer.getDispatchedTechnicianCode() != null
-                                && (customer.getTechnician() == null || !StringUtils.equals(customer.getDispatchedTechnicianCode(), customer.getTechnician().getCode())))
-                                || (customer.getExclusiveTechnicianCode() != null
-                                && (customer.getTechnician() == null || StrUtil.contains("," + customer.getExclusiveTechnicianCode() + ",", "," + customer.getTechnician().getCode() + ","))))
-                .penalizeLong(HardSoftLongScore.ONE_HARD, customer -> 50)
-                .asConstraint(ConstraintNameEnum.dispatchedMatch.name());
-    }
+	protected Constraint dispatchedMatch(ConstraintFactory factory) {
+		return factory.forEach(Customer.class).filter(customer ->
+		// 已分配但是分给了别人
+		(customer.getDispatchedTechnicianCode() != null && customer.getTechnician() != null
+				&& !StringUtils.equals(customer.getDispatchedTechnicianCode(), customer.getTechnician().getCode())) ||
+		// 已排除但是分给了这个人
+				(customer.getExclusiveTechnicianCode() != null && customer.getTechnician() != null
+						&& StringUtils.equals(customer.getExclusiveTechnicianCode(),
+								customer.getTechnician().getCode())))
+				.penalizeLong(HardSoftLongScore.ONE_HARD, customer -> 50)
+				.asConstraint(ConstraintNameEnum.dispatchedMatch.name());
+	}
 
 
 //	protected Constraint customerTimeWindowsMatch1(ConstraintFactory factory) {
 //	protected Constraint customerTimeWindowsMatch1(ConstraintFactory factory) {
 //		return factory.forEach(Customer.class).filter(
 //		return factory.forEach(Customer.class).filter(

project-dispatch/src/main/java/com/dituhui/pea/dispatch/service/impl/SolveServiceImpl.java

@@ -271,6 +271,11 @@ public class SolveServiceImpl implements SolveService {
                 customer.setExclusiveTechnicianCode(Objects.nonNull(orderInfo.getAppointEngineerCodes()) ?
                 customer.setExclusiveTechnicianCode(Objects.nonNull(orderInfo.getAppointEngineerCodes()) ?
                         orderInfo.getAppointEngineerCodes().trim() : null);
                         orderInfo.getAppointEngineerCodes().trim() : null);
             }
             }
+            
+			log.info(
+					"订单指定排除工程师, teamId:{}, batchNo:{}, orderId:{}, dispatchedTechnicianCode:{}, exclusiveTechnicianCode:{}",
+					teamId, batchNo, order.getOrderId(), customer.getDispatchedTechnicianCode(),
+					customer.getExclusiveTechnicianCode());
 
 
             customerList.add(customer);
             customerList.add(customer);
         });
         });