From facb9fa3e831122bad55c94a1c3981f94646ac74 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Wed, 4 Sep 2024 19:53:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                    | 4 ++--
 .../aqgqj/app/controller/PrimaryDataAppController.java     | 7 ++-----
 .../bonus/aqgqj/basis/controller/DownLoadController.java   | 2 +-
 src/main/java/com/bonus/aqgqj/utils/ExportUtils.java       | 4 ++--
 .../resources/static/js/testReport/child/testReportView.js | 3 ++-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 839b455..aaec0ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,7 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>3.17</version>
+            <version>4.1.2</version>
         </dependency>
         <!--mq-->
         <dependency>
@@ -146,7 +146,7 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>3.17</version>
+            <version>4.1.2</version>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
diff --git a/src/main/java/com/bonus/aqgqj/app/controller/PrimaryDataAppController.java b/src/main/java/com/bonus/aqgqj/app/controller/PrimaryDataAppController.java
index 8506bf0..d10d675 100644
--- a/src/main/java/com/bonus/aqgqj/app/controller/PrimaryDataAppController.java
+++ b/src/main/java/com/bonus/aqgqj/app/controller/PrimaryDataAppController.java
@@ -17,10 +17,7 @@ import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
@@ -681,7 +678,7 @@ public class PrimaryDataAppController {
 	 */
 	public Row setCellValueAndStyle(Row row, int index, String value, CellStyle commonStyle) {
 		Cell cell = row.createCell(index);
-		cell.setCellType(Cell.CELL_TYPE_STRING);
+		cell.setCellType(CellType.STRING);
 		cell.setCellValue(value + "");
 		cell.setCellStyle(commonStyle);
 		return row;
diff --git a/src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java b/src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java
index 5e8b237..c060e2f 100644
--- a/src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java
+++ b/src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java
@@ -714,7 +714,7 @@ public class DownLoadController {
      */
     public Row setCellValueAndStyle(Row row, int index, String value, CellStyle commonStyle) {
         Cell cell = row.createCell(index);
-        cell.setCellType(Cell.CELL_TYPE_STRING);
+        cell.setCellType(CellType.STRING);
         cell.setCellValue(value + "");
         cell.setCellStyle(commonStyle);
         return row;
diff --git a/src/main/java/com/bonus/aqgqj/utils/ExportUtils.java b/src/main/java/com/bonus/aqgqj/utils/ExportUtils.java
index c1dc6a6..6050e59 100644
--- a/src/main/java/com/bonus/aqgqj/utils/ExportUtils.java
+++ b/src/main/java/com/bonus/aqgqj/utils/ExportUtils.java
@@ -22,7 +22,7 @@ public class ExportUtils {
      * 总列数
      * @param row
      */
-     public  void CreateWorkbook(int row){
+     /*public  void CreateWorkbook(int row){
          Workbook workbook=new HSSFWorkbook();
          Sheet sheet = workbook.createSheet("检测报告");
          //第一行
@@ -46,7 +46,7 @@ public class ExportUtils {
 //         cell22.setCellValue("报告编号");
 
 
-     }
+     }*/
 
 
 
diff --git a/src/main/resources/static/js/testReport/child/testReportView.js b/src/main/resources/static/js/testReport/child/testReportView.js
index 8982889..4ee66f3 100644
--- a/src/main/resources/static/js/testReport/child/testReportView.js
+++ b/src/main/resources/static/js/testReport/child/testReportView.js
@@ -12,8 +12,9 @@ function setParams(params) {
         form = layui.form;
         layer = layui.layer;
         table = layui.table;
+        getDataById();
     })
-    getDataById();
+
 }
 
 /**详情*/