Merge remote-tracking branch 'origin/develop' into develop

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

@@ -26,7 +26,7 @@ public enum ConstraintNameEnum {
 	 */
 	 */
 	technicianCapacityMatch,
 	technicianCapacityMatch,
 	/**
 	/**
-	 * 已分配匹配
+	 * 已分配和已排除技术员匹配
 	 */
 	 */
 	dispatchedMatch,
 	dispatchedMatch,
 
 

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

@@ -93,10 +93,14 @@ public class DispatchConstraintProvider implements ConstraintProvider {
 	}
 	}
 
 
 	protected Constraint dispatchedMatch(ConstraintFactory factory) {
 	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()))))
+		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)
 				.penalizeLong(HardSoftLongScore.ONE_HARD, customer -> 50)
 				.asConstraint(ConstraintNameEnum.dispatchedMatch.name());
 				.asConstraint(ConstraintNameEnum.dispatchedMatch.name());
 	}
 	}

project-dispatch/src/main/java/com/dituhui/pea/dispatch/pojo/Customer.java

@@ -21,8 +21,12 @@ public class Customer {
 
 
     private long id;
     private long id;
     private String code;
     private String code;
+    
     // 已分配
     // 已分配
     private String dispatchedTechnicianCode;
     private String dispatchedTechnicianCode;
+    // 已排除
+    private String exclusiveTechnicianCode;
+    
     // orderid(code)+dt 确定唯一一条工单
     // orderid(code)+dt 确定唯一一条工单
     private String dt;
     private String dt;
     @JsonIgnore
     @JsonIgnore