From 66309ec82964316c3ae032fdcf2742d59179922c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 05 Jan 2023 14:55:05 +0800
Subject: [PATCH] 列表数据导出

---
 screen-api/src/main/java/com/moral/api/service/impl/HnExcelServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HnExcelServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HnExcelServiceImpl.java
index 8572f44..2c5cfb9 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HnExcelServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HnExcelServiceImpl.java
@@ -246,7 +246,7 @@
                         Integer integer1 = list.get(13);
                         double i  = integer - integer1;
 
-                        double i1 = AmendUtils.sciCal((i / integer1)*100,1);
+                        double i1 = AmendUtils.sciCal((Math.abs(i) / integer1)*100,1);
                         String code  = "";
                         if (i<0){
                             code = "������"+i1+"%";
@@ -631,6 +631,9 @@
                 continue;
             }
             short lastCellNum = row.getLastCellNum();
+            if (lastCellNum<=0){
+                continue;
+            }
 
             Object[] objects = new Object[lastCellNum];
             for (int j = 0; j < lastCellNum; j++) {
@@ -644,7 +647,7 @@
 
             HashMap<String, Object> map1 = new HashMap<>();
             HashMap<String, Object> map2 = new HashMap<>();
-            if (objects.length == 8) {
+            if (objects.length == 8 || objects.length == 9) {
                 if (objects[0]!=null){
                     if (!objects[1].toString().contains("H")
                             && !objects[2].toString().contains("H")

--
Gitblit v1.8.0