From 996c3fb89b185eedf2fd58a6c5bd5586e04cdccf Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 八月 2025 17:47:01 +0800
Subject: [PATCH] 电路试验,不同频段的要求值可以进行调整
---
inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java | 441 ++++++++++++++++++++++++------------------------------
1 files changed, 199 insertions(+), 242 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 b62f370..9f7dba1 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
@@ -280,7 +280,7 @@
style.setFontFamily("瀹嬩綋");
style.setColor("000000");
textRenderData.setStyle(style);
- if (i == 1) {
+ if (i == 0) {
//绗竴琛�
textRenderData.setText("棰戞锛�" + s + "鈭�0" + lable);
renderData.add(textRenderData);
@@ -328,7 +328,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -430,7 +430,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -522,7 +522,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -614,7 +614,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -706,7 +706,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -797,7 +797,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -891,7 +891,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -997,7 +997,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -1120,7 +1120,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -1243,7 +1243,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -1366,7 +1366,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -1484,7 +1484,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -1581,7 +1581,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -1674,7 +1674,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -1771,7 +1771,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -1878,7 +1878,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -1985,7 +1985,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -2091,7 +2091,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -2209,81 +2209,81 @@
}
// 澶勭悊鍚堝苟鍗曞厓鏍肩殑闂
String path = wordUrl + "/" + url;
- try {
- ZipSecureFile.setMinInflateRatio(0.0001);
- FileInputStream stream = new FileInputStream(path);
- XWPFDocument document = new XWPFDocument(stream);
- List<XWPFTable> xwpfTables = document.getTables();
- for (int i = 0; i < xwpfTables.size(); i++) {
- Set<String> set1 = new HashSet<>();
- Map<String, Map<String, Integer>> maps = new HashMap<>();
- for (int j = 0; j < xwpfTables.get(i).getRows().size(); j++) {
- for (int k = 0; k < xwpfTables.get(i).getRows().get(j).getTableCells().size(); k++) {
- if (xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().indexOf("鈭�") > -1) {
- String[] split = xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().split("鈭�");
- if (set1.add(split[1])) {
- Map<String, Integer> map = new HashMap<>();
- map.put("sr", j);
- map.put("sc", k);
- map.put("er", j + 0);
- map.put("ec", k + 0);
- maps.put(split[1], map);
- } else {
- Map<String, Integer> map1 = maps.get(split[1]);
- if (j == map1.get("sr")) {
- map1.put("ec", map1.get("ec") + 1);
- } else if (k == map1.get("sc")) {
- map1.put("er", map1.get("er") + 1);
- }
- }
- String str = xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().split("鈭�")[0];
- xwpfTables.get(i).getRows().get(j).getTableCells().get(k).removeParagraph(0);
- xwpfTables.get(i).getRows().get(j).getTableCells().get(k).setText(str);
- xwpfTables.get(i).getRows().get(j).getTableCells().get(k).setVerticalAlignment(XWPFTableCell.XWPFVertAlign.CENTER);
- xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getParagraphArray(0).setAlignment(org.apache.poi.xwpf.usermodel.ParagraphAlignment.CENTER);
- }
- }
- }
-
- // 鍗曞厓鏍兼帓搴�, 閬垮厤鏍煎紡閿欎贡
- List<Map.Entry<String, Map<String, Integer>>> entries = new ArrayList<>(maps.entrySet());
- entries.sort((o1, o2) -> o1.getValue().get("sc") - o2.getValue().get("sc"));
-
- // 鎸夌収椤哄簭娣诲姞杩涢泦鍚�
- List<String> list = new ArrayList<>();
- for (Map.Entry<String, Map<String, Integer>> entry : entries) {
- list.add(entry.getKey());
- }
- /*List<String> list = new ArrayList<>();
- for (String s : maps.keySet()) {
- list.add(s);
- }*/
- 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")) {
- try {
- TableTools.mergeCellsHorizonal(xwpfTables.get(i), v.get("sr") + j, v.get("sc"), v.get("ec"));
- } catch (Exception e) {
- }
- }
- }
- if (v.get("er") > v.get("sr")) {
- try {
- TableTools.mergeCellsVertically(xwpfTables.get(i), v.get("sc"), v.get("sr"), v.get("er"));
- } catch (Exception e) {
- }
- }
- }
- }
- FileOutputStream fileOutputStream = new FileOutputStream(path);
- document.write(fileOutputStream);
- fileOutputStream.close();
- } catch (FileNotFoundException e) {
- throw new RuntimeException(e);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+// try {
+// ZipSecureFile.setMinInflateRatio(0.0001);
+// FileInputStream stream = new FileInputStream(path);
+// XWPFDocument document = new XWPFDocument(stream);
+// List<XWPFTable> xwpfTables = document.getTables();
+// for (int i = 0; i < xwpfTables.size(); i++) {
+// Set<String> set1 = new HashSet<>();
+// Map<String, Map<String, Integer>> maps = new HashMap<>();
+// for (int j = 0; j < xwpfTables.get(i).getRows().size(); j++) {
+// for (int k = 0; k < xwpfTables.get(i).getRows().get(j).getTableCells().size(); k++) {
+// if (xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().indexOf("鈭�") > -1) {
+// String[] split = xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().split("鈭�");
+// if (set1.add(split[1])) {
+// Map<String, Integer> map = new HashMap<>();
+// map.put("sr", j);
+// map.put("sc", k);
+// map.put("er", j + 0);
+// map.put("ec", k + 0);
+// maps.put(split[1], map);
+// } else {
+// Map<String, Integer> map1 = maps.get(split[1]);
+// if (j == map1.get("sr")) {
+// map1.put("ec", map1.get("ec") + 1);
+// } else if (k == map1.get("sc")) {
+// map1.put("er", map1.get("er") + 1);
+// }
+// }
+// String str = xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().split("鈭�")[0];
+// xwpfTables.get(i).getRows().get(j).getTableCells().get(k).removeParagraph(0);
+// xwpfTables.get(i).getRows().get(j).getTableCells().get(k).setText(str);
+// xwpfTables.get(i).getRows().get(j).getTableCells().get(k).setVerticalAlignment(XWPFTableCell.XWPFVertAlign.CENTER);
+// xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getParagraphArray(0).setAlignment(org.apache.poi.xwpf.usermodel.ParagraphAlignment.CENTER);
+// }
+// }
+// }
+//
+// // 鍗曞厓鏍兼帓搴�, 閬垮厤鏍煎紡閿欎贡
+// List<Map.Entry<String, Map<String, Integer>>> entries = new ArrayList<>(maps.entrySet());
+// entries.sort((o1, o2) -> o1.getValue().get("sc") - o2.getValue().get("sc"));
+//
+// // 鎸夌収椤哄簭娣诲姞杩涢泦鍚�
+// List<String> list = new ArrayList<>();
+// for (Map.Entry<String, Map<String, Integer>> entry : entries) {
+// list.add(entry.getKey());
+// }
+// /*List<String> list = new ArrayList<>();
+// for (String s : maps.keySet()) {
+// list.add(s);
+// }*/
+// 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")) {
+// try {
+// TableTools.mergeCellsHorizonal(xwpfTables.get(i), v.get("sr") + j, v.get("sc"), v.get("ec"));
+// } catch (Exception e) {
+// }
+// }
+// }
+// if (v.get("er") > v.get("sr")) {
+// try {
+// TableTools.mergeCellsVertically(xwpfTables.get(i), v.get("sc"), v.get("sr"), v.get("er"));
+// } catch (Exception e) {
+// }
+// }
+// }
+// }
+// FileOutputStream fileOutputStream = new FileOutputStream(path);
+// document.write(fileOutputStream);
+// fileOutputStream.close();
+// } catch (FileNotFoundException e) {
+// throw new RuntimeException(e);
+// } catch (IOException e) {
+// throw new RuntimeException(e);
+// }
InsOrderFile insOrderFile = new InsOrderFile();
insOrderFile.setInsOrderId(insOrderState.getInsOrderId());
insOrderFile.setInsSampleId(insOrderState.getInsSampleId());
@@ -2328,7 +2328,8 @@
}
result2VOS.add(insProductResult2VO1);
}
- } else {
+ }
+ else {
insProductResult2VO.setValue(value.replace("\"", ""));
result2VOS.add(insProductResult2VO);
}
@@ -2589,6 +2590,7 @@
SampleProductDto insSample = insSampleMapper.selectSampleProductListByOrderId(insReportDto1.getSampleId());
SampleProductDto s = insSample;
List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+ .isNotNull(InsProduct::getInsResult)
.eq(InsProduct::getInsSampleId, insSample.getId())
.eq(InsProduct::getState, 1));
/*棣栭〉*/
@@ -2658,13 +2660,19 @@
if (vValues.size() > 0) {
//涓嶅悎鏍�
if (vValues.get(1) != 0) {
- productCount2 = productCount2 - 1 + vValues.get(1);
+ productCount2 = productCount2 + vValues.get(1);
}
//鍚堟牸
if (vValues.get(0) != 0) {
if (fusheProduct.getInsResult() == 1) {
- productCount3 = productCount3 - 1 + vValues.get(0);
- } else productCount3 = productCount3 + vValues.get(0);
+ productCount3 = productCount3 + vValues.get(0);
+ }
+ }
+ // 鍒ゅ畾鏄惁鍑忔帀杈愬皠妫�楠岄」鏈韩
+ if (fusheProduct.getInsResult() == 1) {
+ productCount3 = productCount3 - 1;
+ }else if(fusheProduct.getInsResult() == 0){
+ productCount2 = productCount2 - 1;
}
//鎬绘暟=椤圭洰鎬绘暟-杈愬皠椤圭洰鏁伴噺+杈愬皠鍏蜂綋鐨�(鍚堟牸+涓嶅悎鏍�)鏁伴噺
productCount = productCount - 1 + vValues.stream().mapToLong(Long::longValue).sum();
@@ -2681,7 +2689,13 @@
for (InsProduct insPro : insProducts) {
InsProductWordDto insProductWordDto = new InsProductWordDto();
insProductWordDto.setIndex(index1+"");//搴忓彿
- insProductWordDto.setTerm(insPro.getInspectionItem()+"-"+insPro.getInspectionItemSubclass());//妫�楠岄」鐩�
+ if (insPro.getInspectionItem().contains("鐢佃矾璇曢獙")){
+ insProductWordDto.setTerm("鐢垫�ц兘鍙傛暟-"+insPro.getInspectionItemSubclass());//妫�楠岄」鐩�
+ }else if (insPro.getInspectionItem().contains("杈愬皠璇曢獙")){
+ insProductWordDto.setTerm("杈愬皠鎬ц兘鍙傛暟"+insPro.getInspectionItemSubclass());//妫�楠岄」鐩�
+ }else {
+ insProductWordDto.setTerm(insPro.getInspectionItem()+"-"+insPro.getInspectionItemSubclass());//妫�楠岄」鐩�
+ }
if (ObjectUtils.isNotNull(insPro.getInsResult()) && insPro.getInsResult()==0) {
insProductWordDto.setResult("涓嶅悎鏍�");//缁撹
} else {
@@ -2729,103 +2743,11 @@
));
insOrderDocFiles.addAll(insOrderFiles);
radiationReportNum = insOrderFiles.size();
-// if (insOrderFiles.size() > 0) {
-// int aa = 0;
-// for (InsOrderFile insOrderFile : insOrderFiles) {
-// try {
-// XWPFDocument circuitParamsDoc = new XWPFDocument(new FileInputStream(wordUrl + "/" + insOrderFile.getFileUrl()));
-// // 閬嶅巻鐢佃矾鍙傛暟鏂囦欢鐨勬墍鏈夊厓绱狅紝娈佃惤鍜岃〃鏍�
-// for (IBodyElement element : circuitParamsDoc.getBodyElements()) {
-// Map<String, Object> table3 = new HashMap<>();
-// TableRenderData tableData = new TableRenderData();
-// List<RowRenderData> rows = new ArrayList<>();
-// if (element instanceof XWPFTable) {
-// aa += 1;
-// XWPFTable tab = (XWPFTable) element;
-// List<XWPFTableRow> row = tab.getRows();
-// for (int i = 0; i < row.size(); i++) {
-// RowRenderData rowRenderData = new RowRenderData();
-// List<CellRenderData> cells = new ArrayList<>();
-// List<XWPFTableCell> cell = row.get(i).getTableCells();
-// for (int j = 0; j < cell.size(); j++) {
-// 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) {
-// //鍚堝苟鍒�
-// CTHMerge hMerge = tcPr.getHMerge();
-// if (ObjectUtils.isNotEmpty(hMerge)) {
-// if (STMerge.RESTART.equals(hMerge.getVal()) || STMerge.CONTINUE.equals(hMerge.getVal())) {
-// int index = j;
-// String text = null;
-// while (text == null || text.equals("")) {
-// if (index < 0) {
-// text = "/";
-// }
-// text = cell.get(index).getText();
-// index--;
-// }
-// textRenderData.setText(text + "鈭�88" + aa + i);
-// }
-// }
-// //鍚堝苟琛�
-// CTVMerge vMerge = tcPr.getVMerge();
-// if (ObjectUtils.isNotEmpty(vMerge)) {
-// if (STMerge.RESTART.equals(vMerge.getVal()) || STMerge.CONTINUE.equals(vMerge.getVal())) {
-// int index = i;
-// String text = null;
-// while (text == null || text.equals("")) {
-// if (index < 0) {
-// text = "/";
-// break;
-// }
-// text = row.get(index).getCell(j).getText();
-// index--;
-// }
-// if (text.equals("鍚堟牸") || text.equals("涓嶅悎鏍�")) {
-// textRenderData.setText(text + "鈭�25" + aa + j);
-// } else {
-// textRenderData.setText(text + "鈭�22" + aa + j);
-// }
-// }
-// }
-// } else {
-// textRenderData.setText(cell.get(j).getText());
-// }
-// renderData.add(textRenderData);
-// paragraphRenderData.setContents(renderData);
-// paragraphRenderDataList.add(paragraphRenderData);
-// cellRenderData.setParagraphs(paragraphRenderDataList);
-// cells.add(cellRenderData);
-// }
-// rowRenderData.setCells(cells);
-// rows.add(rowRenderData);
-// }
-// tableData.setRows(rows);
-// table3.put("table3", tableData);
-// tables3.add(table3);
-// }
-// }
-// } catch (IOException e) {
-// e.printStackTrace();
-// }
-// }
-// }
}
//杈愬皠鐨勬爣棰�
String title3 = "";
if (radiationReportNum > 0) {
- title3 = "杈愬皠鏂瑰悜鍥惧弬鏁�";
+ title3 = "杈愬皠鎬ц兘鍙傛暟";
}
//鐜琛ㄦ牸
List<Map<String, Object>> tables4 = new ArrayList<>();
@@ -2971,13 +2893,14 @@
if (i % 2 == 0) {
urlListDto = new UrlListDto();
urlListDto.setImageOne(Pictures.ofLocal(imgUrl + "/" + insOrderFiles.get(i).getFileUrl()).create());
+ if (i == insOrderFiles.size() - 1) {
+ urlList.add(urlListDto);
+ }
} else {
urlListDto.setImageTwo(Pictures.ofLocal(imgUrl + "/" + insOrderFiles.get(i).getFileUrl()).create());
urlList.add(urlListDto);
}
- if (i == insOrderFiles.size() - 1) {
- urlList.add(urlListDto);
- }
+
}
}
//鏍峰搧缂栧彿鍙傜収涓婅堪sampleCode
@@ -3255,7 +3178,7 @@
private void getWord1(String term, InsOrderState insOrderState, List<Map<String, Object>> tables2) {
AtomicInteger lable = new AtomicInteger(1);
AtomicInteger index = new AtomicInteger();
- String title = term + "鐢佃矾鍙傛暟";
+ String title = term + "鐢垫�ц兘鍙傛暟";
InsSample insSample = insSampleMapper.selectById(insOrderState.getInsSampleId());
//鏌ヨ椤圭洰
List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
@@ -3526,7 +3449,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -3572,8 +3495,9 @@
if (i % 2 == 0) {
//鏈�宸��
String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
+ String text = value.split(",")[(j - 5) + (i - 1) / 2 * (Math.min(ports, 8))];
try {
- textRenderData.setText(value.split(",")[(j - 5) + (i - 1) / 2 * (Math.min(ports, 8))]);
+ textRenderData.setText(String.format("%.2f",Double.parseDouble(text)));
} catch (Exception e) {
textRenderData.setText("");
}
@@ -3630,7 +3554,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -3661,7 +3585,8 @@
} else if (j % 2 == 0) {
String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
try {
- textRenderData.setText(value.split(",")[(j - 6) / 2 + (i - cc - 1) * 4] + "鈭�5" + i + (j - 6));
+ String text = value.split(",")[(j - 6) / 2 + (i - cc - 1) * 4];
+ textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "鈭�5" + i + (j - 6));
} catch (Exception e) {
textRenderData.setText("");
}
@@ -3673,7 +3598,8 @@
} else {
String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
try {
- textRenderData.setText(value.split(",")[(j - 5) / 2 + (i - cc - 1) * 4] + "鈭�5" + i + (j - 5));
+ String text = value.split(",")[(j - 5) / 2 + (i - cc - 1) * 4];
+ textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "鈭�5" + i + (j - 5));
} catch (Exception e) {
textRenderData.setText("");
}
@@ -3722,7 +3648,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -3753,7 +3679,8 @@
} else if (j % 2 == 0) {
String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
try {
- textRenderData.setText(value.split(",")[(j - 6) / 2 + (i - (dd == 0 ? cc : dd) - 1) * 4] + "鈭�5" + i + (j - 6));
+ String text = value.split(",")[(j - 6) / 2 + (i - (dd == 0 ? cc : dd) - 1) * 4];
+ textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "鈭�5" + i + (j - 6));
} catch (Exception e) {
textRenderData.setText("");
}
@@ -3765,7 +3692,8 @@
} else {
String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
try {
- textRenderData.setText(value.split(",")[(j - 5) / 2 + (i - (dd == 0 ? cc : dd) - 1) * 4] + "鈭�5" + i + (j - 5));
+ String text = value.split(",")[(j - 5) / 2 + (i - (dd == 0 ? cc : dd) - 1) * 4];
+ textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "鈭�5" + i + (j - 5));
} catch (Exception e) {
textRenderData.setText("");
}
@@ -3814,7 +3742,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -3845,7 +3773,8 @@
} else if (j % 2 == 0) {
String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
try {
- textRenderData.setText(value.split(",")[(j - 6) / 2 + (i - (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) - 1) * 4] + "鈭�5" + i + (j - 6));
+ String text = value.split(",")[(j - 6) / 2 + (i - (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) - 1) * 4];
+ textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "鈭�5" + i + (j - 6));
} catch (Exception e) {
textRenderData.setText("");
}
@@ -3857,7 +3786,8 @@
} else {
String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
try {
- textRenderData.setText(value.split(",")[(j - 5) / 2 + (i - (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) - 1) * 4] + "鈭�5" + i + (j - 5));
+ String text = value.split(",")[(j - 5) / 2 + (i - (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) - 1) * 4];
+ textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "鈭�5" + i + (j - 5));
} catch (Exception e) {
textRenderData.setText("");
}
@@ -3906,7 +3836,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -3937,7 +3867,8 @@
} else if (j % 2 == 0) {
String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
try {
- textRenderData.setText(value.split(",")[(j - 6) / 2 + (i - (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) - 1) * 4] + "鈭�5" + i + (j - 6));
+ String text = value.split(",")[(j - 6) / 2 + (i - (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) - 1) * 4];
+ textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "鈭�5" + i + (j - 6));
} catch (Exception e) {
textRenderData.setText("");
}
@@ -3949,7 +3880,8 @@
} else {
String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
try {
- textRenderData.setText(value.split(",")[(j - 5) / 2 + (i - (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) - 1) * 4] + "鈭�5" + i + (j - 5));
+ String text = value.split(",")[(j - 5) / 2 + (i - (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) - 1) * 4];
+ textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "鈭�5" + i + (j - 5));
} catch (Exception e) {
textRenderData.setText("");
}
@@ -3997,7 +3929,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -4040,7 +3972,8 @@
String[] value = result2s.get((i - (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg)) / portRow / (angles + 2)).getValue().split("\\],\\[");
String[] split = value[(i - (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) - 2) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
try {
- textRenderData.setText(split[((j - 5) + ((i - (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) - 1) / (angles + 1) % portRow) * (Math.min(ports, 8)))]);
+ String text = split[((j - 5) + ((i - (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) - 1) / (angles + 1) % portRow) * (Math.min(ports, 8)))];
+ textRenderData.setText(String.format("%.2f",Double.parseDouble(text)));
} catch (Exception e) {
textRenderData.setText("");
}
@@ -4091,7 +4024,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -4144,7 +4077,8 @@
String[] value = result2s.get(0).getValue().split("\\],\\[");
String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
try {
- textRenderData.setText(split[(j - 5) + ((i + (angles - 1)) / (angles + 1) - 1) * (Math.min(ports, 8))]);
+ String text = split[(j - 5) + ((i + (angles - 1)) / (angles + 1) - 1) * (Math.min(ports, 8))];
+ textRenderData.setText(String.format("%.2f",Double.parseDouble(text)));
} catch (Exception e) {
textRenderData.setText("");
}
@@ -4196,7 +4130,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -4259,13 +4193,15 @@
String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
if (j % 2 == 0) {
try {
- textRenderData.setText(split[(j - 6) / 2 + ((i - cc) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)] + "鈭�5" + i + (j - 6));
+ String text = split[(j - 6) / 2 + ((i - cc) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)];
+ textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "鈭�5" + i + (j - 6));
} catch (Exception e) {
textRenderData.setText("");
}
} else {
try {
- textRenderData.setText(split[(j - 5) / 2 + ((i - cc) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)] + "鈭�5" + i + (j - 5));
+ String text = split[(j - 5) / 2 + ((i - cc) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)];
+ textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "鈭�5" + i + (j - 5));
} catch (Exception e) {
textRenderData.setText("");
}
@@ -4319,7 +4255,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -4382,13 +4318,15 @@
String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
if (j % 2 == 0) {
try {
- textRenderData.setText(split[(j - 6) / 2 + ((i - (dd == 0 ? cc : dd)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)] + "鈭�5" + i + (j - 6));
+ String text = split[(j - 6) / 2 + ((i - (dd == 0 ? cc : dd)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)];
+ textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "鈭�5" + i + (j - 6));
} catch (Exception e) {
textRenderData.setText("");
}
} else {
try {
- textRenderData.setText(split[(j - 5) / 2 + ((i - (dd == 0 ? cc : dd)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)] + "鈭�5" + i + (j - 5));
+ String text = split[(j - 5) / 2 + ((i - (dd == 0 ? cc : dd)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)];
+ textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "鈭�5" + i + (j - 5));
} catch (Exception e) {
textRenderData.setText("");
}
@@ -4442,7 +4380,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -4505,13 +4443,15 @@
String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
if (j % 2 == 0) {
try {
- textRenderData.setText(split[(j - 6) / 2 + ((i - (ee == 0 ? ((dd == 0 ? cc : dd)) : ee)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)] + "鈭�5" + i + (j - 6));
+ String text = split[(j - 6) / 2 + ((i - (ee == 0 ? ((dd == 0 ? cc : dd)) : ee)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)];
+ textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "鈭�5" + i + (j - 6));
} catch (Exception e) {
textRenderData.setText("");
}
} else {
try {
- textRenderData.setText(split[(j - 5) / 2 + ((i - (ee == 0 ? ((dd == 0 ? cc : dd)) : ee)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)] + "鈭�5" + i + (j - 5));
+ String text = split[(j - 5) / 2 + ((i - (ee == 0 ? ((dd == 0 ? cc : dd)) : ee)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)];
+ textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "鈭�5" + i + (j - 5));
} catch (Exception e) {
textRenderData.setText("");
}
@@ -4565,7 +4505,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -4627,13 +4567,15 @@
String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
if (j % 2 == 0) {
try {
- textRenderData.setText(split[(j - 6) / 2 + ((i - (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)] + "鈭�5" + i + (j - 6));
+ String text = split[(j - 6) / 2 + ((i - (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)];
+ textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "鈭�5" + i + (j - 6));
} catch (Exception e) {
textRenderData.setText("");
}
} else {
try {
- textRenderData.setText(split[(j - 5) / 2 + ((i - (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)] + "鈭�5" + i + (j - 5));
+ String text = split[(j - 5) / 2 + ((i - (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)];
+ textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "鈭�5" + i + (j - 5));
} catch (Exception e) {
textRenderData.setText("");
}
@@ -4683,7 +4625,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -4732,7 +4674,8 @@
String[] value = result2s.get((i - (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg)) / portRow / (angles + 2)).getValue().split("\\],\\[");
String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
try {
- textRenderData.setText(split[((j - 5) + ((i - (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) - 1) / (angles + 1) % portRow) * (Math.min(ports, 8)))]);
+ String text = split[((j - 5) + ((i - (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) - 1) / (angles + 1) % portRow) * (Math.min(ports, 8)))];
+ textRenderData.setText(String.format("%.2f",Double.parseDouble(text)));
} catch (Exception e) {
textRenderData.setText("");
}
@@ -4780,7 +4723,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -4828,7 +4771,12 @@
//鏈�宸��
String[] value = result2s.get(0).getValue().split("\\],\\[");
String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
- textRenderData.setText(split[0] + "鈭�7" + i);
+ String text = split[0];
+ if (ObjectUtils.isEmpty(text)){
+ textRenderData.setText("" + "鈭�7" + i);
+ }else {
+ textRenderData.setText(String.format("%.2f", Double.parseDouble(text)) + "鈭�7" + i);
+ }
}
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
@@ -4873,7 +4821,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -4921,7 +4869,12 @@
//鏈�宸��
String[] value = result2s.get(0).getValue().split("\\],\\[");
String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
- textRenderData.setText(split[0] + "鈭�7" + i);
+ String text = split[0];
+ if (ObjectUtils.isEmpty(text)){
+ textRenderData.setText("" + "鈭�7" + i);
+ }else {
+ textRenderData.setText(String.format("%.2f", Double.parseDouble(text)) + "鈭�7" + i);
+ }
}
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
@@ -4970,7 +4923,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -5023,7 +4976,8 @@
String[] value = result2s.get(0).getValue().split("\\],\\[");
String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
try {
- textRenderData.setText(split[(j - 5) + ((i - (nn == 0 ? (mm == 0 ? (hh == 0 ? (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) : hh) : mm) : nn)) / (angles + 2)) * Math.min(length, 8)]);
+ String text = split[(j - 5) + ((i - (nn == 0 ? (mm == 0 ? (hh == 0 ? (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) : hh) : mm) : nn)) / (angles + 2)) * Math.min(length, 8)];
+ textRenderData.setText(String.format("%.2f",Double.parseDouble(text)));
} catch (Exception e) {
textRenderData.setText("");
}
@@ -5077,7 +5031,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -5130,7 +5084,8 @@
String[] value = result2s.get(0).getValue().split("\\],\\[");
String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
try {
- textRenderData.setText(split[(j - 5) + ((i - (pp == 0 ? (nn == 0 ? (mm == 0 ? (hh == 0 ? (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) : hh) : mm) : nn) : pp)) / (angles + 2)) * Math.min(length, 8)]);
+ String text = split[(j - 5) + ((i - (pp == 0 ? (nn == 0 ? (mm == 0 ? (hh == 0 ? (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) : hh) : mm) : nn) : pp)) / (angles + 2)) * Math.min(length, 8)];
+ textRenderData.setText(String.format("%.2f",Double.parseDouble(text)));
} catch (Exception e) {
textRenderData.setText("");
}
@@ -5184,7 +5139,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -5237,7 +5192,8 @@
String[] value = result2s.get(0).getValue().split("\\],\\[");
String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
try {
- textRenderData.setText(split[(j - 5) + ((i - rr) / (angles + 2)) * Math.min(length, 8)]);
+ String text = split[(j - 5) + ((i - rr) / (angles + 2)) * Math.min(length, 8)];
+ textRenderData.setText(String.format("%.2f",Double.parseDouble(text)));
} catch (Exception e) {
textRenderData.setText("");
}
@@ -5290,7 +5246,7 @@
cells.add(cellRenderData);
} else if (j == 3) {
//绗洓鍒�
- textRenderData.setText(products.get(0).getAsk() + "鈭�4" + index);
+ textRenderData.setText(ObjectUtils.isNull(result2s.get(0).getAsk())?products.get(0).getAsk():result2s.get(0).getAsk() + "鈭�4" + index);
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -5343,7 +5299,8 @@
String[] value = result2s.get(0).getValue().split("\\],\\[");
String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
try {
- textRenderData.setText(split[(j - 5) + ((i - ss) / (angles + 2)) * Math.min(length, 8)]);
+ String text = split[(j - 5) + ((i - ss) / (angles + 2)) * Math.min(length, 8)];
+ textRenderData.setText(String.format("%.2f",Double.parseDouble(text)));
} catch (Exception e) {
textRenderData.setText("");
}
@@ -5396,7 +5353,7 @@
//鐢佃矾鎶ュ憡鐢ㄤ簬鎬绘姤鍛婄殑鏂规硶(鏃犳簮鍣ㄤ欢)
private void getWord2(String term, InsOrderState insOrderState, List<Map<String, Object>> tables2) {
AtomicInteger index = new AtomicInteger();
- String title = term + "鐢佃矾鍙傛暟";
+ String title = term + "鐢垫�ц兘鍙傛暟";
//鏌ヨ鏍峰搧
InsSample insSample = insSampleMapper.selectById(insOrderState.getInsSampleId());
//鏌ヨ椤圭洰
@@ -5428,7 +5385,7 @@
List<RowRenderData> rows = new ArrayList<>();
Set<String> itemSet = new HashSet<>();
//琛ㄦ牸鐨勮鏁�
- for (int i = 0; i < result2VOS.size()+1; i++) {
+ for (int i = 0; i < result2VOS.size(); i++) {
RowRenderData rowRenderData = new RowRenderData();
RowStyle rowStyle = new RowStyle();
rowStyle.setHeight(40);
--
Gitblit v1.9.3