From ecef4e046635a6eb78c92cd72dd96a84401164d9 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 07 四月 2025 16:40:59 +0800
Subject: [PATCH] 1.检验项查询拼接类型 2，设备检验项优化
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
index ad901fd..596aabb 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
@@ -50,6 +50,7 @@
return map;
}
StringBuilder checkItemQueryTree = new StringBuilder(); // 妫�鏌ラ」鏌ヨ
+ StringBuilder productTree = new StringBuilder(); // 妫�楠屼骇鍝佹爲
// 鍒ゆ柇鏄惁鍖呭惈杞﹂棿
boolean existWorkShopFlag = this.existWorkShop(tree);
// 杞﹂棿灞傜骇澶氫竴灞傜骇
@@ -58,6 +59,7 @@
case 7:
sampleType = trees[4];
checkItemQueryTree.append("\"").append(trees[4]).append("\",\"").append(trees[5]).append("\",\"").append(trees[6]).append("\"");
+ productTree.append("\"").append(trees[4]).append("\",\"").append(trees[5]).append("\"");
break;
case 6:
sampleType = trees[4];
@@ -73,6 +75,7 @@
case 6:
sampleType = trees[3];
checkItemQueryTree.append("\"").append(trees[3]).append("\",\"").append(trees[4]).append("\",\"").append(trees[5]).append("\"");
+ productTree.append("\"").append(trees[3]).append("\",\"").append(trees[4]).append("\"");
break;
case 5:
sampleType = trees[3];
@@ -90,7 +93,15 @@
List<StandardMethodList> standardMethodListArray = standardMethodListMapper.selectStandardMethodLists(checkItemQueryTree.toString());
// 鏌ヤ笉鍒版煡璇㈡鏌ュ璞�
if(CollectionUtils.isEmpty(standardMethodListArray)){
- standardMethodListArray = standardMethodListMapper.selectStandardMethodLists(sampleType);
+ // 濡傛灉鏄畬鏁村眰绾э紝鍚戜笂鎺ㄥ埌浜у搧灞傜骇
+ if((existWorkShopFlag&&trees.length == 7) || (!existWorkShopFlag&&trees.length == 6)){
+ standardMethodListArray = standardMethodListMapper.selectStandardMethodLists(productTree.toString());
+
+ }
+ // 杩樻槸涓虹┖鏌ヨ瀵硅薄灞傜骇
+ if(CollectionUtils.isEmpty(standardMethodListArray)){
+ standardMethodListArray = standardMethodListMapper.selectStandardMethodLists(sampleType);
+ }
}
map.put("standardMethodList", standardMethodListArray);
return map;
--
Gitblit v1.9.3