From f9e742b17c47d9f0df3a56caa09f18c8f99aa3f8 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期四, 03 七月 2025 17:44:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatController.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 1acf4fe..3c2bac0 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -12,11 +12,9 @@
import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.ManPakOut;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.MatPrint;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.result.KeyValueVo;
+import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.service.ManPakOutService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.OrderDetlService;
@@ -33,6 +31,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
@@ -40,6 +39,7 @@
import java.io.OutputStream;
import java.net.URLEncoder;
import java.util.*;
+import java.util.stream.Collectors;
@RestController
@Slf4j
@@ -181,6 +181,8 @@
}
return R.ok();
}
+ @Resource
+ private TagMapper tagMapper;
@RequestMapping(value = "/mat/export/auth")
@ManagerAuth
@@ -217,7 +219,11 @@
Page page1 = new Page(j + 1 + oneSheetWriteCount * i, writeDataRows);
//鏌ヨ鍒嗛〉鍒楄〃---鎸夌収鑷繁鐨勪笟鍔℃煡鍒楄〃锛屽垎椤佃繖涓竴瀹氳浣跨敤杩欎釜锛歱age1.getPageNum(),page1.getPageSize()锛侊紒锛�
List<Mat> list = matService.selectPage(new Page<>(page1.getCurrent(), page1.getLimit())).getRecords();
-// List<AltitudeMonExportExcelVO > SurfDayList = new ArrayList<>();
+ List<Tag> tags = tagMapper.selectList(null);
+ // 鎵�鏈夌被鍒�
+ Map<Long, String> tagMaps = tags.stream().collect(Collectors.toMap(Tag::getId,Tag::getName,(v1,v2) -> v1));
+ // 褰掔被id瀵绘壘褰掔被鍚嶇О
+ list = list.stream().peek(mat -> mat.setUuid(tagMaps.get(mat.getTagId()))).collect(Collectors.toList());
//鍐欏叆鍒癳xcel:
/**************z鍙渶瑕侀�夋嫨涓�绉嶆柟寮忓嵆鍙�*****************/
//杩欓噷鍙互閫氳繃璁剧疆includeColumnFiledNames銆乪xcludeColumnFiledNames瀵煎嚭浠�涔堝瓧娈碉紝鍙互鍔ㄦ�侀厤缃紝鍓嶇浼犺繃鏉ラ偅浜涘垪锛屽氨瀵煎嚭閭ｄ簺鍒�
--
Gitblit v1.9.1