From 8299dc8cd015c354ce0765a130583a16d994a1b0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 08 七月 2024 14:25:52 +0800
Subject: [PATCH] 骑缝章1.0
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 51 ++++-----------------------------------------------
1 files changed, 4 insertions(+), 47 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 0570e78..4bb2475 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -823,27 +823,22 @@
List<TableRenderData> tables1 = new ArrayList<>();
TableRenderData tableRenderData = new TableRenderData();
tableRenderData.setRows(new ArrayList<>());
-
double totalHeight = 0.0; // 鐢ㄤ簬璺熻釜褰撳墠琛ㄦ牸鐨勬�昏楂�
- double heightThreshold = 8000.0; // 闃堝�硷紝渚嬪40cm*28px*15twips
+ double heightThreshold = 8000.0; // 闃堝�硷紝
List<RowRenderData> firstTwoRows = new ArrayList<>(); // 淇濆瓨鍓嶄袱琛屼互渚垮鍒跺埌鏂拌〃鏍�
-
-
// 淇濆瓨鍓嶄袱琛屼互渚垮鍒跺埌鏂拌〃鏍�
if (rows.size() >= 2) {
firstTwoRows.add(rows.get(0));
firstTwoRows.add(rows.get(1));
}
-
for (RowRenderData row : rows) {
double rowHeight = row.getRowStyle().getHeight(); // 鑾峰彇褰撳墠琛岀殑琛岄珮
totalHeight += rowHeight; // 鏇存柊鎬昏楂�
-
if (totalHeight >= heightThreshold) {
// 鍒涘缓鏂拌〃鏍煎苟澶嶅埗鍓嶄袱琛�
TableRenderData newTableRenderData = new TableRenderData();
newTableRenderData.setRows(new ArrayList<>(firstTwoRows));
-
+ //璁剧疆鏍峰紡
TableStyle tableStyle = new TableStyle();
tableStyle.setColWidths(new int[]{650, 1600, 2000, 750, 2800, 1100, 1100});
tableStyle.setWidth("10000");
@@ -858,7 +853,6 @@
tableStyle.setBottomBorder(borderStyle);
tableRenderData.setTableStyle(tableStyle);
newTableRenderData.setTableStyle(tableStyle);
-
tables1.add(tableRenderData);
tableRenderData = newTableRenderData;
totalHeight = rowHeight;
@@ -866,6 +860,7 @@
tableRenderData.getRows().add(row);
}
if (!tableRenderData.getRows().isEmpty()) {
+ //璁剧疆鏍峰紡
TableStyle tableStyle = new TableStyle();
tableStyle.setColWidths(new int[]{650, 1600, 2000, 750, 2800, 1100, 1100});
tableStyle.setWidth("10000");
@@ -881,7 +876,6 @@
tableRenderData.setTableStyle(tableStyle);
tables1.add(tableRenderData);
}
-
tables1.forEach(table -> {
Map<String, Object> tableMap = new HashMap<>();
tableMap.put("table", table);
@@ -1293,14 +1287,6 @@
List<String> list = new ArrayList<>(maps.keySet());
for (int a = list.size() - 1; a >= 0; a--) {
Map<String, Integer> v = maps.get(list.get(a));
- /* for (int j = 0; j < v.get("er") - v.get("sr") + 1; j++) {
- if (v.get("ec") > v.get("sc")) {
- TableTools.mergeCellsHorizonal(table, v.get("sr") + j, v.get("sc"), v.get("ec"));
- }
- }
- if (v.get("er") > v.get("sr")) {
- TableTools.mergeCellsVertically(table, v.get("sc"), v.get("sr"), v.get("er"));
- }*/
for (int j = 0; j < v.get("er") - v.get("sr") + 1; j++) {
if (v.get("ec") > v.get("sc")) {
XWPFTableRow row = table.getRow(v.get("sr") + j);
@@ -1338,11 +1324,11 @@
} catch (IOException e) {
throw new RuntimeException(e);
}
+ //澶勭悊涓嫳鏂囨崲琛岀殑闂
try {
FileInputStream stream1 = new FileInputStream(path);
XWPFDocument document1 = new XWPFDocument(stream1);
List<XWPFTable> xwpfTables1 = document1.getTables();
- //澶勭悊涓嫳鏂囨崲琛岀殑闂
for (int i = 1; i < xwpfTables1.size() - (deviceList == null ? 1 : 2); i++) {
for (int j = 0; j < xwpfTables1.get(i).getRows().size(); j++) {
for (int k = 0; k < xwpfTables1.get(i).getRows().get(j).getTableCells().size(); k++) {
@@ -1359,35 +1345,6 @@
}
xwpfParagraph.setAlignment(ParagraphAlignment.CENTER);
}
- /*if (k == 2 || k == 3 || k == 4) {
- if (k == 2 && xwpfTables1.get(i).getRows().get(j).getTableCells().get(k-1).getText().contains("@@")) {
- XWPFTableCell cell = xwpfTables1.get(i).getRow(j).getCell(k);
- CTTblWidth tblWidth = cell.getCTTc().addNewTcPr().addNewTcW();
- tblWidth.setType(STTblWidth.DXA);
- tblWidth.setW(BigInteger.valueOf((int) (4.79 * 1440 / 2.54)));
- }
- if (k == 3 && xwpfTables1.get(i).getRows().get(j).getTableCells().get(k - 2).getText().contains("@@")) {
- XWPFTableCell cell = xwpfTables1.get(i).getRow(j).getCell(k);
- CTTblWidth tblWidth = cell.getCTTc().addNewTcPr().addNewTcW();
- tblWidth.setType(STTblWidth.DXA);
- tblWidth.setW(BigInteger.valueOf((int) (1.49 * 1440 / 2.54)));
- }
- if (k == 4 && xwpfTables1.get(i).getRows().get(j).getTableCells().get(k - 3).getText().contains("@@")) {
- XWPFTableCell cell = xwpfTables1.get(i).getRow(j).getCell(k);
- CTTblWidth tblWidth = cell.getCTTc().addNewTcPr().addNewTcW();
- tblWidth.setType(STTblWidth.DXA);
- tblWidth.setW(BigInteger.valueOf((int) (3.51 * 1440 / 2.54)));
- }
- }
- if (xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText().contains("@@")) {
- String text = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText();
- text = text.replace("@@","");
- xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).removeParagraph(0);
- XWPFParagraph xwpfParagraph = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).addParagraph();
- XWPFRun run = xwpfParagraph.createRun();
- run.setText(text);
- xwpfParagraph.setAlignment(ParagraphAlignment.CENTER);
- }*/
}
}
}
--
Gitblit v1.9.3