From 973fe5f096356b6efbf721e1b3fdbf3309a07b9f Mon Sep 17 00:00:00 2001
From: yang_shj <1069818635@QQ.com>
Date: Fri, 15 Sep 2023 10:32:14 +0800
Subject: [PATCH] =?UTF-8?q?#poi=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hzims-service/operational/pom.xml                  | 23 ++++++++++++++++++++++
 .../service/impl/RunMonthReportServiceImpl.java    |  4 ++--
 .../hnac/hzims/safeproduct/utils/ExcelUtil.java    |  5 -----
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/hzims-service/operational/pom.xml b/hzims-service/operational/pom.xml
index ea3b0b7..cc0dbf1 100644
--- a/hzims-service/operational/pom.xml
+++ b/hzims-service/operational/pom.xml
@@ -69,11 +69,34 @@
             <groupId>com.xuxueli</groupId>
             <artifactId>xxl-job-core</artifactId>
         </dependency>
+
+        <!--  导出功能 -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.15</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>3.15</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml-schemas</artifactId>
             <version>3.15</version>
         </dependency>
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-base</artifactId>
+            <version>3.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-annotation</artifactId>
+            <version>3.2.0</version>
+        </dependency>
+
 <!--        由于poi使用的poi-ooxml-schemas是ooxml-schemas的精简版，所以在was服务器上导出Excel可能会报错-->
         <dependency>
             <groupId>org.apache.poi</groupId>
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/RunMonthReportServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/RunMonthReportServiceImpl.java
index 63c2194..d7add83 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/RunMonthReportServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/RunMonthReportServiceImpl.java
@@ -815,8 +815,8 @@ public class RunMonthReportServiceImpl extends ServiceImpl<RunMonthReportMapper,
 								if (StringUtil.isNotBlank(analyseDataTaosVO.getVal())) {
 									vo.setValue(Double.valueOf(analyseDataTaosVO.getVal()));
 								}
-								//vo.setName(signKeyMap.get(record.getSignage()));
-								//vo.setSignage(record.getSignage());
+								vo.setName(signKeyMap.get(record.getSignage()));
+								vo.setSignage(record.getSignage());
 								vo.setTs(analyseDataTaosVO.getTs());
 								runMonthReportDataVoList.add(vo);
 							}
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/ExcelUtil.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/ExcelUtil.java
index 6292933..664a61a 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/ExcelUtil.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/ExcelUtil.java
@@ -2,15 +2,10 @@ package com.hnac.hzims.safeproduct.utils;
 
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.EasyExcelFactory;
-import com.alibaba.excel.ExcelReader;
 import com.alibaba.excel.event.AnalysisEventListener;
-import com.alibaba.excel.metadata.BaseRowModel;
 import com.alibaba.excel.write.handler.WriteHandler;
-import com.hnac.hzims.common.constant.CommonConstant;
-import org.apache.poi.sl.usermodel.Sheet;
 import org.apache.poi.ss.formula.functions.T;
 import org.omg.CORBA_2_3.portable.OutputStream;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;