From fec35ab980d6b82d6d5f8ae8deba123a8f796830 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 26 十月 2024 10:19:12 +0800
Subject: [PATCH] 总报告1.0

---
 inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java |   44 +++++++++++++++++++++++++++++++++++++-------
 1 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java b/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
index 3a383e1..598498c 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
@@ -1740,8 +1740,15 @@
                                         CellRenderData cellRenderData = new CellRenderData();
                                         List<ParagraphRenderData> paragraphRenderDataList = new ArrayList<>();
                                         ParagraphRenderData paragraphRenderData = new ParagraphRenderData();
+                                        ParagraphStyle paragraphStyle = new ParagraphStyle();
+                                        paragraphStyle.setAlign(ParagraphAlignment.CENTER);
+                                        paragraphRenderData.setParagraphStyle(paragraphStyle);
                                         List<RenderData> renderData = new ArrayList<>();
                                         TextRenderData textRenderData = new TextRenderData();
+                                        Style style = new Style();
+                                        style.setFontFamily("瀹嬩綋");
+                                        style.setColor("000000");
+                                        textRenderData.setStyle(style);
                                         CTTcPr tcPr = cell.get(j).getCTTc().getTcPr();
                                         if (tcPr != null) {
                                             //鍚堝苟鍒�
@@ -1774,9 +1781,9 @@
                                                         text = row.get(index).getCell(j).getText();
                                                         index--;
                                                     }
-                                                    if (text.equals("鍚堟牸")|| text.equals("涓嶅悎鏍�")){
+                                                    if (text.equals("鍚堟牸") || text.equals("涓嶅悎鏍�")) {
                                                         textRenderData.setText(text + "鈭�25" + aa + j);
-                                                    }else {
+                                                    } else {
                                                         textRenderData.setText(text + "鈭�22" + aa + j);
                                                     }
                                                 }
@@ -2275,17 +2282,17 @@
                     for (int j = 0; j < v.get("er") - v.get("sr") + 1; j++) {
                         if (v.get("ec") > v.get("sc")) {
                             try {
-                                TableTools.mergeCellsHorizonal(xwpfTables.get(i), v.get("sr") + j, v.get("sc"), v.get("ec"));
+                                mergeCellsHorizontally(xwpfTables.get(i), v.get("sr") + j, v.get("sc"), v.get("ec"));
+//                                TableTools.mergeCellsHorizonal(xwpfTables.get(i), v.get("sr") + j, v.get("sc"), v.get("ec"));
                             } catch (Exception e) {
-                                System.out.println("鍚堝苟鍑洪敊");
                             }
                         }
                     }
                     if (v.get("er") > v.get("sr")) {
                         try {
-                            TableTools.mergeCellsVertically(xwpfTables.get(i), v.get("sc"), v.get("sr"), v.get("er"));
+                            mergeCellsVertically(xwpfTables.get(i), v.get("sc"), v.get("sr"), v.get("er"));
+//                            TableTools.mergeCellsVertically(xwpfTables.get(i), v.get("sc"), v.get("sr"), v.get("er"));
                         } catch (Exception e) {
-                            System.out.println("鍚堝苟鍑洪敊");
                         }
                     }
                 }
@@ -3729,4 +3736,27 @@
             });
         });
     }
-}
+
+    // 姘村钩鍚堝苟鍗曞厓鏍�
+    private static void mergeCellsHorizontally(XWPFTable table, int row, int fromCol, int toCol) {
+        for (int i = fromCol; i <= toCol; i++) {
+            if (i == fromCol) {
+                table.getRow(row).getCell(i).getCTTc().addNewTcPr().addNewHMerge().setVal(STMerge.RESTART);
+            } else {
+                table.getRow(row).getCell(i).getCTTc().addNewTcPr().addNewHMerge().setVal(STMerge.CONTINUE);
+            }
+
+        }
+    }
+
+    // 鍨傜洿鍚堝苟鍗曞厓鏍�
+    private static void mergeCellsVertically(XWPFTable table, int col, int fromRow, int toRow) {
+        for (int i = fromRow; i <= toRow; i++) {
+            if (i == fromRow) {
+                table.getRow(i).getCell(col).getCTTc().addNewTcPr().addNewVMerge().setVal(STMerge.RESTART);
+            } else {
+                table.getRow(i).getCell(col).getCTTc().addNewTcPr().addNewVMerge().setVal(STMerge.CONTINUE);
+            }
+        }
+    }
+}
\ No newline at end of file

--
Gitblit v1.9.3