From 41b70b1de21eca6ad2cade92c56ae400386c628b Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期一, 14 七月 2025 16:22:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/linghu/service/impl/OrderServiceImpl.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/linghu/service/impl/OrderServiceImpl.java b/src/main/java/com/linghu/service/impl/OrderServiceImpl.java
index 11e5c29..5e2d392 100644
--- a/src/main/java/com/linghu/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/linghu/service/impl/OrderServiceImpl.java
@@ -146,28 +146,23 @@
queryWrapper.select(Orders::getClient_name) // 只查询客户名称字段
.eq(Orders::getDel_flag, 0) // 只查询未删除的订单
.groupBy(Orders::getClient_name); // 按客户名称分组去重
-
if (clientName != null && !clientName.isEmpty()) {
queryWrapper.like(Orders::getClient_name, clientName);
}
-
- // 执行分页查询
- IPage<Orders> orderPage = orderMapper.selectPage(page, queryWrapper);
+ List<Orders> orders = orderMapper.selectList(queryWrapper);
+// 执行分页查询
+// IPage<Orders> orderPage = orderMapper.selectPage(page, queryWrapper);
// 转换为客户选项列表（统计每个客户的订单数量）
- List<String> clientOptions = orderPage.getRecords().stream()
- .map(order -> {
-
-
- return order.getClient_name();
- })
+ List<String> clientOptions = orders.stream()
+ .map(Orders::getClient_name)
.collect(Collectors.toList());
// 构建结果分页对象
Page<String> resultPage = new Page<>();
- resultPage.setCurrent(orderPage.getCurrent());
- resultPage.setSize(orderPage.getSize());
- resultPage.setTotal(orderPage.getTotal());
+// resultPage.setCurrent(orderPage.getCurrent());
+// resultPage.setSize(orderPage.getSize());
+// resultPage.setTotal(orderPage.getTotal());
resultPage.setRecords(clientOptions);
return resultPage;
--
Gitblit v1.7.1