From da699eeefe93f58c70a876fa76213b939fb362ac Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 26 二月 2025 11:54:46 +0800
Subject: [PATCH] 要求值比较支持中文的＞和＜+添加幅度和相位的电路报告+检验报告的判定依据
---
inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 154acef..c969664 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
@@ -47,6 +47,7 @@
@Resource
InsSampleMapper insSampleMapper;
+ //杩戝満
public void getFuSheWord1(String sonLaboratory, InsOrderFile insOrderFile) {
//璇诲彇excel鏂囦欢鍐呭
String excelFilePath = wordUrl + "/" + insOrderFile.getFileUrl(); // 鏇存柊涓轰綘鐨勬枃浠惰矾寰�
@@ -200,6 +201,7 @@
}
}
+ //杩滃満
public void getFuSheWord2(String sonLaboratory, InsOrderFile insOrderFile) {
//璇诲彇excel鏂囦欢鍐呭
String excelFilePath = wordUrl + "/" + insOrderFile.getFileUrl(); // 鏇存柊涓轰綘鐨勬枃浠惰矾寰�
@@ -422,8 +424,8 @@
InsSample insSample = insSampleMapper.selectById(insOrderFile.getInsSampleId());
String[] split = insOrderFile.getFileName().split("\\.");
String name = insOrderFile.getFileName().replace("#", "&").substring(0, (insOrderFile.getFileName().length() - split[split.length - 1].length()));
- String url = UUID.randomUUID() + "_" + insSample.getSampleCode() + "&" + sonLaboratory + name + "瑙ｆ瀽鐨勮緪灏勭珯鐐规姤鍛�.docx";
- url.replace("#", "&");
+ String url = UUID.randomUUID() + "_" + insSample.getSampleCode() + "_" + sonLaboratory + name + "瑙ｆ瀽鐨勮緪灏勭珯鐐规姤鍛�.docx";
+ url=url.replace("#", "&");
FileOutputStream out = new FileOutputStream(wordUrl + "/" + url);
document.write(out);
out.close();
@@ -455,7 +457,7 @@
}
}
-
+ //杩戝満
public void createWord(String sonLaboratory, XWPFDocument document, Exceldata exceldata, HashMap<String, Object> map, InsOrderFile insOrderFile) throws IOException {
int size = 1;
XWPFParagraph paragraphs = document.createParagraph();
@@ -671,6 +673,7 @@
}
}
+ //杩滃満
public void createWord2(String sonLaboratory, XWPFDocument document, Exceldata exceldata, HashMap<String, Object> map, HashMap<String, Object> pj, HashMap<String, Object> bz, InsOrderFile insOrderFile) throws IOException {
int size = 1;
for (String s : map.keySet()) {
@@ -881,8 +884,6 @@
size++;
}
}
-
-
}
--
Gitblit v1.9.3