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 | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
index efcefbc..f056f6d 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
@@ -1,7 +1,9 @@
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.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -20,6 +22,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.List;
+import java.util.UUID;
/**
* @author :yys
@@ -65,7 +68,7 @@
return procurementRecordService.updateCustom(customStorage);
}
- @Delete("/delteCustom")
+ @DeleteMapping("/deleteCustom")
@Log(title = "鑷畾涔夊叆搴�-鍏ュ簱绠＄悊-鍒犻櫎鍏ュ簱", businessType = BusinessType.DELETE)
@Transactional
public AjaxResult deleteCustom(@RequestBody List<Long> ids) {
@@ -219,10 +222,34 @@
* @param response
*/
@PostMapping("/exportTwo")
- public void exportTwo(HttpServletResponse response) {
- List<CustomStorage> customStorages = customStorageMapper.selectList(null);
+ public void exportTwo(HttpServletResponse response,@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);
- util.exportExcel(response, customStorages, "鍏ュ簱鍙拌处");
+ 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,"鍏ュ簱鍙拌处" , "鍏ュ簱鍙拌处");
}
--
Gitblit v1.9.3