Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr…

…oject.git into develop

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

@@ -20,8 +20,8 @@ public class DispatchOrderListReq {
 	private List<String> teamIds;
 	private List<String> engineerCodes;
 	private List<Integer> priorities;
-	private List<String> productCategory;
-	private List<String> serviceCategory;
+	private List<String> typeCategory;
+	private List<String> skillCategory;
 	private String phone;
 	private String orderId;
 	private List<String> appointmentStatus;

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

@@ -26,8 +26,8 @@ public class OrderServiceListReq {
 	private List<String> teamIds;
 	private List<String> engineerCodes;
 	private List<Integer> priorities;
-	private List<String> productCategory;
-	private List<String> serviceCategory;
+	private List<String> typeCategory;
+	private List<String> skillCategory;
 	private String phone;
 	private String orderId;
 	private List<String> appointmentStatus;

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

@@ -287,13 +287,23 @@ public class DispatchServiceImpl implements DispatchService {
 		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.getProductCategory()), OrderRequest::getType, reqDTO.getProductCategory());
-		lqw.in(ListUtils.isNotEmpty(reqDTO.getProductCategory()), OrderRequest::getSkill, reqDTO.getServiceCategory());
 		lqw.in(ListUtils.isNotEmpty(reqDTO.getAppointmentType()), OrderRequest::getAppointmentMethod, reqDTO.getAppointmentType());
 		lqw.in(ListUtils.isNotEmpty(reqDTO.getAppointmentStatus()), OrderRequest::getAppointmentStatus, reqDTO.getAppointmentStatus());
 
+		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);
+			lqw.exists(sql);
+		}
+
+		if (ListUtils.isNotEmpty(reqDTO.getSkillCategory())) {
+			String skills = "'" + String.join("','", reqDTO.getSkillCategory()) + "'";
+			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 skill_category in (%s)", skills);
+			lqw.exists(sql);
+		}
+
 		if(ListUtils.isNotEmpty(reqDTO.getEngineerCodes())) {
-			String engineerCodes = String.join(",", reqDTO.getEngineerCodes());
+			String engineerCodes = "'" + String.join("','", reqDTO.getEngineerCodes()) + "'";
 			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);
 		}

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

@@ -57,13 +57,23 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
 		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.getProductCategory()), OrderRequest::getType, reqDTO.getProductCategory());
-		lqw.in(ListUtils.isNotEmpty(reqDTO.getProductCategory()), OrderRequest::getSkill, reqDTO.getServiceCategory());
 		lqw.in(ListUtils.isNotEmpty(reqDTO.getAppointmentType()), OrderRequest::getAppointmentMethod, reqDTO.getAppointmentType());
 		lqw.in(ListUtils.isNotEmpty(reqDTO.getAppointmentStatus()), OrderRequest::getAppointmentStatus, reqDTO.getAppointmentStatus());
 
-		if(ListUtils.isNotEmpty(reqDTO.getEngineerCodes())) {
-			String engineerCodes = String.join(",", reqDTO.getEngineerCodes());
+		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);
+			lqw.exists(sql);
+		}
+
+		if (ListUtils.isNotEmpty(reqDTO.getSkillCategory())) {
+			String skills = "'" + String.join("','", reqDTO.getSkillCategory()) + "'";
+			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 skill_category in (%s)", skills);
+			lqw.exists(sql);
+		}
+
+		if (ListUtils.isNotEmpty(reqDTO.getEngineerCodes())) {
+			String engineerCodes = "'" + String.join("','", reqDTO.getEngineerCodes()) + "'";
 			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);
 		}