Merge branch 'dev_dispatch_filter0711' into 'develop'

修改

See merge request !205

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

@@ -61,19 +61,19 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
 		lqw.in(ListUtils.isNotEmpty(reqDTO.getAppointmentStatus()), OrderRequest::getAppointmentStatus, reqDTO.getAppointmentStatus());
 		lqw.in(ListUtils.isNotEmpty(reqDTO.getAppointmentStatus()), OrderRequest::getAppointmentStatus, reqDTO.getAppointmentStatus());
 
 
 		if (ListUtils.isNotEmpty(reqDTO.getTypeCategory())) {
 		if (ListUtils.isNotEmpty(reqDTO.getTypeCategory())) {
-			String types = String.join(",", 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);
 			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);
 			lqw.exists(sql);
 		}
 		}
 
 
 		if (ListUtils.isNotEmpty(reqDTO.getSkillCategory())) {
 		if (ListUtils.isNotEmpty(reqDTO.getSkillCategory())) {
-			String skills = String.join(",", 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);
 			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);
 			lqw.exists(sql);
 		}
 		}
 
 
 		if (ListUtils.isNotEmpty(reqDTO.getEngineerCodes())) {
 		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);
 			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);
 		}
 		}