From ad8f321d123f7ccf6793e550dd1eff9fc48faa31 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 15 十一月 2024 13:43:13 +0800
Subject: [PATCH] 辐射试验的文件上传csv文件有第二种样式,需要不同形式不同解析
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
index a2cc408..b3021ea 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
@@ -135,6 +135,29 @@
standardProductList.setMethodS(code);
return standardProductList;
}).collect(Collectors.toList());
+ //鎸夌収鐢佃矾璇曢獙--杈愬皠璇曢獙--娓╂箍搴﹁瘯楠�--鐜璇曢獙杩涜鎺掑簭
+ // 瀹氫箟鑷畾涔夋帓搴忓櫒
+ Comparator<StandardProductList> testTypeComparator = (o1, o2) -> {
+ String[] order = {"鐢佃矾璇曢獙", "杈愬皠璇曢獙", "娓╂箍搴﹁瘯楠�", "鐜璇曢獙","鍔熺巼璇曢獙"};
+ int index1 = -1;
+ int index2 = -1;
+ // 鎵惧嚭涓や釜瀵硅薄 鍦ㄨ嚜瀹氫箟椤哄簭鏁扮粍涓殑浣嶇疆
+ for (int i = 0; i < order.length; i++) {
+ if (o1.getInspectionItem().equals(order[i])) {
+ index1 = i;
+ }
+ if (o2.getInspectionItem().equals(order[i])) {
+ index2 = i;
+ }
+ if (index1 != -1 && index2 != -1) {
+ break; // 涓や釜浣嶇疆閮芥壘鍒颁簡锛屽彲浠ラ��鍑哄惊鐜�
+ }
+ }
+ // 姣旇緝浣嶇疆
+ return Integer.compare(index1, index2);
+ };
+ // 瀵瑰垪琛ㄨ繘琛屾帓搴�
+ Collections.sort(list, testTypeComparator);
return list;
}
--
Gitblit v1.9.3