2023年1月4日18:25:19

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/partsapp/AppPartsController.java

@@ -186,7 +186,7 @@ public class AppPartsController extends BladeController {
 				lambdaQueryWrapper.orderByDesc(Order::getConfirmStatus);
 			}
 		} else {
-			lambdaQueryWrapper.orderByDesc(Order::getId);
+			lambdaQueryWrapper.orderByDesc(Order::getStatus);
 		}
 		IPage<Order> page = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 
@@ -503,8 +503,8 @@ public class AppPartsController extends BladeController {
 			lambdaQueryWrapper.ge(Order::getBusinesDate, order.getBusinesDateList().get(0));
 			lambdaQueryWrapper.le(Order::getBusinesDate, order.getBusinesDateList().get(1));
 		}
-		lambdaQueryWrapper.eq(Func.isNotEmpty(order.getBillType()), Order::getBillType, order.getBillType());
-		lambdaQueryWrapper.eq(Func.isNotEmpty(order.getTradeType()), Order::getTradeType, order.getTradeType());
+		lambdaQueryWrapper.eq( Order::getBillType, "XS");
+		lambdaQueryWrapper.eq( Order::getTradeType, "YPJ");
 		IPage<Order> page = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 
 		String corpIds = "";//客户拼接