From dd664cf0ffa2eeef35c3e6955297b7fa2c903cc3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 24 十二月 2024 17:03:21 +0800
Subject: [PATCH] 完成截止12.24测试出来的问题
---
inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java | 106 ++++++++++++++++++++++++++++-------------------------
1 files changed, 56 insertions(+), 50 deletions(-)
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 e3fa1e2..0eebbe8 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
@@ -106,6 +106,7 @@
InsSample insSample = insSampleMapper.selectById(insOrderState.getInsSampleId());
//鏌ヨ椤圭洰
List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getState,1)
.eq(InsProduct::getInsSampleId, insSample.getId())
.eq(InsProduct::getSonLaboratory, "鐢佃矾璇曢獙"));
//鑾峰彇鏈�澶х鍙ｆ暟閲�,瑙掑害鏁伴噺,棰戞鏁伴噺
@@ -117,7 +118,8 @@
frequencys.forEach(s -> {
int ports = 0;//绔彛鏁�
int angles = 0;//瑙掑害鏁�
- for (InsProductResult2 insProductResult2 : insProductResult2s) {
+ List<InsProductResult2> productResult2s = insProductResult2s.stream().filter(insProductResult2 -> insProductResult2.getFrequency().equals(s)).collect(Collectors.toList());
+ for (InsProductResult2 insProductResult2 : productResult2s) {
if (insProductMapper.selectById(insProductResult2.getInsProductId()).getInspectionItemSubclass().equals("鐢靛帇椹绘尝姣�") && insProductResult2.getPort().split(",").length > ports) {
ports = insProductResult2.getPort().split(",").length;
}
@@ -126,7 +128,7 @@
}
}
//棰戠偣鏁�
- long often = insProductResult2s.stream().filter(insProductResult2 -> insProductResult2.getFrequency().equals(s))
+ long often = productResult2s.stream().filter(insProductResult2 -> insProductResult2.getFrequency().equals(s))
.filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId()).getInspectionItemSubclass().equals("浜掕皟")
).filter(insProductResult2 -> ObjectUtils.isNotEmpty(insProductResult2.getOften())).distinct().count();
@@ -153,17 +155,17 @@
aa += (angles + 1) * portRow;
}
if (inspectionItemSubclass.contains("鍚屾瀬鍖栭殧绂诲害")) {
- List<InsProductResult2> result2s = insProductResult2s.stream().filter(insProductResult2 ->
+ List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
- .getInspectionItemSubclass().equals("鍚屾瀬鍖栭殧绂诲害")
+ .getInspectionItemSubclass().equals("鍚屾瀬鍖栭殧绂诲害") && insProductResult2.getFrequency().equals(s)
).collect(Collectors.toList());
int length = result2s.get(0).getPort().split(",").length;
aa += (angles + 1) * (length % (ports > 8 ? 4 : (ports + 1) / 2) == 0 ? length / (ports > 8 ? 4 : (ports + 1) / 2) : length / (ports > 8 ? 4 : (ports + 1) / 2) + 1);
}
if (inspectionItemSubclass.contains("寮傛瀬鍖栭殧绂诲害")) {
- List<InsProductResult2> result2s = insProductResult2s.stream().filter(insProductResult2 ->
+ List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
- .getInspectionItemSubclass().equals("寮傛瀬鍖栭殧绂诲害")
+ .getInspectionItemSubclass().equals("寮傛瀬鍖栭殧绂诲害") && insProductResult2.getFrequency().equals(s)
).collect(Collectors.toList());
int length = result2s.get(0).getPort().split(",").length;
aa += (angles + 1) * (length % (ports > 8 ? 4 : (ports + 1) / 2) == 0 ? length / (ports > 8 ? 4 : (ports + 1) / 2) : length / (ports > 8 ? 4 : (ports + 1) / 2) + 1);
@@ -178,17 +180,17 @@
aa += (angles + 1);
}
if (inspectionItemSubclass.contains("骞呭害鍋忓樊")) {
- List<InsProductResult2> result2s = insProductResult2s.stream().filter(insProductResult2 ->
+ List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
- .getInspectionItemSubclass().equals("骞呭害鍋忓樊")
+ .getInspectionItemSubclass().equals("骞呭害鍋忓樊")&& insProductResult2.getFrequency().equals(s)
).collect(Collectors.toList());
int length = result2s.get(0).getPort().split(",").length;
aa += (angles + 1) * (length % 8 == 0 ? length / 8 : length / 8 + 1);
}
if (inspectionItemSubclass.contains("鏈�澶х浉浣嶅亸宸�")) {
- List<InsProductResult2> result2s = insProductResult2s.stream().filter(insProductResult2 ->
+ List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
- .getInspectionItemSubclass().equals("鏈�澶х浉浣嶅亸宸�")
+ .getInspectionItemSubclass().equals("鏈�澶х浉浣嶅亸宸�")&& insProductResult2.getFrequency().equals(s)
).collect(Collectors.toList());
int length = result2s.get(0).getPort().split(",").length;
aa += (angles + 1) * (length % 8 == 0 ? length / 8 : length / 8 + 1);
@@ -245,7 +247,7 @@
index.getAndIncrement();
}
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鐢靛帇椹绘尝姣�")).collect(Collectors.toList());
- List<InsProductResult2> result2s = insProductResult2s.stream()
+ List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
//鐢靛帇椹绘尝姣旀墍鍦ㄨ
@@ -347,7 +349,7 @@
List<InsProduct> products = insProducts.stream()
.filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鍚屾瀬鍖栭殧绂诲害"))
.collect(Collectors.toList());
- List<InsProductResult2> result2s = insProductResult2s.stream()
+ List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
//鍚屾瀬鍖栭殧绂诲害鎵�鍦ㄨ
@@ -439,7 +441,7 @@
List<InsProduct> products = insProducts.stream()
.filter(insProduct -> insProduct.getInspectionItemSubclass().equals("寮傛瀬鍖栭殧绂诲害"))
.collect(Collectors.toList());
- List<InsProductResult2> result2s = insProductResult2s.stream()
+ List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
//寮傛瀬鍖栭殧绂诲害鎵�鍦ㄨ
@@ -530,7 +532,7 @@
List<InsProduct> products = insProducts.stream()
.filter(insProduct -> insProduct.getInspectionItemSubclass().equals("浜掕皟"))
.collect(Collectors.toList());
- List<InsProductResult2> result2s = insProductResult2s.stream()
+ List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
//浜掕皟鎵�鍦ㄨ
@@ -623,7 +625,7 @@
index.getAndIncrement();
}
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鐢靛帇椹绘尝姣�")).collect(Collectors.toList());
- List<InsProductResult2> result2s = insProductResult2s.stream()
+ List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
//鐢靛帇椹绘尝姣旀墍鍦ㄨ
@@ -720,7 +722,7 @@
}
if (inspectionItemSubclass.contains("鍚屾瀬鍖栭殧绂诲害")) {
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鍚屾瀬鍖栭殧绂诲害")).collect(Collectors.toList());
- List<InsProductResult2> result2s = insProductResult2s.stream()
+ List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
int length = result2s.get(0).getPort().split(",").length;
@@ -843,7 +845,7 @@
}
if (inspectionItemSubclass.contains("寮傛瀬鍖栭殧绂诲害")) {
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("寮傛瀬鍖栭殧绂诲害")).collect(Collectors.toList());
- List<InsProductResult2> result2s = insProductResult2s.stream()
+ List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
int length = result2s.get(0).getPort().split(",").length;
@@ -963,13 +965,13 @@
}
}
}
- if (inspectionItemSubclass.contains("浜掕皟") && i > (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) && i <= ((ee == 0 ? ((dd == 0 ? cc : dd)) : ee) + (angles + 1) * portRow * often)) {
+ if (inspectionItemSubclass.contains("浜掕皟") && i > (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) && i <= ((ee == 0 ? ((dd == 0 ? cc : dd)) : ee) + (angles + 1) * portRow * often)) {
ff = (int) ((ee == 0 ? ((dd == 0 ? cc : dd)) : ee) + (angles + 1) * portRow * often);
if (itemSet.add("浜掕皟")) {
index.getAndIncrement();
}
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("浜掕皟")).collect(Collectors.toList());
- List<InsProductResult2> result2s = insProductResult2s.stream()
+ List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
//浜掕皟鎵�鍦ㄨ
@@ -1060,13 +1062,13 @@
cells.add(cellRenderData);
}
}
- if (inspectionItemSubclass.contains("鏈�澶ц�﹀悎搴�") && i > (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) && i <= ((ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) + (angles + 1))) {
+ if (inspectionItemSubclass.contains("鏈�澶ц�﹀悎搴�") && i > (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) && i <= ((ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) + (angles + 1))) {
gg = ((ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) + (angles + 1));
if (itemSet.add("鏈�澶ц�﹀悎搴�")) {
index.getAndIncrement();
}
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鏈�澶ц�﹀悎搴�")).collect(Collectors.toList());
- List<InsProductResult2> result2s = insProductResult2s.stream()
+ List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
//鏈�澶ц�﹀悎搴︽墍鍦ㄨ
@@ -1153,13 +1155,13 @@
cells.add(cellRenderData);
}
}
- if (inspectionItemSubclass.contains("鏈�灏忚�﹀悎搴�") && i > (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) && i <= ((gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) + (angles + 1))) {
+ if (inspectionItemSubclass.contains("鏈�灏忚�﹀悎搴�") && i > (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) && i <= ((gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) + (angles + 1))) {
hh = (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) + (angles + 1);
if (itemSet.add("鏈�灏忚�﹀悎搴�")) {
index.getAndIncrement();
}
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鏈�灏忚�﹀悎搴�")).collect(Collectors.toList());
- List<InsProductResult2> result2s = insProductResult2s.stream()
+ List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
//鏈�灏忚�﹀悎搴︽墍鍦ㄨ
@@ -1246,9 +1248,9 @@
cells.add(cellRenderData);
}
}
- if (inspectionItemSubclass.contains("骞呭害鍋忓樊")) {
+ if (inspectionItemSubclass.contains("骞呭害鍋忓樊")) {
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("骞呭害鍋忓樊")).collect(Collectors.toList());
- List<InsProductResult2> result2s = insProductResult2s.stream()
+ List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
int length = result2s.get(0).getPort().split(",").length;
@@ -1352,9 +1354,9 @@
}
}
}
- if (inspectionItemSubclass.contains("鏈�澶х浉浣嶅亸宸�")) {
+ if (inspectionItemSubclass.contains("鏈�澶х浉浣嶅亸宸�")) {
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鏈�澶х浉浣嶅亸宸�")).collect(Collectors.toList());
- List<InsProductResult2> result2s = insProductResult2s.stream()
+ List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
int length = result2s.get(0).getPort().split(",").length;
@@ -2121,7 +2123,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, insReportDto1.getSampleId()).last("limit 1")).getUserId();
+ .eq(InsSampleUser::getInsSampleId, insReportDto1.getSampleId())
+ .eq(InsSampleUser::getState,0)
+ .last("limit 1")).getUserId();
String signatureUrl;
try {
signatureUrl = userMapper.selectById(userId).getSignatureUrl();
@@ -2334,6 +2338,7 @@
//鏌ヨ椤圭洰
List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getState,1)
.eq(InsProduct::getInsSampleId, insSample.getId())
.eq(InsProduct::getSonLaboratory, "鐢佃矾璇曢獙"));
//鑾峰彇鏈�澶х鍙ｆ暟閲�,瑙掑害鏁伴噺,棰戞鏁伴噺
@@ -2345,7 +2350,8 @@
frequencys.forEach(s -> {
int ports = 0;//绔彛鏁�
int angles = 0;//瑙掑害鏁�
- for (InsProductResult2 insProductResult2 : insProductResult2s) {
+ List<InsProductResult2> productResult2s = insProductResult2s.stream().filter(insProductResult2 -> insProductResult2.getFrequency().equals(s)).collect(Collectors.toList());
+ for (InsProductResult2 insProductResult2 : productResult2s) {
if (insProductMapper.selectById(insProductResult2.getInsProductId()).getInspectionItemSubclass().equals("鐢靛帇椹绘尝姣�") && insProductResult2.getPort().split(",").length > ports) {
ports = insProductResult2.getPort().split(",").length;
}
@@ -2354,7 +2360,7 @@
}
}
//棰戠偣鏁�
- long often = insProductResult2s.stream().filter(insProductResult2 -> insProductResult2.getFrequency().equals(s))
+ long often = productResult2s.stream().filter(insProductResult2 -> insProductResult2.getFrequency().equals(s))
.filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId()).getInspectionItemSubclass().equals("浜掕皟")
).filter(insProductResult2 -> ObjectUtils.isNotEmpty(insProductResult2.getOften())).distinct().count();
@@ -2381,17 +2387,17 @@
aa += (angles + 1) * portRow;
}
if (inspectionItemSubclass.contains("鍚屾瀬鍖栭殧绂诲害")) {
- List<InsProductResult2> result2s = insProductResult2s.stream().filter(insProductResult2 ->
+ List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
- .getInspectionItemSubclass().equals("鍚屾瀬鍖栭殧绂诲害")
+ .getInspectionItemSubclass().equals("鍚屾瀬鍖栭殧绂诲害")&& insProductResult2.getFrequency().equals(s)
).collect(Collectors.toList());
int length = result2s.get(0).getPort().split(",").length;
aa += (angles + 1) * (length % (ports > 8 ? 4 : (ports + 1) / 2) == 0 ? length / (ports > 8 ? 4 : (ports + 1) / 2) : length / (ports > 8 ? 4 : (ports + 1) / 2) + 1);
}
if (inspectionItemSubclass.contains("寮傛瀬鍖栭殧绂诲害")) {
- List<InsProductResult2> result2s = insProductResult2s.stream().filter(insProductResult2 ->
+ List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
- .getInspectionItemSubclass().equals("寮傛瀬鍖栭殧绂诲害")
+ .getInspectionItemSubclass().equals("寮傛瀬鍖栭殧绂诲害")&& insProductResult2.getFrequency().equals(s)
).collect(Collectors.toList());
int length = result2s.get(0).getPort().split(",").length;
aa += (angles + 1) * (length % (ports > 8 ? 4 : (ports + 1) / 2) == 0 ? length / (ports > 8 ? 4 : (ports + 1) / 2) : length / (ports > 8 ? 4 : (ports + 1) / 2) + 1);
@@ -2406,17 +2412,17 @@
aa += (angles + 1);
}
if (inspectionItemSubclass.contains("骞呭害鍋忓樊")) {
- List<InsProductResult2> result2s = insProductResult2s.stream().filter(insProductResult2 ->
+ List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
- .getInspectionItemSubclass().equals("骞呭害鍋忓樊")
+ .getInspectionItemSubclass().equals("骞呭害鍋忓樊")&& insProductResult2.getFrequency().equals(s)
).collect(Collectors.toList());
int length = result2s.get(0).getPort().split(",").length;
aa += (angles + 1) * (length % 8 == 0 ? length / 8 : length / 8 + 1);
}
if (inspectionItemSubclass.contains("鏈�澶х浉浣嶅亸宸�")) {
- List<InsProductResult2> result2s = insProductResult2s.stream().filter(insProductResult2 ->
+ List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
- .getInspectionItemSubclass().equals("鏈�澶х浉浣嶅亸宸�")
+ .getInspectionItemSubclass().equals("鏈�澶х浉浣嶅亸宸�")&& insProductResult2.getFrequency().equals(s)
).collect(Collectors.toList());
int length = result2s.get(0).getPort().split(",").length;
aa += (angles + 1) * (length % 8 == 0 ? length / 8 : length / 8 + 1);
@@ -2473,7 +2479,7 @@
index.getAndIncrement();
}
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鐢靛帇椹绘尝姣�")).collect(Collectors.toList());
- List<InsProductResult2> result2s = insProductResult2s.stream()
+ List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
//鐢靛帇椹绘尝姣旀墍鍦ㄨ
@@ -2575,7 +2581,7 @@
List<InsProduct> products = insProducts.stream()
.filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鍚屾瀬鍖栭殧绂诲害"))
.collect(Collectors.toList());
- List<InsProductResult2> result2s = insProductResult2s.stream()
+ List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
//鍚屾瀬鍖栭殧绂诲害鎵�鍦ㄨ
@@ -2667,7 +2673,7 @@
List<InsProduct> products = insProducts.stream()
.filter(insProduct -> insProduct.getInspectionItemSubclass().equals("寮傛瀬鍖栭殧绂诲害"))
.collect(Collectors.toList());
- List<InsProductResult2> result2s = insProductResult2s.stream()
+ List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
//寮傛瀬鍖栭殧绂诲害鎵�鍦ㄨ
@@ -2758,7 +2764,7 @@
List<InsProduct> products = insProducts.stream()
.filter(insProduct -> insProduct.getInspectionItemSubclass().equals("浜掕皟"))
.collect(Collectors.toList());
- List<InsProductResult2> result2s = insProductResult2s.stream()
+ List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
//浜掕皟鎵�鍦ㄨ
@@ -2851,7 +2857,7 @@
index.getAndIncrement();
}
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鐢靛帇椹绘尝姣�")).collect(Collectors.toList());
- List<InsProductResult2> result2s = insProductResult2s.stream()
+ List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
//鐢靛帇椹绘尝姣旀墍鍦ㄨ
@@ -2948,7 +2954,7 @@
}
if (inspectionItemSubclass.contains("鍚屾瀬鍖栭殧绂诲害")) {
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鍚屾瀬鍖栭殧绂诲害")).collect(Collectors.toList());
- List<InsProductResult2> result2s = insProductResult2s.stream()
+ List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
int length = result2s.get(0).getPort().split(",").length;
@@ -3071,7 +3077,7 @@
}
if (inspectionItemSubclass.contains("寮傛瀬鍖栭殧绂诲害")) {
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("寮傛瀬鍖栭殧绂诲害")).collect(Collectors.toList());
- List<InsProductResult2> result2s = insProductResult2s.stream()
+ List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
int length = result2s.get(0).getPort().split(",").length;
@@ -3197,7 +3203,7 @@
index.getAndIncrement();
}
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("浜掕皟")).collect(Collectors.toList());
- List<InsProductResult2> result2s = insProductResult2s.stream()
+ List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
//浜掕皟鎵�鍦ㄨ
@@ -3294,7 +3300,7 @@
index.getAndIncrement();
}
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鏈�澶ц�﹀悎搴�")).collect(Collectors.toList());
- List<InsProductResult2> result2s = insProductResult2s.stream()
+ List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
//鏈�澶ц�﹀悎搴︽墍鍦ㄨ
@@ -3387,7 +3393,7 @@
index.getAndIncrement();
}
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鏈�灏忚�﹀悎搴�")).collect(Collectors.toList());
- List<InsProductResult2> result2s = insProductResult2s.stream()
+ List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
//鏈�灏忚�﹀悎搴︽墍鍦ㄨ
@@ -3476,7 +3482,7 @@
}
if (inspectionItemSubclass.contains("骞呭害鍋忓樊")) {
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("骞呭害鍋忓樊")).collect(Collectors.toList());
- List<InsProductResult2> result2s = insProductResult2s.stream()
+ List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
int length = result2s.get(0).getPort().split(",").length;
@@ -3582,7 +3588,7 @@
}
if (inspectionItemSubclass.contains("鏈�澶х浉浣嶅亸宸�")) {
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鏈�澶х浉浣嶅亸宸�")).collect(Collectors.toList());
- List<InsProductResult2> result2s = insProductResult2s.stream()
+ List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
int length = result2s.get(0).getPort().split(",").length;
--
Gitblit v1.9.3