From bc87772c260999177dc59551ea89e6e7745b0993 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 06 十二月 2024 14:10:30 +0800
Subject: [PATCH] 报告部分修改
---
inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 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 1a9ac2d..eb50374 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
@@ -45,9 +45,6 @@
InsOrderFileMapper insOrderFileMapper;
@Resource
- InsOrderMapper insOrderMapper;
-
- @Resource
InsSampleMapper insSampleMapper;
public void getFuSheWord1(String sonLaboratory, InsOrderFile insOrderFile) {
@@ -62,6 +59,7 @@
Exceldata exceldata = new Exceldata();
Map<Integer, Object> project = new HashMap<>();
HashMap<String, Object> datas1 = new HashMap<>();
+ Boolean exitLoop=false;
for (int i = 0; i < workbook.getNumberOfSheets(); i++) {
String s = "";
Sheet sheet = workbook.getSheetAt(i);
@@ -94,6 +92,10 @@
} else {
switch (cell.getCellType()) {
case STRING:
+ if (cell.getColumnIndex()==1) {
+ exitLoop=true;
+ break;
+ }
if (StringUtils.isNotEmpty(s)) {
datas.put(s, list);
}
@@ -118,6 +120,10 @@
System.out.print("NULL\t");
}
}
+ if (exitLoop){
+ exitLoop=false;
+ break;
+ }
if (map.isEmpty()) {
list.add(map);
}
@@ -140,15 +146,17 @@
for (Map<String, Object> number : hashMaps) {
number.put("绔彛", s1);
Double o = (Double) number.get("棰戠巼");
- floatList.add(o);
+ if (o!=null) {
+ floatList.add(o);
+ }
}
Double maxValue = Collections.max(floatList);
Double minValue = Collections.min(floatList);
- if (map.get(minValue + "-" + maxValue + "-" + s) == null) {
- map.put(minValue + "-" + maxValue + "-" + s, s1);
+ if (map.get(minValue + "," + maxValue + "," + s) == null) {
+ map.put(minValue + "," + maxValue + "," + s, s1);
} else {
- Object o = map.get(minValue + "-" + maxValue + "-" + s);
- map.put(minValue + "-" + maxValue + "-" + s, s1 + "," + o);
+ Object o = map.get(minValue + "," + maxValue + "," + s);
+ map.put(minValue + "," + maxValue + "," + s, s1 + "," + o);
}
}
}
@@ -344,8 +352,8 @@
runs.setText("杈愬皠鏂瑰悜鍥惧弬鏁�");
for (String s : map.keySet()) {
Map<String, Object> dataRow = exceldata.getDataRow();
- String result = s.substring(s.lastIndexOf("-") + 1);
- String result1 = s.substring(0, s.lastIndexOf("-"));
+ String result = s.substring(s.lastIndexOf(",") + 1);
+ String result1 = s.substring(0, s.lastIndexOf(","));
String o = map.get(s).toString();
String[] split = o.split(",");
Integer s1 = Integer.parseInt(split[split.length - 1]);
@@ -531,15 +539,17 @@
try {
InsSample insSample = insSampleMapper.selectById(insOrderFile.getInsSampleId());
String[] split = insOrderFile.getFileName().split("\\.");
- String name = insOrderFile.getFileName().substring(0, (insOrderFile.getFileName().length() - split[split.length - 1].length()));
- FileOutputStream out = new FileOutputStream(wordUrl + "/" + UUID.randomUUID() + "_" + insSample.getSampleCode() + "&" + sonLaboratory + name + "瑙ｆ瀽鐨勮緪灏勭珯鐐规姤鍛�.docx");
+ 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("#", "&");
+ FileOutputStream out = new FileOutputStream(wordUrl + "/" + url);
document.write(out);
out.close();
document.close();
InsOrderFile orderFile = new InsOrderFile();
orderFile.setInsOrderId(insOrderFile.getInsOrderId());
orderFile.setInsSampleId(insOrderFile.getInsSampleId());
- orderFile.setFileUrl(UUID.randomUUID() + "_" + insSample.getSampleCode() + "&" + sonLaboratory + name + "瑙ｆ瀽鐨勮緪灏勭珯鐐规姤鍛�.docx");
+ orderFile.setFileUrl(url);
orderFile.setType(2);
orderFile.setFileName(insSample.getSampleCode() + "&" + sonLaboratory + name + "瑙ｆ瀽鐨勮緪灏勭珯鐐规姤鍛�.docx");
orderFile.setSonLaboratory(sonLaboratory);
@@ -752,21 +762,21 @@
size++;
}
}
-
-
// 杈撳嚭鍒版枃浠�
try {
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()));
- FileOutputStream out = new FileOutputStream(wordUrl + "/" + UUID.randomUUID() + "_" + insSample.getSampleCode() + "&" + sonLaboratory + name + "瑙ｆ瀽鐨勮緪灏勭珯鐐规姤鍛�.docx");
+ String url = UUID.randomUUID() + "_" + insSample.getSampleCode() + "&" + sonLaboratory + name + "瑙ｆ瀽鐨勮緪灏勭珯鐐规姤鍛�.docx";
+ url.replace("#", "&");
+ FileOutputStream out = new FileOutputStream(wordUrl + "/" + url);
document.write(out);
out.close();
document.close();
InsOrderFile orderFile = new InsOrderFile();
orderFile.setInsOrderId(insOrderFile.getInsOrderId());
orderFile.setInsSampleId(insOrderFile.getInsSampleId());
- orderFile.setFileUrl(UUID.randomUUID() + "_" + insSample.getSampleCode() + "&" + sonLaboratory + name + "瑙ｆ瀽鐨勮緪灏勭珯鐐规姤鍛�.docx");
+ orderFile.setFileUrl(url);
orderFile.setType(2);
orderFile.setFileName(insSample.getSampleCode() + "&" + sonLaboratory + name + "瑙ｆ瀽鐨勮緪灏勭珯鐐规姤鍛�.docx");
orderFile.setSonLaboratory(sonLaboratory);
--
Gitblit v1.9.3