|
@@ -605,14 +605,14 @@ public class OrderClothController extends BaseController {
|
|
|
if (StringUtils.isNotEmpty(orderClothQueryDTO.getIsAppointment())) {
|
|
|
queryWrapper.eq(OrderCloth::getIsAppointment, orderClothQueryDTO.getIsAppointment());
|
|
|
}
|
|
|
- queryWrapper.and(orderClothLambdaQueryWrapper -> orderClothLambdaQueryWrapper
|
|
|
- .eq(OrderCloth::getOrderStatus, ClothOrderStatusType.WAITING_FOR_PAY.getCode()).or()
|
|
|
- .eq(OrderCloth::getOrderStatus, ClothOrderStatusType.WASHING.getCode()).or()
|
|
|
- .eq(OrderCloth::getOrderStatus, ClothOrderStatusType.HAS_WASH.getCode()).or()
|
|
|
- .eq(OrderCloth::getOrderStatus, ClothOrderStatusType.WAITING_TO_SEND.getCode()).or()
|
|
|
- .eq(OrderCloth::getOrderStatus, ClothOrderStatusType.SENDING.getCode()).or()
|
|
|
- .eq(OrderCloth::getOrderStatus, ClothOrderStatusType.WAITING_FOR_COMMENT.getCode()).or()
|
|
|
- .eq(OrderCloth::getOrderStatus, ClothOrderStatusType.FINISH.getCode()));
|
|
|
+// queryWrapper.and(orderClothLambdaQueryWrapper -> orderClothLambdaQueryWrapper
|
|
|
+// .eq(OrderCloth::getOrderStatus, ClothOrderStatusType.WAITING_FOR_PAY.getCode()).or()
|
|
|
+// .eq(OrderCloth::getOrderStatus, ClothOrderStatusType.WASHING.getCode()).or()
|
|
|
+// .eq(OrderCloth::getOrderStatus, ClothOrderStatusType.HAS_WASH.getCode()).or()
|
|
|
+// .eq(OrderCloth::getOrderStatus, ClothOrderStatusType.WAITING_TO_SEND.getCode()).or()
|
|
|
+// .eq(OrderCloth::getOrderStatus, ClothOrderStatusType.SENDING.getCode()).or()
|
|
|
+// .eq(OrderCloth::getOrderStatus, ClothOrderStatusType.WAITING_FOR_COMMENT.getCode()).or()
|
|
|
+// .eq(OrderCloth::getOrderStatus, ClothOrderStatusType.FINISH.getCode()));
|
|
|
if (StringUtils.isNotEmpty(orderClothQueryDTO.getOrderStatus())) {
|
|
|
if (ClothOrderStatusType.FINISH.getCode().equals(orderClothQueryDTO.getOrderStatus())) {
|
|
|
queryWrapper.and(orderClothLambdaQueryWrapper -> orderClothLambdaQueryWrapper
|