From f1eecdfdc2c0108a014ddd8011e30cd54e4601e6 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 17 七月 2025 09:35:14 +0800
Subject: [PATCH] yys 客户档案导入功能修改
---
src/main/java/com/ruoyi/basic/controller/CustomerController.java | 2 +-
src/main/java/com/ruoyi/basic/service/ICustomerService.java | 3 ++-
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 13 +++++++++----
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerController.java b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
index 833aa97..132e5bd 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
@@ -61,7 +61,7 @@
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file) throws Exception {
- return success(customerService.importData(file));
+ return customerService.importData(file);
}
/**
diff --git a/src/main/java/com/ruoyi/basic/service/ICustomerService.java b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
index 4ec8646..35a9a63 100644
--- a/src/main/java/com/ruoyi/basic/service/ICustomerService.java
+++ b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.pojo.Customer;
+import com.ruoyi.framework.web.domain.AjaxResult;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -66,5 +67,5 @@
List<Customer> selectCustomerLists(Customer customer);
- Boolean importData(MultipartFile file);
+ AjaxResult importData(MultipartFile file);
}
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 c4cfc49..899e21f 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -14,12 +14,14 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.pojo.SalesLedger;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
import java.util.Arrays;
@@ -153,17 +155,20 @@
}
@Override
- public Boolean importData(MultipartFile file) {
+ public AjaxResult importData(MultipartFile file) {
try {
ExcelUtil<Customer> util = new ExcelUtil<Customer>(Customer.class);
List<Customer> userList = util.importExcel(file.getInputStream());
-
+ if(CollectionUtils.isEmpty(userList)){
+ return AjaxResult.warn("妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
+ }
this.saveOrUpdateBatch(userList);
- return true;
+ return AjaxResult.success(true);
}catch (Exception e){
e.printStackTrace();
+ return AjaxResult.error("瀵煎叆澶辫触");
}
- return false;
+
}
@Override
--
Gitblit v1.9.3