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 ++++++++++++++-----
src/main/java/com/ruoyi/stock/pojo/Manufacturer.java | 27 +++++++++++++++++++--------
src/main/java/com/ruoyi/stock/controller/ManufacturerController.java | 3 ++-
3 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/controller/ManufacturerController.java b/src/main/java/com/ruoyi/stock/controller/ManufacturerController.java
index 2c567a4..4d6fb53 100644
--- a/src/main/java/com/ruoyi/stock/controller/ManufacturerController.java
+++ b/src/main/java/com/ruoyi/stock/controller/ManufacturerController.java
@@ -6,6 +6,7 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.stock.dto.ManufacturerDto;
+import com.ruoyi.stock.execl.ManufacturerExcelDto;
import com.ruoyi.stock.pojo.Manufacturer;
import com.ruoyi.stock.service.ManufacturerService;
import io.swagger.v3.oas.annotations.Operation;
@@ -121,7 +122,7 @@
@Log(title = "鍘傚-涓嬭浇妯℃澘", businessType = BusinessType.EXPORT)
@Operation(summary = "涓嬭浇鍘傚妯℃澘")
public void downloadTemplate(HttpServletResponse response) {
- ExcelUtil<Manufacturer> util = new ExcelUtil<>(Manufacturer.class);
+ ExcelUtil<ManufacturerExcelDto> util = new ExcelUtil<>(ManufacturerExcelDto.class);
util.importTemplateExcel(response, "鍘傚妗ｆ妯℃澘");
}
diff --git a/src/main/java/com/ruoyi/stock/pojo/Manufacturer.java b/src/main/java/com/ruoyi/stock/pojo/Manufacturer.java
index bba9ffe..df04de8 100644
--- a/src/main/java/com/ruoyi/stock/pojo/Manufacturer.java
+++ b/src/main/java/com/ruoyi/stock/pojo/Manufacturer.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@@ -38,63 +39,72 @@
private Long id;
/**
- * 鍘傚晢鍚嶇О
+ * 鍘傚鍚嶇О
*/
- @ApiModelProperty("鍘傚晢鍚嶇О")
+ @ApiModelProperty("鍘傚鍚嶇О")
+ @Excel(name = "鍘傚鍚嶇О")
private String name;
/**
* 绾崇◣浜鸿瘑鍒彿
*/
@ApiModelProperty("绾崇◣浜鸿瘑鍒彿")
+ @Excel(name = "绾崇◣浜鸿瘑鍒彿")
private String taxpayerIdentificationNum;
/**
- * 鍘傚晢鍦板潃
+ * 鍘傚鍦板潃
*/
- @ApiModelProperty("鍘傚晢鍦板潃")
+ @ApiModelProperty("鍘傚鍦板潃")
+ @Excel(name = "鍏徃鍦板潃")
private String companyAddress;
/**
- * 鍘傚晢绫诲瀷
+ * 鍘傚绫诲瀷
*/
- @ApiModelProperty("鍘傚晢绫诲瀷")
+ @ApiModelProperty("鍘傚绫诲瀷")
private String type;
/**
- * 鍘傚晢鐢佃瘽
+ * 鍘傚鐢佃瘽
*/
- @ApiModelProperty("鍘傚晢鐢佃瘽")
+ @ApiModelProperty("鍏徃鐢佃瘽")
+ @Excel(name = "鍏徃鐢佃瘽")
private String companyPhone;
/**
* 閾惰璐︽埛鍚嶇О
*/
@ApiModelProperty("閾惰璐︽埛鍚嶇О")
+ @Excel(name = "寮�鎴疯")
private String bankAccountName;
/**
* 閾惰璐︽埛鍙风爜
*/
@ApiModelProperty("閾惰璐︽埛鍙风爜")
+ @Excel(name = "璐﹀彿")
private String bankAccountNum;
/**
* 鑱旂郴浜哄鍚�
*/
@ApiModelProperty("鑱旂郴浜哄鍚�")
+ @Excel(name = "鑱旂郴浜�")
private String contactUserName;
/**
* 鑱旂郴浜虹數璇�
*/
@ApiModelProperty("鑱旂郴浜虹數璇�")
+ @Excel(name = "鑱旂郴鐢佃瘽")
private String contactUserPhone;
/**
* 缁存姢浜篒D
*/
@ApiModelProperty("缁存姢浜篒D")
+ @Excel(name = "缁存姢浜�")
private Long maintainUserId;
/**
@@ -147,5 +157,6 @@
* 鏄惁鐧藉悕鍗�
*/
@ApiModelProperty("鏄惁鐧藉悕鍗�")
+ @Excel(name = "鏄惁鐧藉悕鍗�")
private Long isWhite;
}
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