From c9fea85fe8e0a6f9dcac863b725d8cf122ab1a4c Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期一, 04 十二月 2023 15:30:13 +0800
Subject: [PATCH] 内阻计测试-单数据分析导出

---
 src/main/java/com/whyc/service/ExcelExportService.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/whyc/service/ExcelExportService.java b/src/main/java/com/whyc/service/ExcelExportService.java
index af15a8d..5c832de 100644
--- a/src/main/java/com/whyc/service/ExcelExportService.java
+++ b/src/main/java/com/whyc/service/ExcelExportService.java
@@ -160,6 +160,7 @@
         }
         map.put("dto", info);
         //鍥剧墖
+        //鐢靛帇鏌辩姸鍥�
         BASE64Decoder decoder = new BASE64Decoder();
         if(!info.getVolPic().equals("")) {
             ImageEntity volImage = new ImageEntity();
@@ -169,6 +170,7 @@
 
             map.put("volImage",volImage);
         }
+        //鍐呴樆鏌辩姸鍥�
         if(!info.getResPic().equals("")) {
             ImageEntity resImage = new ImageEntity();
             resImage.setData(decoder.decodeBuffer(info.getResPic().substring(info.getResPic().indexOf(",") + 1)));
@@ -177,6 +179,24 @@
 
             map.put("resImage", resImage);
         }
+        //鐢靛鏌辩姸鍥�
+        if(!info.getCondPic().equals("")) {
+            ImageEntity condImage = new ImageEntity();
+            condImage.setData(decoder.decodeBuffer(info.getCondPic().substring(info.getCondPic().indexOf(",") + 1)));
+            condImage.setColspan(6);
+            condImage.setRowspan(16);
+
+            map.put("condImage", condImage);
+        }
+        //閾炬帴鏉℃煴鐘跺浘
+        if(!info.getChainPic().equals("")) {
+            ImageEntity chainImage = new ImageEntity();
+            chainImage.setData(decoder.decodeBuffer(info.getChainPic().substring(info.getChainPic().indexOf(",") + 1)));
+            chainImage.setColspan(6);
+            chainImage.setRowspan(16);
+
+            map.put("chainImage", chainImage);
+        }
 
         //map.put("volImage","volImage");
         //map.put("resImage","resImage");

--
Gitblit v1.9.1