From 7538475dccf1eb3d6bbd861158461c8e10c639eb Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 25 三月 2025 09:23:13 +0800
Subject: [PATCH] 远场表单居中
---
inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java | 69 ++++++++++++++++++++++++++--------
1 files changed, 53 insertions(+), 16 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java b/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java
index baf937a..268b1bf 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java
@@ -22,6 +22,7 @@
import javax.annotation.Resource;
import java.io.*;
+import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -545,7 +546,13 @@
// 鍒涘缓涓�涓〃鏍�
int checkItemRowNum = row;
for (int i = 0; i < checkItemRowNum; i++) {
- table1.createRow();
+ XWPFTableRow tableRow = table1.createRow();
+ for (XWPFTableCell tableCell : tableRow.getTableCells()) {
+ // 璁剧疆鍗曞厓鏍煎唴瀹瑰眳涓榻�
+ for (XWPFParagraph paragraph : tableCell.getParagraphs()) {
+ paragraph.setAlignment(ParagraphAlignment.CENTER);
+ }
+ }
}
//鍨傜洿
mergeCellsVertically(table1, 0, rowNum, rowNum + checkItemRowNum - 1);
@@ -625,8 +632,17 @@
run10.setText(s3);
}
}
- Map<Double, List<Map<String, Object>>> group = mapList.stream()
- .collect(Collectors.groupingBy(item -> (Double) item.get("棰戠巼")));
+ Map<BigDecimal, List<Map<String, Object>>> group = mapList.stream()
+ .collect(Collectors.groupingBy(item -> {
+ BigDecimal value = new BigDecimal(String.valueOf(item.get("棰戠巼")));
+ if (value.scale() <= 0 || value.stripTrailingZeros().scale() <= 0) {
+ // 娌℃湁灏忔暟閮ㄥ垎锛岃繑鍥炴暣鏁板瓧绗︿覆
+ return new BigDecimal(value.intValue());
+ } else {
+ // 鏈夊皬鏁伴儴鍒嗭紝杩斿洖鍘熷鍊肩殑瀛楃涓插舰寮�
+ return value;
+ }
+ }));
group = new TreeMap<>(group);
int hang = 2;
Double count = 0.0;
@@ -692,7 +708,7 @@
}
}
}
- for (Double aDouble : group.keySet()) {
+ for (BigDecimal aDouble : group.keySet()) {
List<Map<String, Object>> mapList1 = group.get(aDouble);
for (Map<String, Object> stringObjectMap : mapList1) {
String port = stringObjectMap.get("绔彛").toString();
@@ -726,8 +742,7 @@
passFlag = false;
}
}
- String project = stringObjectMap.get(s2).toString();
- run10.setText(project);
+ run10.setText(String.format("%.2f", value));
}
}
}
@@ -802,26 +817,32 @@
mergeCellsHorizontally(table1, 0, 4, cell - 2);
XWPFParagraph paragraph12 = table1.getRow(0).getCell(0).getParagraphArray(0);
+ paragraph12.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run12 = paragraph12.createRun();
run12.setText("搴忓彿");
XWPFParagraph paragraph13 = table1.getRow(0).getCell(1).getParagraphArray(0);
+ paragraph13.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run13 = paragraph13.createRun();
run13.setText("妫�楠岄」鐩�");
XWPFParagraph paragraph14 = table1.getRow(0).getCell(2).getParagraphArray(0);
+ paragraph14.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run14 = paragraph14.createRun();
run14.setText("鍗曚綅");
XWPFParagraph paragraph15 = table1.getRow(0).getCell(3).getParagraphArray(0);
+ paragraph15.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run15 = paragraph15.createRun();
run15.setText("鏍囧噯瑕佹眰");
XWPFParagraph paragraph16 = table1.getRow(0).getCell(cell - 1).getParagraphArray(0);
+ paragraph16.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run16 = paragraph16.createRun();
run16.setText("妫�楠岀粨璁�");
XWPFParagraph paragraph17 = table1.getRow(0).getCell(4).getParagraphArray(0);
+ paragraph17.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run17 = paragraph17.createRun();
run17.setText("妫�楠岀粨鏋�");
@@ -863,10 +884,16 @@
continue;
}
List<Map<String, Object>> mapList = aggregatedMap.get(s2);
- // 鍒涘缓涓�涓〃鏍�
int checkItemRowNum = row;
for (int i = 0; i < checkItemRowNum; i++) {
- table1.createRow(); // 鍒涘缓鏂拌
+ // 鍒涘缓鏂拌 骞惰缃眳涓�
+ XWPFTableRow tableRow = table1.createRow();
+ for (XWPFTableCell tableCell : tableRow.getTableCells()) {
+ // 璁剧疆鍗曞厓鏍煎唴瀹瑰眳涓榻�
+ for (XWPFParagraph paragraph : tableCell.getParagraphs()) {
+ paragraph.setAlignment(ParagraphAlignment.CENTER);
+ }
+ }
}
// XWPFTable table = document.createTable(row, cell);
//鍨傜洿
@@ -874,7 +901,7 @@
mergeCellsVertically(table1, 1, rowNum, rowNum + checkItemRowNum - 1);
mergeCellsVertically(table1, 2, rowNum, rowNum + checkItemRowNum - 1);
mergeCellsVertically(table1, 3, rowNum, rowNum + checkItemRowNum - 1);
- mergeCellsVertically(table1, 4, rowNum, 1);
+ mergeCellsVertically(table1, 4, rowNum, rowNum+1);
mergeCellsVertically(table1, cell - 1, rowNum, rowNum+1);
mergeCellsVertically(table1, cell - 1, rowNum+2, rowNum + checkItemRowNum - 1);
//姘村钩
@@ -910,7 +937,6 @@
// 瀹氫箟鏀规鏌ラ」鏍囧噯鍊�
String checkItemStandardStr = "";
XWPFParagraph paragraph3 = table1.getRow(rowNum).getCell(3).getParagraphArray(0);
- paragraph3.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run3 = paragraph3.createRun();
if (bz.get(s2) != null) {
run3.setText(bz.get(s2).toString());
@@ -919,6 +945,7 @@
XWPFParagraph paragraph4 = table1.getRow(rowNum).getCell(4).getParagraphArray(0);
+ paragraph4.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run4 = paragraph4.createRun();
run4.setText("棰戠巼锛圡Hz锛�");
@@ -928,19 +955,23 @@
run5.setText("绔彛");
XWPFParagraph paragraph6 = table1.getRow(rowNum).getCell(cell - 1).getParagraphArray(0);
+ paragraph6.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run6 = paragraph6.createRun();
run6.setText("鍒ゅ畾");
XWPFParagraph paragraph7 = table1.getRow(rowNum+1).getCell(cell - 1).getParagraphArray(0);
+ paragraph7.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run7 = paragraph7.createRun();
run7.setText("鍚堟牸");
XWPFParagraph paragraph8 = table1.getRow(rowNum+checkItemRowNum - 1).getCell(4).getParagraphArray(0);
+ paragraph8.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run8 = paragraph8.createRun();
run8.setText("骞冲潎鍊�");
XWPFParagraph paragraph9 = table1.getRow(rowNum + checkItemRowNum - 1).getCell(cell - 1).getParagraphArray(0);
+ paragraph9.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run9 = paragraph9.createRun();
run9.setText("");
@@ -948,15 +979,22 @@
String s3 = collect.get(i);
if (s3.contains("绔彛") || s3.contains("P")) {
XWPFParagraph paragraph10 = table1.getRow(rowNum+1).getCell(5 + i).getParagraphArray(0);
+ paragraph10.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run10 = paragraph10.createRun();
run10.setText(s3);
}
}
- Map<Integer, List<Map<String, Object>>> group = mapList.stream()
+ Map<BigDecimal, List<Map<String, Object>>> group = mapList.stream()
.collect(Collectors.groupingBy(item -> {
- Double aDouble = (Double) item.get("娴嬭瘯棰戠巼(MHZ)");
- return aDouble.intValue();
+ BigDecimal value = new BigDecimal(String.valueOf(item.get("娴嬭瘯棰戠巼(MHZ)")));
+ if (value.scale() <= 0 || value.stripTrailingZeros().scale() <= 0) {
+ // 娌℃湁灏忔暟閮ㄥ垎锛岃繑鍥炴暣鏁板瓧绗︿覆
+ return new BigDecimal(value.intValue());
+ } else {
+ // 鏈夊皬鏁伴儴鍒嗭紝杩斿洖鍘熷鍊肩殑瀛楃涓插舰寮�
+ return value;
+ }
}));
@@ -1025,7 +1063,7 @@
}
}
- for (Integer aDouble : group.keySet()) {
+ for (BigDecimal aDouble : group.keySet()) {
List<Map<String, Object>> mapList1 = group.get(aDouble);
for (Map<String, Object> stringObjectMap : mapList1) {
String port = stringObjectMap.get("绔彛").toString();
@@ -1058,8 +1096,7 @@
passFlag = false;
}
}
- String project = stringObjectMap.get(s2).toString();
- run10.setText(project);
+ run10.setText(String.format("%.2f",value));
}
}
}
--
Gitblit v1.9.3