Merge branch 'dev_dispatch_filter0711' into 'develop'

新增自有/加盟点筛选

See merge request !207

project-order/src/main/java/com/dituhui/pea/order/dto/DispatchOrderListReq.java

@@ -22,6 +22,7 @@ public class DispatchOrderListReq {
 	private List<Integer> priorities;
 	private List<Integer> priorities;
 	private List<String> typeCategory;
 	private List<String> typeCategory;
 	private List<String> skillCategory;
 	private List<String> skillCategory;
+	private List<Integer> groupCategory;
 	private String phone;
 	private String phone;
 	private String orderId;
 	private String orderId;
 	private List<String> appointmentStatus;
 	private List<String> appointmentStatus;

project-order/src/main/java/com/dituhui/pea/order/dto/OrderServiceListReq.java

@@ -28,6 +28,7 @@ public class OrderServiceListReq {
 	private List<Integer> priorities;
 	private List<Integer> priorities;
 	private List<String> typeCategory;
 	private List<String> typeCategory;
 	private List<String> skillCategory;
 	private List<String> skillCategory;
+	private List<Integer> groupCategory;
 	private String phone;
 	private String phone;
 	private String orderId;
 	private String orderId;
 	private List<String> appointmentStatus;
 	private List<String> appointmentStatus;

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

@@ -307,6 +307,11 @@ public class DispatchServiceImpl implements DispatchService {
 			String sql = String.format("select 1 from order_appointment oa where oa.order_id = order_request.order_id and oa.dt = order_request.dt and oa.engineer_code in (%s)", engineerCodes);
 			String sql = String.format("select 1 from order_appointment oa where oa.order_id = order_request.order_id and oa.dt = order_request.dt and oa.engineer_code in (%s)", engineerCodes);
 			lqw.exists(sql);
 			lqw.exists(sql);
 		}
 		}
+		if (ListUtils.isNotEmpty(reqDTO.getGroupCategory())) {
+			String groupCategory = reqDTO.getGroupCategory().stream().map(Object::toString).collect(Collectors.joining(","));
+			String sql = String.format("select 1 from org_group g where g.group_id = order_request.org_group_id and g.category in (%s)", groupCategory);
+			lqw.exists(sql);
+		}
 
 
 		return orderRequestMPDao.selectList(lqw);
 		return orderRequestMPDao.selectList(lqw);
 	}
 	}

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

@@ -78,6 +78,12 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
 			lqw.exists(sql);
 			lqw.exists(sql);
 		}
 		}
 
 
+		if (ListUtils.isNotEmpty(reqDTO.getGroupCategory())) {
+			String groupCategory = reqDTO.getGroupCategory().stream().map(Object::toString).collect(Collectors.joining(","));
+			String sql = String.format("select 1 from org_group g where g.group_id = order_request.org_group_id and g.category in (%s)", groupCategory);
+			lqw.exists(sql);
+		}
+
 		// 查询工单表列表
 		// 查询工单表列表
 		orderRequestMPDao.selectPage(pg, lqw);
 		orderRequestMPDao.selectPage(pg, lqw);