From a9015e429e40f83afdffd43552d34b82e67a75ff Mon Sep 17 00:00:00 2001
From: JYW <2013732181@qq.com>
Date: 星期一, 29 四月 2024 17:34:10 +0800
Subject: [PATCH] 2024-04-29 自定义注解,给每个接口加上自定义注解

---
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 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 6aeb5bb..0a6d4e0 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
@@ -3,6 +3,7 @@
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.common.GetLook;
 import com.yuanchu.mom.mapper.StandardProductListMapper;
 import com.yuanchu.mom.mapper.StandardTreeMapper;
 import com.yuanchu.mom.pojo.InsSample;
@@ -10,7 +11,6 @@
 import com.yuanchu.mom.service.StandardProductListService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -32,7 +32,7 @@
 
     private StandardTreeMapper standardTreeMapper;
 
-    private StandardProductListService standardProductListService;
+    private GetLook getLook;
 
     @Override
     public int upStandardProductList(StandardProductList list) {
@@ -79,7 +79,6 @@
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public List<StandardProductList> selectStandardProductListByMethodId(Integer id, String tree) {
         String[] trees = tree.split(" - ");
         StringBuffer str = new StringBuffer();
@@ -101,13 +100,35 @@
                     pl.setSample(sp.getSample());
                     pl.setModel(sp.getModel());
                     pl.setMethodS(sp.getMethodS());
+                    if(sp.getAsk()!=null&&!sp.getAsk().equals("")){
+                        pl.setAsk(sp.getAsk());
+                    }
+                    if(sp.getTell()!=null&&!sp.getTell().equals("")){
+                        pl.setTell(sp.getTell());
+                    }
                     break;
                 }
             }
         }
+        Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
         CompletableFuture.supplyAsync(() -> {
             standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).eq(StandardProductList::getTree, tree));
-            standardProductListService.saveBatch(list);
+            saveBatch(list.stream().map(a->{
+                a.setFactory(trees[0]);
+                a.setLaboratory(trees[1]);
+                a.setSampleType(trees[2]);
+                try {
+                    a.setSample(trees[3]);
+                }catch (Exception e){}
+                try {
+                    a.setModel(trees[4]);
+                }catch (Exception e){}
+                a.setTree(tree);
+                a.setCreateUser(userId);
+                a.setUpdateUser(userId);
+                a.setStandardMethodListId(id);
+                return a;
+            }).collect(Collectors.toList()));
             return null;
         }).thenAccept(res -> {
         }).exceptionally(e -> {

--
Gitblit v1.9.3