修改紧急程度筛选项

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

@@ -286,10 +286,20 @@ public class DispatchServiceImpl implements DispatchService {
 		lqw.in(ListUtils.isNotEmpty(reqDTO.getBranchIds()), OrderRequest::getOrgBranchId, reqDTO.getBranchIds());
 		lqw.in(ListUtils.isNotEmpty(reqDTO.getGroupIds()), OrderRequest::getOrgGroupId, reqDTO.getGroupIds());
 		lqw.in(ListUtils.isNotEmpty(reqDTO.getTeamIds()), OrderRequest::getOrgTeamId, reqDTO.getTeamIds());
-		lqw.in(ListUtils.isNotEmpty(reqDTO.getPriorities()), OrderRequest::getPriority, reqDTO.getPriorities());
 		lqw.in(ListUtils.isNotEmpty(reqDTO.getAppointmentType()), OrderRequest::getAppointmentMethod, reqDTO.getAppointmentType());
 		lqw.in(ListUtils.isNotEmpty(reqDTO.getAppointmentStatus()), OrderRequest::getAppointmentStatus, reqDTO.getAppointmentStatus());
 
+		if(ListUtils.isNotEmpty(reqDTO.getPriorities())) {
+			List<Integer> p = reqDTO.getPriorities();
+			if(p.contains(0) && p.contains(1)) {
+				lqw.ge(OrderRequest::getPriority, 1);
+			} else if (p.contains(0) && !p.contains(1)) {
+				lqw.le(OrderRequest::getPriority, 1);
+			} else if (p.contains(1) && p.contains(0)) {
+				lqw.ge(OrderRequest::getPriority, 5);
+			}
+		}
+
 		if (ListUtils.isNotEmpty(reqDTO.getTypeCategory())) {
 			String types = "'" + String.join("','", reqDTO.getTypeCategory()) + "'";
 			String sql = String.format("select 1 from skill_info sk where sk.brand = order_request.brand and sk.type = order_request.type and sk.skill = order_request.skill and type_category in (%s)", types);

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

@@ -56,10 +56,20 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
 		lqw.in(ListUtils.isNotEmpty(reqDTO.getBranchIds()), OrderRequest::getOrgBranchId, reqDTO.getBranchIds());
 		lqw.in(ListUtils.isNotEmpty(reqDTO.getGroupIds()), OrderRequest::getOrgGroupId, reqDTO.getGroupIds());
 		lqw.in(ListUtils.isNotEmpty(reqDTO.getTeamIds()), OrderRequest::getOrgTeamId, reqDTO.getTeamIds());
-		lqw.in(ListUtils.isNotEmpty(reqDTO.getPriorities()), OrderRequest::getPriority, reqDTO.getPriorities());
 		lqw.in(ListUtils.isNotEmpty(reqDTO.getAppointmentType()), OrderRequest::getAppointmentMethod, reqDTO.getAppointmentType());
 		lqw.in(ListUtils.isNotEmpty(reqDTO.getAppointmentStatus()), OrderRequest::getAppointmentStatus, reqDTO.getAppointmentStatus());
 
+		if(ListUtils.isNotEmpty(reqDTO.getPriorities())) {
+			List<Integer> p = reqDTO.getPriorities();
+			if(p.contains(0) && p.contains(1)) {
+				lqw.ge(OrderRequest::getPriority, 1);
+			} else if (p.contains(0) && !p.contains(1)) {
+				lqw.le(OrderRequest::getPriority, 1);
+			} else if (p.contains(1) && p.contains(0)) {
+				lqw.ge(OrderRequest::getPriority, 5);
+			}
+		}
+
 		if (ListUtils.isNotEmpty(reqDTO.getTypeCategory())) {
 			String types = "'" + String.join("','", reqDTO.getTypeCategory()) + "'";
 			String sql = String.format("select 1 from skill_info sk where sk.brand = order_request.brand and sk.type = order_request.type and sk.skill = order_request.skill and type_category in (%s)", types);