From a317d0d886cda2d4c3eca6022456803cf619a45a Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 28 五月 2026 11:57:30 +0800
Subject: [PATCH] 修改厂家导入
---
src/main/java/com/ruoyi/stock/service/impl/ManufacturerServiceImpl.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/service/impl/ManufacturerServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/ManufacturerServiceImpl.java
index c0b859a..db79c2d 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/ManufacturerServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/ManufacturerServiceImpl.java
@@ -20,10 +20,13 @@
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import java.time.LocalDate;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -116,11 +119,17 @@
@Transactional
public Boolean importData(MultipartFile file) {
try {
- ExcelUtil<Manufacturer> util = new ExcelUtil<>(Manufacturer.class);
- List<Manufacturer> list = util.importExcel(file.getInputStream());
- if (list != null && !list.isEmpty()) {
- this.saveBatch(list);
- }
+ ExcelUtil<ManufacturerExcelDto> util = new ExcelUtil<>(ManufacturerExcelDto.class);
+ List<ManufacturerExcelDto> list = util.importExcel(file.getInputStream());
+ ArrayList<Manufacturer> manufacturers = new ArrayList<>();
+ list.stream().forEach(dto -> {
+ Manufacturer manufacturer = new Manufacturer();
+ BeanUtils.copyProperties(dto,manufacturer);
+ manufacturer.setMaintainTime(LocalDate.now());
+ manufacturer.setMaintainUserId(SecurityUtils.getLoginUser().getUser().getUserId());
+ manufacturers.add(manufacturer);
+ });
+ this.saveOrUpdateBatch(manufacturers);
return true;
} catch (Exception e) {
log.error("瀵煎叆澶辫触", e);
--
Gitblit v1.9.3