From 3b2da9fbba7117514c9c52ab68977977ad205e86 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 06 六月 2025 15:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/basic/controller/CustomerController.java | 14 +++----
src/main/java/com/ruoyi/basic/service/ICustomerService.java | 6 ++
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 52 ++++++++++++++++++++------
3 files changed, 51 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerController.java b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
index c1c66d9..be5f92a 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
@@ -1,5 +1,7 @@
package com.ruoyi.basic.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.service.ICustomerService;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -7,7 +9,6 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -30,10 +31,8 @@
* 鏌ヨ瀹㈡埛妗ｆ鍒楄〃
*/
@GetMapping("/list")
- public TableDataInfo list(Customer customer) {
- startPage();
- List<Customer> list = customerService.selectCustomerList(customer);
- return getDataTable(list);
+ public IPage<Customer> list(Page page, Customer customer) {
+ return customerService.selectCustomerList(page, customer);
}
/**
@@ -47,8 +46,7 @@
if (ids != null && ids.length > 0) {
list = customerService.selectCustomerListByIds(ids);
} else {
-
- list = customerService.selectCustomerList(customer);
+ list = customerService.selectCustomerLists(customer);
}
ExcelUtil<Customer> util = new ExcelUtil<Customer>(Customer.class);
util.exportExcel(response, list, "瀹㈡埛妗ｆ鏁版嵁");
@@ -97,6 +95,6 @@
*/
@GetMapping("/customerList")
public List customerList(Customer customer) {
- return customerService.customerList(customer);
+ return customerService.customerList(customer);
}
}
diff --git a/src/main/java/com/ruoyi/basic/service/ICustomerService.java b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
index 790c975..e4d9c2b 100644
--- a/src/main/java/com/ruoyi/basic/service/ICustomerService.java
+++ b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
@@ -1,5 +1,7 @@
package com.ruoyi.basic.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.pojo.Customer;
@@ -26,7 +28,7 @@
* @param customer 瀹㈡埛妗ｆ
* @return 瀹㈡埛妗ｆ闆嗗悎
*/
- List<Customer> selectCustomerList(Customer customer);
+ IPage<Customer> selectCustomerList(Page page, Customer customer);
/**
* 鏂板瀹㈡埛妗ｆ
@@ -60,4 +62,6 @@
* @return 缁撴灉
*/
List customerList(Customer customer);
+
+ List<Customer> selectCustomerLists(Customer customer);
}
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
index b0b1e56..afc1c30 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -2,9 +2,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
import com.ruoyi.basic.mapper.CustomerMapper;
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.service.ICustomerService;
@@ -18,6 +19,7 @@
import java.util.Arrays;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
@@ -51,19 +53,40 @@
* @return 瀹㈡埛妗ｆ
*/
@Override
- public List<Customer> selectCustomerList(Customer customer) {
- LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
-
- if (StringUtils.isNotBlank(customer.getCustomerName())) {
- queryWrapper.like(Customer::getCustomerName, customer.getCustomerName());
+ public IPage<Customer> selectCustomerList(Page page, Customer customer) {
+ // 1. 澶勭悊绌哄�煎満鏅紙鍙傛暟鏍￠獙锛�
+ if (page == null) {
+ page = Page.of(1, 10); // 榛樿绗�1椤碉紝姣忛〉10鏉℃暟鎹�
+ }
+ if (customer == null) {
+ customer = new Customer(); // 閬垮厤绌哄璞″鑷寸殑NPE
}
- List<Customer> customerList = customerMapper.selectList(queryWrapper);
+ // 2. 鏋勫缓鏌ヨ鏉′欢锛堝寮虹┖鍊煎畨鍏級
+ LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
+ String customerName = customer.getCustomerName();
+ if (StringUtils.isNotBlank(customerName)) {
+ queryWrapper.like(Customer::getCustomerName, customerName);
+ }
- // 浣跨敤 Stream 淇敼姣忎釜 Customer 鐨� addressPhone 瀛楁
- return customerList.stream().peek(c ->
- c.setAddressPhone(c.getCompanyAddress() + "( " + c.getCompanyPhone() + " )")
- ).collect(Collectors.toList());
+ // 3. 鎵ц鍒嗛〉鏌ヨ锛堜繚鐣欏垎椤靛厓鏁版嵁锛�
+ IPage<Customer> customerPage = customerMapper.selectPage(page, queryWrapper);
+
+ // 4. 鏁版嵁澶勭悊锛堝寮虹┖鍊煎畨鍏� & 浠ｇ爜鍙鎬э級
+ List<Customer> processedList = customerPage.getRecords().stream()
+ .filter(Objects::nonNull) // 杩囨护绌哄璞★紙閬垮厤鍚庣画鎿嶄綔NPE锛�
+ .peek(c -> {
+ // 瀹夊叏鑾峰彇瀛楁锛岄伩鍏峮ull鍊兼嫾鎺�
+ String address = StringUtils.defaultString(c.getCompanyAddress(), "");
+ String phone = StringUtils.defaultString(c.getCompanyPhone(), "");
+ c.setAddressPhone(address + "(" + phone + ")"); // 浼樺寲瀛楃涓叉嫾鎺�
+ })
+ .collect(Collectors.toList());
+
+ // 5. 鏇存柊鍒嗛〉缁撴灉涓殑鏁版嵁锛堜繚鎸佸垎椤典俊鎭畬鏁达級
+ customerPage.setRecords(processedList);
+
+ return customerPage; // 杩斿洖鍖呭惈鍒嗛〉淇℃伅鐨処Page瀵硅薄
}
/**
@@ -114,9 +137,14 @@
}
@Override
+ public List<Customer> selectCustomerLists(Customer customer) {
+ return customerMapper.selectList(null);
+ }
+
+ @Override
public List<Map<String, Object>> customerList(Customer customer) {
LambdaQueryWrapper<Customer> queryWrapper = Wrappers.lambdaQuery();
- queryWrapper.select(Customer::getId, Customer::getCustomerName,Customer::getTaxpayerIdentificationNumber);
+ queryWrapper.select(Customer::getId, Customer::getCustomerName, Customer::getTaxpayerIdentificationNumber);
// 鑾峰彇鍘熷鏌ヨ缁撴灉
List<Map<String, Object>> result = customerMapper.selectMaps(queryWrapper);
--
Gitblit v1.9.3