From 9b2837d4b844099f3b7536065ada857b136c1c92 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 11 十二月 2024 15:29:12 +0800
Subject: [PATCH] 电路试验的驻波比csv报告解析2.0(加报告)+撤销项目还需要判断样品下的项目是不是全部都撤销了,如果都撤销了,样品也需要撤销
---
inspect-server/src/main/java/com/yuanchu/mom/utils/DianLuUtils.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/utils/DianLuUtils.java b/inspect-server/src/main/java/com/yuanchu/mom/utils/DianLuUtils.java
index 3542482..729e5a6 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/utils/DianLuUtils.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/utils/DianLuUtils.java
@@ -106,14 +106,18 @@
for (String s : list) {
String[] mHzs = s.split("MHz")[0].split("-");
//鍐嶅垽鏂繖涓鐐规槸鍚﹀湪棰戞鐨勮寖鍥村唴
- if (Integer.parseInt(stringListEntry.getKey()) <= Integer.parseInt(mHzs[1]) && Integer.parseInt(stringListEntry.getKey()) >= Integer.parseInt(mHzs[0])) {
+ if (stringListEntry.getKey().equals("700")){
+ insProductResult2.setFrequency("703-803MHz");
+ break;
+ }
+ else if (Integer.parseInt(stringListEntry.getKey()) <= Integer.parseInt(mHzs[1]) && Integer.parseInt(stringListEntry.getKey()) >= Integer.parseInt(mHzs[0])) {
insProductResult2.setFrequency(s);
break;
}
}
- if (ObjectUtils.isEmpty(insProductResult2.getFrequency())) {
- throw new ErrorException("娌℃湁鎵惧埌" + stringListEntry.getKey() + "瀵瑰簲鐨勯娈�");
- }
+ }
+ if (ObjectUtils.isEmpty(insProductResult2.getFrequency())) {
+ throw new ErrorException("娌℃湁鎵惧埌" + stringListEntry.getKey() + "瀵瑰簲鐨勯娈典俊鎭�,璇峰厛閫夋嫨棰戞淇℃伅杩涜淇濆瓨");
}
insProductResult2s.add(insProductResult2);
}
@@ -303,8 +307,7 @@
filteredList.add(result2);
}
}
- System.out.println(filteredList);
- //insProductResult2Service.saveBatch(filteredList);
+ insProductResult2Service.saveBatch(filteredList);
}
--
Gitblit v1.9.3