From e59b660b580fd96447b213679d55202529370028 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 23 十二月 2024 14:20:00 +0800
Subject: [PATCH] 报告调整
---
system-run/src/main/resources/application-dev.yml | 12 ++--
inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java | 151 +++++++++++++++++++++++++-------------------------
inspect-server/src/main/java/com/yuanchu/mom/utils/DianLuUtils.java | 2
inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java | 4
4 files changed, 85 insertions(+), 84 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 868718e..387ec5e 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
@@ -141,7 +141,7 @@
//鏌ヨ璇ユ牱鍝佺殑鍚屾瀬鍖栭殧绂诲害椤圭洰id
List<InsProduct> products2 = products.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鍚屾瀬鍖栭殧绂诲害")).collect(Collectors.toList());
//鏌ヨ璇ユ牱鍝佺殑闅旂搴﹂」鐩甶d
- List<InsProduct> products6 = products.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("闅旂搴�")).collect(Collectors.toList());
+ List<InsProduct> products6 = products.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鍚屽垪闅旂搴�")).collect(Collectors.toList());
//鏌ヨ璇ユ牱鍝佺殑绔彛闂撮殧绂诲害椤圭洰id
List<InsProduct> products7 = products.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("绔彛闂撮殧绂诲害")).collect(Collectors.toList());
//鏌ヨ璇ユ牱鍝佺殑寮傛瀬鍖栭殧绂诲害椤圭洰id
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 9b083d5..97258fd 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
@@ -422,8 +422,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();
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 0e5e6ce..1ce8337 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
@@ -138,29 +138,29 @@
int portRow = ports % 8 == 0 ? ports / 8 : ports / 8 + 1;
//鍏堝垽鏂槸1绠�鍗曠増杩樻槸0澶嶆潅鐗�
if (insOrderState.getVersion() == 1) {
- if (inspectionItemSubclass.equals("鐢靛帇椹绘尝姣�")) {
+ if (inspectionItemSubclass.contains("鐢靛帇椹绘尝姣�")) {
aa += 2 * portRow;
}
- if (inspectionItemSubclass.equals("鍚屾瀬鍖栭殧绂诲害")) {
+ if (inspectionItemSubclass.contains("鍚屾瀬鍖栭殧绂诲害")) {
aa += 1 * portRow;
}
- if (inspectionItemSubclass.equals("闅旂搴�")) {
+ if (inspectionItemSubclass.contains("鍚屽垪闅旂搴�")) {
aa += 1 * portRow;
}
- if (inspectionItemSubclass.equals("绔彛闂撮殧绂诲害")) {
+ if (inspectionItemSubclass.contains("绔彛闂撮殧绂诲害")) {
aa += 1 * portRow;
}
- if (inspectionItemSubclass.equals("寮傛瀬鍖栭殧绂诲害")) {
+ if (inspectionItemSubclass.contains("寮傛瀬鍖栭殧绂诲害")) {
aa += 1 * portRow;
}
- if (inspectionItemSubclass.equals("浜掕皟")) {
+ if (inspectionItemSubclass.contains("浜掕皟")) {
aa += (angles + 1) * portRow * often;
}
} else {
- if (inspectionItemSubclass.equals("鐢靛帇椹绘尝姣�")) {
+ if (inspectionItemSubclass.contains("鐢靛帇椹绘尝姣�")) {
aa += (angles + 1) * portRow;
}
- if (inspectionItemSubclass.equals("鍚屾瀬鍖栭殧绂诲害")) {
+ if (inspectionItemSubclass.contains("鍚屾瀬鍖栭殧绂诲害")) {
List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
.getInspectionItemSubclass().equals("鍚屾瀬鍖栭殧绂诲害") && insProductResult2.getFrequency().equals(s)
@@ -168,15 +168,15 @@
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.equals("闅旂搴�")) {
+ if (inspectionItemSubclass.contains("鍚屽垪闅旂搴�")) {
List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
- .getInspectionItemSubclass().equals("闅旂搴�") && insProductResult2.getFrequency().equals(s)
+ .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.equals("绔彛闂撮殧绂诲害")) {
+ if (inspectionItemSubclass.contains("绔彛闂撮殧绂诲害")) {
List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
.getInspectionItemSubclass().equals("绔彛闂撮殧绂诲害") && insProductResult2.getFrequency().equals(s)
@@ -184,7 +184,7 @@
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.equals("寮傛瀬鍖栭殧绂诲害")) {
+ if (inspectionItemSubclass.contains("寮傛瀬鍖栭殧绂诲害")) {
List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
.getInspectionItemSubclass().equals("寮傛瀬鍖栭殧绂诲害") && insProductResult2.getFrequency().equals(s)
@@ -192,16 +192,16 @@
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.equals("浜掕皟")) {
+ if (inspectionItemSubclass.contains("浜掕皟")) {
aa += (angles + 1) * portRow * often;
}
- if (inspectionItemSubclass.equals("鏈�澶ц�﹀悎搴�")) {
+ if (inspectionItemSubclass.contains("鏈�澶ц�﹀悎搴�")) {
aa += (angles + 1);
}
- if (inspectionItemSubclass.equals("鏈�灏忚�﹀悎搴�")) {
+ if (inspectionItemSubclass.contains("鏈�灏忚�﹀悎搴�")) {
aa += (angles + 1);
}
- if (inspectionItemSubclass.equals("骞呭害鍋忓樊")) {
+ if (inspectionItemSubclass.contains("骞呭害鍋忓樊")) {
List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
.getInspectionItemSubclass().equals("骞呭害鍋忓樊")&& insProductResult2.getFrequency().equals(s)
@@ -209,7 +209,7 @@
int length = result2s.get(0).getPort().split(",").length;
aa += (angles + 1) * (length % 8 == 0 ? length / 8 : length / 8 + 1);
}
- if (inspectionItemSubclass.equals("鏈�澶х浉浣嶅亸宸�")) {
+ if (inspectionItemSubclass.contains("鏈�澶х浉浣嶅亸宸�")) {
List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
.getInspectionItemSubclass().equals("鏈�澶х浉浣嶅亸宸�")&& insProductResult2.getFrequency().equals(s)
@@ -265,7 +265,7 @@
} else {
if (insOrderState.getVersion() == 1) {
//闈炵數璋冪増鏈�(绠�鍗曠増)
- if (inspectionItemSubclass.equals("鐢靛帇椹绘尝姣�") && i <= 2 * portRow) {
+ if (inspectionItemSubclass.contains("鐢靛帇椹绘尝姣�") && i <= 2 * portRow) {
cc = 2 * portRow;
if (itemSet.add("鐢靛帇椹绘尝姣�")) {
index.getAndIncrement();
@@ -365,7 +365,7 @@
cells.add(cellRenderData);
}
}
- if (inspectionItemSubclass.equals("鍚屾瀬鍖栭殧绂诲害") && i > cc && i <= cc + portRow) {
+ if (inspectionItemSubclass.contains("鍚屾瀬鍖栭殧绂诲害") && i > cc && i <= cc + portRow) {
dd = cc + portRow;
if (itemSet.add("鍚屾瀬鍖栭殧绂诲害")) {
index.getAndIncrement();
@@ -457,13 +457,13 @@
cells.add(cellRenderData);
}
}
- if (inspectionItemSubclass.equals("闅旂搴�") && i > (dd == 0 ? cc : dd) && i <= (dd == 0 ? cc : dd) + portRow) {
+ if (inspectionItemSubclass.contains("鍚屽垪闅旂搴�") && i > (dd == 0 ? cc : dd) && i <= (dd == 0 ? cc : dd) + portRow) {
ee = (dd == 0 ? cc : dd) + portRow;
- if (itemSet.add("闅旂搴�")) {
+ if (itemSet.add("鍚屽垪闅旂搴�")) {
index.getAndIncrement();
}
List<InsProduct> products = insProducts.stream()
- .filter(insProduct -> insProduct.getInspectionItemSubclass().equals("闅旂搴�"))
+ .filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鍚屽垪闅旂搴�"))
.collect(Collectors.toList());
List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
@@ -549,7 +549,7 @@
cells.add(cellRenderData);
}
}
- if (inspectionItemSubclass.equals("绔彛闂撮殧绂诲害") && i > (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) && i <= (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) + portRow) {
+ if (inspectionItemSubclass.contains("绔彛闂撮殧绂诲害") && i > (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) && i <= (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) + portRow) {
ff = (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) + portRow;
if (itemSet.add("绔彛闂撮殧绂诲害")) {
index.getAndIncrement();
@@ -641,7 +641,7 @@
cells.add(cellRenderData);
}
}
- if (inspectionItemSubclass.equals("寮傛瀬鍖栭殧绂诲害") && i >(ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff)&& i <= (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) + portRow) {
+ 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) + portRow) {
gg = (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) + portRow;
if (itemSet.add("寮傛瀬鍖栭殧绂诲害")) {
index.getAndIncrement();
@@ -733,7 +733,7 @@
cells.add(cellRenderData);
}
}
- if (inspectionItemSubclass.equals("浜掕皟") && i > (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg)) {
+ if (inspectionItemSubclass.contains("浜掕皟") && i > (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg)) {
if (itemSet.add("浜掕皟")) {
index.getAndIncrement();
}
@@ -827,7 +827,7 @@
}
} else {
//鐢佃皟鐗堟湰(澶嶆潅鐗�)
- if (inspectionItemSubclass.equals("鐢靛帇椹绘尝姣�") && i <= (angles + 1) * portRow) {
+ if (inspectionItemSubclass.contains("鐢靛帇椹绘尝姣�") && i <= (angles + 1) * portRow) {
cc = (angles + 1) * portRow;
if (itemSet.add("鐢靛帇椹绘尝姣�")) {
index.getAndIncrement();
@@ -928,7 +928,7 @@
cells.add(cellRenderData);
}
}
- if (inspectionItemSubclass.equals("鍚屾瀬鍖栭殧绂诲害")) {
+ if (inspectionItemSubclass.contains("鍚屾瀬鍖栭殧绂诲害")) {
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鍚屾瀬鍖栭殧绂诲害")).collect(Collectors.toList());
List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
@@ -1051,8 +1051,8 @@
}
}
}
- if (inspectionItemSubclass.equals("闅旂搴�")) {
- List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("闅旂搴�")).collect(Collectors.toList());
+ if (inspectionItemSubclass.contains("鍚屽垪闅旂搴�")) {
+ List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鍚屽垪闅旂搴�")).collect(Collectors.toList());
List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
@@ -1061,7 +1061,7 @@
int k = (angles + 1) * portRow2;
if (i > (dd == 0 ? cc : dd) && i <= (dd == 0 ? cc : dd) + k) {
ee = (dd == 0 ? cc : dd) + k;
- if (itemSet.add("闅旂搴�")) {
+ if (itemSet.add("鍚屽垪闅旂搴�")) {
index.getAndIncrement();
}
//闅旂搴︽墍鍦ㄨ
@@ -1174,7 +1174,7 @@
}
}
}
- if (inspectionItemSubclass.equals("绔彛闂撮殧绂诲害")) {
+ if (inspectionItemSubclass.contains("绔彛闂撮殧绂诲害")) {
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("绔彛闂撮殧绂诲害")).collect(Collectors.toList());
List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
@@ -1297,7 +1297,7 @@
}
}
}
- if (inspectionItemSubclass.equals("寮傛瀬鍖栭殧绂诲害")) {
+ if (inspectionItemSubclass.contains("寮傛瀬鍖栭殧绂诲害")) {
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("寮傛瀬鍖栭殧绂诲害")).collect(Collectors.toList());
List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
@@ -1419,7 +1419,7 @@
}
}
}
- if (inspectionItemSubclass.equals("浜掕皟") && 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) * portRow * often)) {
+ 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) * portRow * often)) {
hh = (int) ((gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) + (angles + 1) * portRow * often);
if (itemSet.add("浜掕皟")) {
index.getAndIncrement();
@@ -1516,7 +1516,7 @@
cells.add(cellRenderData);
}
}
- if (inspectionItemSubclass.equals("鏈�澶ц�﹀悎搴�") && i > (hh==0?(gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg):hh) && i <= ((hh==0?(gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg):hh) + (angles + 1))) {
+ if (inspectionItemSubclass.contains("鏈�澶ц�﹀悎搴�") && i > (hh==0?(gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg):hh) && i <= ((hh==0?(gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg):hh) + (angles + 1))) {
mm = ((hh==0?(gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg):hh) + (angles + 1));
if (itemSet.add("鏈�澶ц�﹀悎搴�")) {
index.getAndIncrement();
@@ -1609,7 +1609,7 @@
cells.add(cellRenderData);
}
}
- if (inspectionItemSubclass.equals("鏈�灏忚�﹀悎搴�") && i > (mm == 0 ? (hh==0?(gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg):hh) : mm) && i <= ((mm == 0 ? (hh==0?(gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg):hh) : mm) + (angles + 1))) {
+ if (inspectionItemSubclass.contains("鏈�灏忚�﹀悎搴�") && i > (mm == 0 ? (hh==0?(gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg):hh) : mm) && i <= ((mm == 0 ? (hh==0?(gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg):hh) : mm) + (angles + 1))) {
nn = (mm == 0 ? (hh==0?(gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg):hh) : mm) + (angles + 1);
if (itemSet.add("鏈�灏忚�﹀悎搴�")) {
index.getAndIncrement();
@@ -1702,7 +1702,7 @@
cells.add(cellRenderData);
}
}
- if (inspectionItemSubclass.equals("骞呭害鍋忓樊")) {
+ if (inspectionItemSubclass.contains("骞呭害鍋忓樊")) {
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("骞呭害鍋忓樊")).collect(Collectors.toList());
List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
@@ -1808,7 +1808,7 @@
}
}
}
- if (inspectionItemSubclass.equals("鏈�澶х浉浣嶅亸宸�")) {
+ if (inspectionItemSubclass.contains("鏈�澶х浉浣嶅亸宸�")) {
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鏈�澶х浉浣嶅亸宸�")).collect(Collectors.toList());
List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
@@ -2824,29 +2824,30 @@
int portRow = ports % 8 == 0 ? ports / 8 : ports / 8 + 1;
//鍏堝垽鏂槸1绠�鍗曠増杩樻槸0澶嶆潅鐗�
if (insOrderState.getVersion() == 1) {
- if (inspectionItemSubclass.equals("鐢靛帇椹绘尝姣�")) {
+ if (inspectionItemSubclass.contains("鐢靛帇椹绘尝姣�")) {
aa += 2 * portRow;
}
- if (inspectionItemSubclass.equals("鍚屾瀬鍖栭殧绂诲害")) {
+ if (inspectionItemSubclass.contains("鍚屾瀬鍖栭殧绂诲害")) {
aa += 1 * portRow;
}
- if (inspectionItemSubclass.equals("闅旂搴�")) {
+ if (inspectionItemSubclass.contains("鍚屽垪闅旂搴�")) {
aa += 1 * portRow;
}
- if (inspectionItemSubclass.equals("绔彛闂撮殧绂诲害")) {
+ if (inspectionItemSubclass.contains("绔彛闂撮殧绂诲害")) {
aa += 1 * portRow;
}
- if (inspectionItemSubclass.equals("寮傛瀬鍖栭殧绂诲害")) {
+ if (inspectionItemSubclass.contains("寮傛瀬鍖栭殧绂诲害")) {
aa += 1 * portRow;
}
- if (inspectionItemSubclass.equals("浜掕皟")) {
+ if (inspectionItemSubclass.contains("浜掕皟")) {
aa += (angles + 1) * portRow * often;
}
- } else {
- if (inspectionItemSubclass.equals("鐢靛帇椹绘尝姣�")) {
+ }
+ else {
+ if (inspectionItemSubclass.contains("鐢靛帇椹绘尝姣�")) {
aa += (angles + 1) * portRow;
}
- if (inspectionItemSubclass.equals("鍚屾瀬鍖栭殧绂诲害")) {
+ if (inspectionItemSubclass.contains("鍚屾瀬鍖栭殧绂诲害")) {
List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
.getInspectionItemSubclass().equals("鍚屾瀬鍖栭殧绂诲害") && insProductResult2.getFrequency().equals(s)
@@ -2854,15 +2855,15 @@
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.equals("闅旂搴�")) {
+ if (inspectionItemSubclass.contains("鍚屽垪闅旂搴�")) {
List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
- .getInspectionItemSubclass().equals("闅旂搴�") && insProductResult2.getFrequency().equals(s)
+ .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.equals("绔彛闂撮殧绂诲害")) {
+ if (inspectionItemSubclass.contains("绔彛闂撮殧绂诲害")) {
List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
.getInspectionItemSubclass().equals("绔彛闂撮殧绂诲害") && insProductResult2.getFrequency().equals(s)
@@ -2870,7 +2871,7 @@
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.equals("寮傛瀬鍖栭殧绂诲害")) {
+ if (inspectionItemSubclass.contains("寮傛瀬鍖栭殧绂诲害")) {
List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
.getInspectionItemSubclass().equals("寮傛瀬鍖栭殧绂诲害") && insProductResult2.getFrequency().equals(s)
@@ -2878,16 +2879,16 @@
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.equals("浜掕皟")) {
+ if (inspectionItemSubclass.contains("浜掕皟")) {
aa += (angles + 1) * portRow * often;
}
- if (inspectionItemSubclass.equals("鏈�澶ц�﹀悎搴�")) {
+ if (inspectionItemSubclass.contains("鏈�澶ц�﹀悎搴�")) {
aa += (angles + 1);
}
- if (inspectionItemSubclass.equals("鏈�灏忚�﹀悎搴�")) {
+ if (inspectionItemSubclass.contains("鏈�灏忚�﹀悎搴�")) {
aa += (angles + 1);
}
- if (inspectionItemSubclass.equals("骞呭害鍋忓樊")) {
+ if (inspectionItemSubclass.contains("骞呭害鍋忓樊")) {
List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
.getInspectionItemSubclass().equals("骞呭害鍋忓樊")&& insProductResult2.getFrequency().equals(s)
@@ -2895,7 +2896,7 @@
int length = result2s.get(0).getPort().split(",").length;
aa += (angles + 1) * (length % 8 == 0 ? length / 8 : length / 8 + 1);
}
- if (inspectionItemSubclass.equals("鏈�澶х浉浣嶅亸宸�")) {
+ if (inspectionItemSubclass.contains("鏈�澶х浉浣嶅亸宸�")) {
List<InsProductResult2> result2s = productResult2s.stream().filter(insProductResult2 ->
insProductMapper.selectById(insProductResult2.getInsProductId())
.getInspectionItemSubclass().equals("鏈�澶х浉浣嶅亸宸�")&& insProductResult2.getFrequency().equals(s)
@@ -2951,7 +2952,7 @@
} else {
if (insOrderState.getVersion() == 1) {
//闈炵數璋冪増鏈�(绠�鍗曠増)
- if (inspectionItemSubclass.equals("鐢靛帇椹绘尝姣�") && i <= 2 * portRow) {
+ if (inspectionItemSubclass.contains("鐢靛帇椹绘尝姣�") && i <= 2 * portRow) {
cc = 2 * portRow;
if (itemSet.add("鐢靛帇椹绘尝姣�")) {
index.getAndIncrement();
@@ -3051,7 +3052,7 @@
cells.add(cellRenderData);
}
}
- if (inspectionItemSubclass.equals("鍚屾瀬鍖栭殧绂诲害") && i > cc && i <= cc + portRow) {
+ if (inspectionItemSubclass.contains("鍚屾瀬鍖栭殧绂诲害") && i > cc && i <= cc + portRow) {
dd = cc + portRow;
if (itemSet.add("鍚屾瀬鍖栭殧绂诲害")) {
index.getAndIncrement();
@@ -3143,13 +3144,13 @@
cells.add(cellRenderData);
}
}
- if (inspectionItemSubclass.equals("闅旂搴�") && i > (dd == 0 ? cc : dd) && i <= (dd == 0 ? cc : dd) + portRow) {
+ if (inspectionItemSubclass.contains("鍚屽垪闅旂搴�") && i > (dd == 0 ? cc : dd) && i <= (dd == 0 ? cc : dd) + portRow) {
ee = (dd == 0 ? cc : dd) + portRow;
- if (itemSet.add("闅旂搴�")) {
+ if (itemSet.add("鍚屽垪闅旂搴�")) {
index.getAndIncrement();
}
List<InsProduct> products = insProducts.stream()
- .filter(insProduct -> insProduct.getInspectionItemSubclass().equals("闅旂搴�"))
+ .filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鍚屽垪闅旂搴�"))
.collect(Collectors.toList());
List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
@@ -3235,7 +3236,7 @@
cells.add(cellRenderData);
}
}
- if (inspectionItemSubclass.equals("绔彛闂撮殧绂诲害") && i > (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) && i <= (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) + portRow) {
+ if (inspectionItemSubclass.contains("绔彛闂撮殧绂诲害") && i > (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) && i <= (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) + portRow) {
ff = (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) + portRow;
if (itemSet.add("绔彛闂撮殧绂诲害")) {
index.getAndIncrement();
@@ -3327,7 +3328,7 @@
cells.add(cellRenderData);
}
}
- if (inspectionItemSubclass.equals("寮傛瀬鍖栭殧绂诲害") && i >(ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff)&& i <= (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) + portRow) {
+ 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) + portRow) {
gg = (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) + portRow;
if (itemSet.add("寮傛瀬鍖栭殧绂诲害")) {
index.getAndIncrement();
@@ -3419,7 +3420,7 @@
cells.add(cellRenderData);
}
}
- if (inspectionItemSubclass.equals("浜掕皟") && i > (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg)) {
+ if (inspectionItemSubclass.contains("浜掕皟") && i > (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg)) {
if (itemSet.add("浜掕皟")) {
index.getAndIncrement();
}
@@ -3513,7 +3514,7 @@
}
} else {
//鐢佃皟鐗堟湰(澶嶆潅鐗�)
- if (inspectionItemSubclass.equals("鐢靛帇椹绘尝姣�") && i <= (angles + 1) * portRow) {
+ if (inspectionItemSubclass.contains("鐢靛帇椹绘尝姣�") && i <= (angles + 1) * portRow) {
cc = (angles + 1) * portRow;
if (itemSet.add("鐢靛帇椹绘尝姣�")) {
index.getAndIncrement();
@@ -3614,7 +3615,7 @@
cells.add(cellRenderData);
}
}
- if (inspectionItemSubclass.equals("鍚屾瀬鍖栭殧绂诲害")) {
+ if (inspectionItemSubclass.contains("鍚屾瀬鍖栭殧绂诲害")) {
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鍚屾瀬鍖栭殧绂诲害")).collect(Collectors.toList());
List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
@@ -3737,8 +3738,8 @@
}
}
}
- if (inspectionItemSubclass.equals("闅旂搴�")) {
- List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("闅旂搴�")).collect(Collectors.toList());
+ if (inspectionItemSubclass.contains("鍚屽垪闅旂搴�")) {
+ List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鍚屽垪闅旂搴�")).collect(Collectors.toList());
List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
.collect(Collectors.toList());
@@ -3747,7 +3748,7 @@
int k = (angles + 1) * portRow2;
if (i > (dd == 0 ? cc : dd) && i <= (dd == 0 ? cc : dd) + k) {
ee = (dd == 0 ? cc : dd) + k;
- if (itemSet.add("闅旂搴�")) {
+ if (itemSet.add("鍚屽垪闅旂搴�")) {
index.getAndIncrement();
}
//闅旂搴︽墍鍦ㄨ
@@ -3860,7 +3861,7 @@
}
}
}
- if (inspectionItemSubclass.equals("绔彛闂撮殧绂诲害")) {
+ if (inspectionItemSubclass.contains("绔彛闂撮殧绂诲害")) {
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("绔彛闂撮殧绂诲害")).collect(Collectors.toList());
List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
@@ -3983,7 +3984,7 @@
}
}
}
- if (inspectionItemSubclass.equals("寮傛瀬鍖栭殧绂诲害")) {
+ if (inspectionItemSubclass.contains("寮傛瀬鍖栭殧绂诲害")) {
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("寮傛瀬鍖栭殧绂诲害")).collect(Collectors.toList());
List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
@@ -4105,7 +4106,7 @@
}
}
}
- if (inspectionItemSubclass.equals("浜掕皟") && 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) * portRow * often)) {
+ 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) * portRow * often)) {
hh = (int) ((gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) + (angles + 1) * portRow * often);
if (itemSet.add("浜掕皟")) {
index.getAndIncrement();
@@ -4202,7 +4203,7 @@
cells.add(cellRenderData);
}
}
- if (inspectionItemSubclass.equals("鏈�澶ц�﹀悎搴�") && i > (hh==0?(gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg):hh) && i <= ((hh==0?(gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg):hh) + (angles + 1))) {
+ if (inspectionItemSubclass.contains("鏈�澶ц�﹀悎搴�") && i > (hh==0?(gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg):hh) && i <= ((hh==0?(gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg):hh) + (angles + 1))) {
mm = ((hh==0?(gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg):hh) + (angles + 1));
if (itemSet.add("鏈�澶ц�﹀悎搴�")) {
index.getAndIncrement();
@@ -4295,7 +4296,7 @@
cells.add(cellRenderData);
}
}
- if (inspectionItemSubclass.equals("鏈�灏忚�﹀悎搴�") && i > (mm == 0 ? (hh==0?(gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg):hh) : mm) && i <= ((mm == 0 ? (hh==0?(gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg):hh) : mm) + (angles + 1))) {
+ if (inspectionItemSubclass.contains("鏈�灏忚�﹀悎搴�") && i > (mm == 0 ? (hh==0?(gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg):hh) : mm) && i <= ((mm == 0 ? (hh==0?(gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg):hh) : mm) + (angles + 1))) {
nn = (mm == 0 ? (hh==0?(gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg):hh) : mm) + (angles + 1);
if (itemSet.add("鏈�灏忚�﹀悎搴�")) {
index.getAndIncrement();
@@ -4388,7 +4389,7 @@
cells.add(cellRenderData);
}
}
- if (inspectionItemSubclass.equals("骞呭害鍋忓樊")) {
+ if (inspectionItemSubclass.contains("骞呭害鍋忓樊")) {
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("骞呭害鍋忓樊")).collect(Collectors.toList());
List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
@@ -4494,7 +4495,7 @@
}
}
}
- if (inspectionItemSubclass.equals("鏈�澶х浉浣嶅亸宸�")) {
+ if (inspectionItemSubclass.contains("鏈�澶х浉浣嶅亸宸�")) {
List<InsProduct> products = insProducts.stream().filter(insProduct -> insProduct.getInspectionItemSubclass().equals("鏈�澶х浉浣嶅亸宸�")).collect(Collectors.toList());
List<InsProductResult2> result2s = productResult2s.stream()
.filter(insProductResult2 -> insProductResult2.getFrequency().equals(s) && insProductResult2.getInsProductId().equals(products.get(0).getId()))
diff --git a/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index 0905efd..c55a398 100644
--- a/system-run/src/main/resources/application-dev.yml
+++ b/system-run/src/main/resources/application-dev.yml
@@ -42,13 +42,13 @@
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://localhost:3306/center-lims?useSSL=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
- url: jdbc:mysql://10.1.13.77:3306/center-lims?useSSL=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
-# url: jdbc:mysql://192.168.22.29:3306/center-lims?useSSL=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
- username: remote_user
-# username: root
+# url: jdbc:mysql://10.1.13.77:3306/center-lims?useSSL=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+ url: jdbc:mysql://192.168.22.29:3306/center-lims?useSSL=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+# username: remote_user
+ username: root
# password: 123456
- password: zttZTT123!
-# password: Dq<)dAiAczXs
+# password: zttZTT123!
+ password: Dq<)dAiAczXs
druid:
# Druid鏁版嵁婧愰厤缃�
initialSize: 5 # 鍒濆杩炴帴鏁�
--
Gitblit v1.9.3