From 50b3137d08c6535367bfa9144d18329120dd51bb Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 18 十一月 2024 14:40:15 +0800
Subject: [PATCH] 环境试验后面再按照冲水试验和振动试验进行排序
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 22 ++++++++++
inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java | 41 +++++---------------
inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java | 2 -
3 files changed, 31 insertions(+), 34 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
index b3021ea..a57cadf 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
@@ -154,7 +154,27 @@
}
}
// 姣旇緝浣嶇疆
- return Integer.compare(index1, index2);
+ int compareResult = Integer.compare(index1, index2);
+ // 濡傛灉鏄幆澧冭瘯楠岋紝涓斾袱涓璞″湪涓绘楠岄」鐩笂鎺掑簭鐩稿悓锛屽垯鐢ㄦ绾ф楠岄」鐩帓搴�
+ if (compareResult == 0 && order[index1].equals("鐜璇曢獙")) {
+ String[] subOrder = {"鍐叉按璇曢獙", "鎸姩璇曢獙"};
+ int subIndex1 = -1;
+ int subIndex2 = -1;
+ for (int i = 0; i < subOrder.length; i++) {
+ if (o1.getInspectionItemSubclass().equals(subOrder[i])) {
+ subIndex1 = i;
+ }
+ if (o2.getInspectionItemSubclass().equals(subOrder[i])) {
+ subIndex2 = i;
+ }
+ if (subIndex1 != -1 && subIndex2 != -1) {
+ break; // 涓や釜娆＄骇浣嶇疆閮芥壘鍒颁簡锛屽彲浠ラ��鍑哄惊鐜�
+ }
+ }
+ compareResult = Integer.compare(subIndex1, subIndex2);
+ }
+ // 姣旇緝浣嶇疆
+ return compareResult;
};
// 瀵瑰垪琛ㄨ繘琛屾帓搴�
Collections.sort(list, testTypeComparator);
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 6249c85..46de379 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
@@ -28,8 +28,6 @@
import javax.annotation.Resource;
import java.io.*;
-import java.nio.file.Files;
-import java.nio.file.Paths;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
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 bceb7d0..19fc1ae 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
@@ -25,6 +25,7 @@
import org.openxmlformats.schemas.wordprocessingml.x2006.main.STMerge;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
+
import javax.annotation.Resource;
import java.io.*;
import java.nio.file.Files;
@@ -1486,22 +1487,13 @@
lable.getAndIncrement();
});
});
- String url;
- try {
- ZipSecureFile.setMinInflateRatio(0.0001);
- InputStream inputStream = this.getClass().getResourceAsStream("/static/word1.docx");
- File file = File.createTempFile("temp", ".tmp");
- OutputStream outputStream = new FileOutputStream(file);
- IOUtils.copy(inputStream, outputStream);
- url = file.getAbsolutePath();
- } catch (FileNotFoundException e) {
- throw new ErrorException("鎵句笉鍒版ā鏉挎枃浠�");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+
+ ZipSecureFile.setMinInflateRatio(0.0001);
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/word1.docx");
+
ConfigureBuilder builder = Configure.builder();
builder.useSpringEL(true);
- XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
+ XWPFTemplate template = XWPFTemplate.compile(inputStream, builder.build()).render(
new HashMap<String, Object>() {{
put("title", title);
put("tables", tables);
@@ -1974,8 +1966,7 @@
getWord1(insOrderUser.getTerm(), orderState, insSamples, tables2);
}
}
- }
- else {
+ } else {
//濡傛灉鍙湁鐜璇曢獙娌℃湁鐢佃矾璇曢獙
strings.remove("杩戝満");
strings.remove("杩滃満");
@@ -2090,20 +2081,8 @@
tables4.add(table4);
}
}
-
- String url;
- try {
- ZipSecureFile.setMinInflateRatio(0.0001);
- InputStream inputStream = this.getClass().getResourceAsStream("/static/report-template.docx");
- File file = File.createTempFile("temp", ".tmp");
- OutputStream outputStream = new FileOutputStream(file);
- IOUtils.copy(inputStream, outputStream);
- url = file.getAbsolutePath();
- } catch (FileNotFoundException e) {
- throw new ErrorException("鎵句笉鍒版ā鏉挎枃浠�");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ ZipSecureFile.setMinInflateRatio(0.0001);
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/report-template.docx");
StringBuilder standardMethod2 = new StringBuilder();
for (String s : standardMethod) {
standardMethod2.append("锛沑n").append(s);
@@ -2181,7 +2160,7 @@
title3 = "杈愬皠鏂瑰悜鍥惧弬鏁�";
}
String finalTitle = title3;
- XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
+ XWPFTemplate template = XWPFTemplate.compile(inputStream, builder.build()).render(
new HashMap<String, Object>() {{
put("order", insOrder);
put("report", insReport);
--
Gitblit v1.9.3