接口变更

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

@@ -30,6 +30,6 @@ public class OrderServiceListReq {
 	private List<String> serviceCategory;
 	private String phone;
 	private String orderId;
-	private String appointmentStatus;
-	private String appointmentType;
+	private List<String> appointmentStatus;
+	private List<String> appointmentType;
 }
\ No newline at end of file

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

@@ -59,13 +59,8 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
 		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.eq(StringUtils.isNotEmpty(reqDTO.getAppointmentType()), OrderRequest::getAppointmentMethod, reqDTO.getAppointmentType()); //指派状态
-		if (StringUtils.isNotEmpty(reqDTO.getAppointmentStatus()) && reqDTO.getAppointmentStatus().equals("0")) {
-			lqw.eq(OrderRequest::getAppointmentStatus, "NOT_ASSIGNED");
-		} else if (StringUtils.isNotEmpty(reqDTO.getAppointmentStatus()) && reqDTO.getAppointmentStatus().equals("1")) {
-			lqw.ne(OrderRequest::getAppointmentStatus, "NOT_ASSIGNED");
-		}
+		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());