From d589bf94e8f1863336d23fdd951049622b64db68 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 22 十一月 2024 16:36:43 +0800
Subject: [PATCH] csv文件调整
---
inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java | 4 +++-
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 3 ++-
inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java | 25 ++++++++++++++++++-------
3 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 8cb6f5f..10f3b2b 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -312,7 +312,7 @@
String contentType = file.getContentType();
InsOrderFile insOrderFile = new InsOrderFile();
insOrderFile.setInsOrderId(orderId);
- insOrderFile.setFileName(filename);
+
if (contentType != null && contentType.startsWith("image/")) {
// 鏄浘鐗�
path = imgUrl;
@@ -331,6 +331,7 @@
urlString = realpath + "/" + pathName;
file.transferTo(new File(urlString));
insOrderFile.setFileUrl(pathName);
+ insOrderFile.setFileName(pathName);
if (ObjectUtils.isNotEmpty(sonLaboratory)) {
insOrderFile.setSonLaboratory(sonLaboratory);
//鍒犻櫎閲嶅鐨勬暟鎹�
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 46de379..37056aa 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
@@ -56,6 +56,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);
@@ -89,6 +90,10 @@
else {
switch (cell.getCellType()) {
case STRING:
+ if (cell.getColumnIndex()==1) {
+ exitLoop=true;
+ break;
+ }
if (StringUtils.isNotEmpty(s)) {
datas.put(s, list);
}
@@ -113,6 +118,10 @@
System.out.print("NULL\t");
}
}
+ if (exitLoop){
+ exitLoop=false;
+ break;
+ }
if (map.isEmpty()) {
list.add(map);
}
@@ -135,15 +144,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);
}
}
}
@@ -339,8 +350,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]);
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 19fc1ae..50dabb3 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
@@ -2118,7 +2118,9 @@
List<Map<String, String>> finalDeviceList = deviceList;
List<Map<String, String>> sampleList = insSampleMapper.selectSampleList(orderId);
Integer userId = insSampleUserMapper.selectOne(Wrappers.<InsSampleUser>lambdaQuery()
- .eq(InsSampleUser::getInsSampleId, orderId).last("limit 1")).getUserId();
+ .eq(InsSampleUser::getInsSampleId, orderId)
+ .eq(InsSampleUser::getState,0)
+ .last("limit 1")).getUserId();
String signatureUrl;
try {
signatureUrl = userMapper.selectById(userId).getSignatureUrl();
--
Gitblit v1.9.3