From 1771247044364d5d8ec06cf71d86356c90ec8388 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 13 一月 2026 15:21:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sqd' into sqd
---
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java | 20 ++++++++++++++++++++
src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java | 6 +++---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 5 +++++
src/main/java/com/ruoyi/framework/config/RuoYiConfig.java | 2 +-
src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 4 +++-
5 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index 6860e90..1a6a55a 100644
--- a/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -551,6 +551,8 @@
return exportExcel();
}
+
+
/**
* 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
*
@@ -1458,7 +1460,7 @@
/**
* 鑾峰彇涓嬭浇璺緞
- *
+ *
* @param filename 鏂囦欢鍚嶇О
*/
public String getAbsoluteFile(String filename)
diff --git a/src/main/java/com/ruoyi/framework/config/RuoYiConfig.java b/src/main/java/com/ruoyi/framework/config/RuoYiConfig.java
index 0c3d20c..62af550 100644
--- a/src/main/java/com/ruoyi/framework/config/RuoYiConfig.java
+++ b/src/main/java/com/ruoyi/framework/config/RuoYiConfig.java
@@ -98,7 +98,7 @@
*/
public static String getDownloadPath()
{
- return getProfile() + "/download/";
+ return getProfile() + "/prod/";
}
/**
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
index 33e5dc7..f056f6d 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
@@ -3,6 +3,7 @@
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.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -21,6 +22,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.List;
+import java.util.UUID;
/**
* @author :yys
@@ -232,5 +234,23 @@
util.exportExcel(response, customStorage, "鍏ュ簱鍙拌处");
}
+ /**
+ * 鍏ュ簱锛屽嚭搴撶鐞嗚嚜瀹氫箟瀵煎嚭锛屼繚瀛樻枃浠跺埌鏈湴杩斿洖璺緞
+ * @param customStorage
+ */
+ @PostMapping("/exportTwoSave")
+ public AjaxResult exportTwoSave(@RequestBody 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);
+
+ return util.exportExcel(customStorage,"鍏ュ簱鍙拌处" , "鍏ュ簱鍙拌处");
+ }
+
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
index a7c5a72..82175f6 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
@@ -59,10 +59,10 @@
@Excel(name = "浜у搧楂樺害")
private String specificationModel;
// 鍗曚綅
- @Excel(name = "鍗曚綅")
+// @Excel(name = "鍗曚綅")
private String unit;
// 鍚◣鍗曚环
- @Excel(name = "鍗曚环")
+ @Excel(name = "鍗曚环(鍏�)/浠�")
private BigDecimal taxInclusiveUnitPrice;
// 鍚◣鎬讳环
// @Excel(name = "鍚◣鎬讳环")
@@ -138,6 +138,6 @@
/**
* 缇庡厓姣忎欢
*/
- @Excel(name = "缇庡厓姣忎欢")
+ @Excel(name = "鍗曚环(缇庡厓)/浠�")
private BigDecimal dollarPrice;
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index a135fa3..ee28aba 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -177,4 +177,9 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鐧昏鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime registerDate;
+
+ /**
+ * 缇庡厓
+ */
+ private String dollar;
}
--
Gitblit v1.9.3