From 234f0be465210d1e7190a913b2d2e753e5ab2bf5 Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Tue, 25 Jun 2024 10:58:52 +0800
Subject: [PATCH] =?UTF-8?q?1.word=E6=A8=A1=E6=9D=BF=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=85=AC=E5=85=B1=E7=B1=BB=EF=BC=8C=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=8A=A8=E6=80=81=E8=A1=8C=E6=95=B0=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/harmonic/utils/WordUtil2.java    | 23 +++++++++----------
 .../impl/GridDiagramServiceImpl.java          |  1 -
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/WordUtil2.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/WordUtil2.java
index 5b32ca3c2..5513c9c1b 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/WordUtil2.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/WordUtil2.java
@@ -30,7 +30,7 @@ public class WordUtil2 {
             this.replaceInTable(doc, params); // 替换表格里面的变量
             this.replaceInPara(doc, params); // 替换文本里面的变量
         } catch (IOException e) {
-            logger.error("获取报告模板异常，原因为：" + e.toString());
+            logger.error("获取报告模板异常，原因为：" + e);
         } finally {
             if (null != inStream) {
                 inStream.close();
@@ -43,7 +43,7 @@ public class WordUtil2 {
             doc.write(outputStream);
             outputStream.close();
         } catch (Exception e) {
-            logger.error("输出稳态报告异常，原因为：" + e.toString());
+            logger.error("输出稳态报告异常，原因为：" + e);
         } finally {
             if (doc != null) {
                 doc.close();
@@ -210,19 +210,15 @@ public class WordUtil2 {
      * @param tableList 插入数据集合
      */
     private static void insertTable(XWPFTable table, List<String[]> tableList) {
+        //删除占位符行数
+        table.removeRow(1);
         // 创建行,根据需要插入的数据添加新行，不处理表头
         for (int i = 0; i < tableList.size(); i++) {
             XWPFTableRow row = table.createRow();
-        }
-        // 遍历表格插入数据
-        List<XWPFTableRow> rows = table.getRows();
-        int length = table.getRows().size();
-        for (int i = 1; i < length - 1; i++) {
-            XWPFTableRow newRow = table.getRow(i);
-            List<XWPFTableCell> cells = newRow.getTableCells();
+            List<XWPFTableCell> cells = row.getTableCells();
             for (int j = 0; j < cells.size(); j++) {
                 XWPFTableCell cell = cells.get(j);
-                String s = tableList.get(i - 1)[j];
+                String s = tableList.get(i)[j];
                 cell.setText(s);
             }
         }
@@ -232,14 +228,16 @@ public class WordUtil2 {
      * 替换表格里面的变量
      *
      * @param doc    要替换的文档
+     * @param tableList    存放数据顺序要与表格一致
      * @param params 参数
      */
-    private void replaceInTable(CustomXWPFDocument doc, Map<String, Object> params, List<String[]> tableList) {
+    private void replaceInTable(CustomXWPFDocument doc, Map<String, Object> params, List<List<String[]>> tableList) {
         Iterator<XWPFTable> iterator = doc.getTablesIterator();
         XWPFTable table;
         List<XWPFTableRow> rows;
         List<XWPFTableCell> cells;
         List<XWPFParagraph> paras;
+        Integer num=0;
         while (iterator.hasNext()) {
             table = iterator.next();
             if (table.getRows().size() > 1) {
@@ -256,7 +254,8 @@ public class WordUtil2 {
                         }
                     }
                 } else {
-                    insertTable(table, tableList); // 插入数据
+                    insertTable(table, tableList.get(num)); // 插入数据
+                    num++;
                 }
             }
         }
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/impl/GridDiagramServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/impl/GridDiagramServiceImpl.java
index 40148379c..044e23487 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/impl/GridDiagramServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/impl/GridDiagramServiceImpl.java
@@ -53,7 +53,6 @@ public class GridDiagramServiceImpl implements GridDiagramService {
     @Override
     public List<GridDiagramVO.Info> getSupervisionDetailsData(StatisticsBizBaseParam param) {
         List<GridDiagramVO.Info> info = new ArrayList<>();
-        GridDiagramVO vo = new GridDiagramVO();
         //获取包括当前部门的后代所有部门信息
         List<DeptDTO> deptInfos = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
         List<DeptDTO> directDeptInfos = deptInfos.stream()