Merge branch 'feature_OrderServiceList_wangl' into 'develop'

数据库表字段变更

See merge request !8

project-order/src/main/java/com/alibaba/cloud/integration/order/entity/OrderRequest.java

@@ -30,7 +30,8 @@ public class OrderRequest {
 	private String orderTags;
 	private String tags;
 	private String status;
-	private String statusAppointment;
+	private String appointmentStatus;
+	private String appointmentMethod;
 	private String orgClusterId;
 	private String orgClusterName;
 	private String orgBranchId;

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/OrderServiceListServiceImpl.java

@@ -43,7 +43,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
 		LambdaQueryWrapper<OrderRequest> lqw = new LambdaQueryWrapper<>();
 		lqw.ge(OrderRequest::getExpectTimeBegin, this.GetTimestampFromDate(startDate));  //预约开始日期
 		lqw.le(OrderRequest::getExpectTimeBegin, this.GetTimestampFromDate(endDate)); //预约结束日期
-		lqw.eq(Strings.isNotEmpty(appointmentStatus), OrderRequest::getStatusAppointment, appointmentStatus); //指派状态
+		lqw.eq(Strings.isNotEmpty(appointmentStatus), OrderRequest::getAppointmentStatus, appointmentStatus); //指派状态
 		lqw.eq(Strings.isNotEmpty(type), OrderRequest::getType, type); //设备类型
 		lqw.eq(Strings.isNotEmpty(brand), OrderRequest::getBrand, brand); //品牌
 		lqw.eq(Strings.isNotEmpty(skill), OrderRequest::getSkill, skill); //技能