From 2a4d9802f9117d5d110e63ddaa41aada68731c4d Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 16 六月 2025 17:08:51 +0800
Subject: [PATCH] tenantId修改类型 + 客户导入+ 供应商导入+产品导入
---
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 77 ++++++++++++++++++++++++++++++--------
1 files changed, 61 insertions(+), 16 deletions(-)
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 3c12a6f..07431ac 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -2,22 +2,27 @@
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;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.project.system.domain.SysUser;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
@@ -51,19 +56,40 @@
* @return 瀹㈡埛妗ｆ
*/
@Override
- public List<Customer> selectCustomerList(Customer customer) {
- LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
-
- if (StringUtils.isNotBlank(customer.getCustomerName())) {
- queryWrapper.eq(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瀵硅薄
}
/**
@@ -75,8 +101,8 @@
@Override
public int insertCustomer(Customer customer) {
LoginUser loginUser = SecurityUtils.getLoginUser();
- Integer tenantId = loginUser.getTenantId();
- customer.setTenantId(Long.valueOf(tenantId));
+ Long tenantId = loginUser.getTenantId();
+ customer.setTenantId(tenantId);
return customerMapper.insert(customer);
}
@@ -89,8 +115,8 @@
@Override
public int updateCustomer(Customer customer) {
LoginUser loginUser = SecurityUtils.getLoginUser();
- Integer tenantId = loginUser.getTenantId();
- customer.setTenantId(Long.valueOf(tenantId));
+ Long tenantId = loginUser.getTenantId();
+ customer.setTenantId(tenantId);
return customerMapper.updateById(customer);
}
@@ -114,9 +140,28 @@
}
@Override
+ public List<Customer> selectCustomerLists(Customer customer) {
+ return customerMapper.selectList(null);
+ }
+
+ @Override
+ public Boolean importData(MultipartFile file) {
+ try {
+ ExcelUtil<Customer> util = new ExcelUtil<Customer>(Customer.class);
+ List<Customer> userList = util.importExcel(file.getInputStream());
+
+ this.saveOrUpdateBatch(userList);
+ return true;
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return false;
+ }
+
+ @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