From 1ba9dcd09a4a3bc26e82ff69c09016c758654163 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 24 二月 2025 17:39:17 +0800
Subject: [PATCH] 标准库查询优化

---
 basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java |   40 +++++++++++++++-------------------------
 1 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
index bafa2a1..4bc4557 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
@@ -20,7 +20,6 @@
 import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
 import com.ruoyi.basic.pojo.StandardTree;
 import com.ruoyi.basic.service.StandardProductListService;
-import com.ruoyi.basic.service.StandardProductListService2;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -44,8 +43,6 @@
     private StandardProductListMapper standardProductListMapper;
 
     private StandardTreeMapper standardTreeMapper;
-
-    private StandardProductListService2 standardProductListService2;
 
     private IfsInventoryQuantityMapper ifsInventoryQuantityMapper;
 
@@ -403,10 +400,6 @@
                     if (sp.getTemplateId() != null && !sp.getTemplateId().equals("")) {
                         pl.setTemplateId(sp.getTemplateId());
                     }
-                    //鍥犱负杩樻湁涓骇鍝佸彨鑰愬紶绾垮す 鎺ョ画閲戝叿 ,杩欎袱涓」鐩殑鏁版嵁瀹屽叏涓�鏍�,鐗规畩澶勭悊
-                    if (sp.getTree() != null && !sp.getTree().equals("") && !pl.getTree().equals("涓ぉ绉戞妧妫�娴嬩腑蹇� - 鐢靛姏浜у搧瀹為獙瀹� - 閲戝叿 - 鑰愬紶绾垮す - null")) {
-                        pl.setTree(sp.getTree());
-                    }
                     break;
                 }
             }
@@ -423,23 +416,20 @@
                     .like(StandardProductList::getTree, tree));
         }
 
-        try {
-            List<StandardProductList> productLists = list.stream().map(a -> {
-                a.setFactory(trees[0]);
-                a.setLaboratory(trees[1]);
-                a.setSampleType(trees[2]);
-                a.setCreateUser(userId);
-                a.setUpdateUser(userId);
-                a.setStandardMethodListId(id);
-                return a;
-            }).collect(Collectors.toList());
-            standardProductListService2.saveBatch(productLists);
-        } catch (Exception e) {
-            // 澶勭悊閲嶅 ID 鐨勮褰曪紝閲嶆柊鐢熸垚 ID 骞剁户缁皾璇曟彃鍏�
-            for (StandardProductList productList : list) {
-                productList.setId(IdWorker.getId());
-            }
-        }
+
+        List<StandardProductList> productLists = list.stream().map(a -> {
+            a.setFactory(trees[0]);
+            a.setLaboratory(trees[1]);
+            a.setSampleType(trees[2]);
+            a.setCreateUser(userId);
+            a.setUpdateUser(userId);
+            a.setStandardMethodListId(id);
+            return a;
+        }).collect(Collectors.toList());
+//            this.saveBatch(productLists);
+        // 鎵归噺娣诲姞鏍囧噯
+        baseMapper.saveBatchProductLists(productLists);
+
 
         Collections.sort(list, (o1, o2) -> {
             String field1 = o1.getManHourGroup();
@@ -562,7 +552,7 @@
 
     @Override
     public void resetTreeDragBatch(List<StandardProductList> standardProductLists) {
-        standardProductListService2.updateBatchById(standardProductLists);
+        this.updateBatchById(standardProductLists);
     }
 
     /**

--
Gitblit v1.9.3