From 2edfe8214e2723dfb6cc1866c58f783f49a7f649 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 12 一月 2026 11:53:07 +0800
Subject: [PATCH] yys 成品入库导出修改
---
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java | 13 ++++++++++---
src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java | 1 +
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 4 ++--
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java | 3 +--
4 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
index 2e314cb..5e45fd1 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
@@ -1,6 +1,7 @@
package com.ruoyi.procurementrecord.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -219,10 +220,16 @@
* @param response
*/
@PostMapping("/exportTwo")
- public void exportTwo(HttpServletResponse response) {
- List<CustomStorage> customStorages = customStorageMapper.selectList(null);
+ public void exportTwo(HttpServletResponse response,List<CustomStorage> customStorage) {
+ if(CollectionUtils.isEmpty(customStorage)){
+ customStorage = customStorageMapper.selectList(null);
+ }
+ for (CustomStorage storage : customStorage) {
+ // nginx 鍓嶇璁块棶鍥剧墖
+ storage.setUrl("http://114.132.189.42:9044"+storage.getUrl());
+ }
ExcelUtil<CustomStorage> util = new ExcelUtil<CustomStorage>(CustomStorage.class);
- util.exportExcel(response, customStorages, "鍏ュ簱鍙拌处");
+ util.exportExcel(response, customStorage, "鍏ュ簱鍙拌处");
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
index 7c58283..1802ca5 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
@@ -44,6 +44,7 @@
/**
* 鍥剧墖
*/
+ @Excel(name = "鍥剧墖", cellType = Excel.ColumnType.IMAGE)
private String url;
/**
* 鍑哄簱鏁伴噺
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
index 9852170..158e243 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -273,7 +273,7 @@
@Override
public void exportCopyTwo(HttpServletResponse response,Integer type) {
LambdaQueryWrapper<CustomStorage> customStorageLambdaQueryWrapper = new LambdaQueryWrapper<>();
- customStorageLambdaQueryWrapper.groupBy(CustomStorage::getSupplierName, CustomStorage::getProductCategory, CustomStorage::getSpecificationModel);
+ customStorageLambdaQueryWrapper.groupBy(CustomStorage::getProductCategory, CustomStorage::getSpecificationModel);
List<CustomStorage> list = customStorageMapper.selectList(customStorageLambdaQueryWrapper);
// 璁＄畻寰呭叆搴撴暟閲�
// 鏌ヨ閲囪喘璁板綍宸插叆搴撴暟閲�
@@ -285,7 +285,6 @@
}
LambdaQueryWrapper<ProcurementRecordOut> procurementRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
procurementRecordLambdaQueryWrapper.in(ProcurementRecordOut::getProcurementRecordStorageId, collect);
- procurementRecordLambdaQueryWrapper.eq(ProcurementRecordOut::getType, type);
procurementRecordLambdaQueryWrapper.eq(ProcurementRecordOut::getType, type);
List<ProcurementRecordOut> procurementRecords = procurementRecordOutMapper.selectList(procurementRecordLambdaQueryWrapper);
if(CollectionUtils.isEmpty( procurementRecords)){
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index a17d3e4..eac12f4 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -210,7 +210,7 @@
left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id and t2.type = 2
left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
where t1.type = 1
- group by t3.supplier_name,t2.product_category,t2.specification_model
+ group by t2.product_category,t2.specification_model
</select>
<select id="listCopyOne" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
select
@@ -239,7 +239,7 @@
left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id and t2.type = 1
left join sales_ledger t3 on t3.id = t2.sales_ledger_id
where t1.type = 2
- group by t3.customer_name,t2.product_category,t2.specification_model
+ group by t2.product_category,t2.specification_model
</select>
<select id="listPageByProduction" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
select
--
Gitblit v1.9.3