From 3e8957d6ff8e7af81326a58050afc4a508d19aa0 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 10 九月 2026 10:38:36 +0800
Subject: [PATCH] fix: 产品导入修改
---
src/main/java/com/ruoyi/basic/controller/ProductController.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/ProductController.java b/src/main/java/com/ruoyi/basic/controller/ProductController.java
index 77334e0..d6c8eda 100644
--- a/src/main/java/com/ruoyi/basic/controller/ProductController.java
+++ b/src/main/java/com/ruoyi/basic/controller/ProductController.java
@@ -5,23 +5,19 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.ProductDto;
import com.ruoyi.basic.dto.ProductModelDto;
-import com.ruoyi.basic.dto.ProductModelExportDto;
import com.ruoyi.basic.dto.ProductTreeDto;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.service.IProductModelService;
import com.ruoyi.basic.service.IProductService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.basic.vo.ProductModelVo;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
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.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
-import com.ruoyi.sales.service.ISalesLedgerService;
-import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -118,7 +114,7 @@
@Operation(summary = "鍒嗛〉鏌ヨ鎵�鏈変骇鍝佸瀷鍙�")
@GetMapping("/pageModel")
- public IPage<ProductModel> listPageProductModel(Page<ProductModel> page, ProductModel productModel) {
+ public IPage<ProductModelVo> listPageProductModel(Page<ProductModelVo> page, ProductModel productModel) {
return productService.listPageProductModel(page, productModel);
}
@@ -127,8 +123,8 @@
*/
@PostMapping("/import")
@Log(title = "瀵煎叆浜у搧", businessType = BusinessType.IMPORT)
- public AjaxResult importProductModel(@RequestParam("file") MultipartFile file, Integer productId) {
- return productModelService.importProductModel(file, productId);
+ public AjaxResult importProductModel(@RequestParam("file") MultipartFile file) {
+ return productModelService.importProductModel(file);
}
/**
@@ -138,7 +134,6 @@
@Operation(summary = "浜у搧瀵煎叆妯℃澘")
@Log(title = "浜у搧瀵煎叆妯℃澘", businessType = BusinessType.EXPORT)
public void importProduct(HttpServletResponse response) {
- ExcelUtil<ProductModelExportDto> excelUtil = new ExcelUtil<>(ProductModelExportDto.class);
- excelUtil.importTemplateExcel(response, "浜у搧瑙勬牸瀵煎叆妯℃澘");
+ productService.exportImportTemplate(response);
}
}
--
Gitblit v1.9.3