From ad54d502450e219c38f7d9b878ae07f759ab2a23 Mon Sep 17 00:00:00 2001
From: 朱佳吉 <1527963051@qq.com>
Date: 星期二, 07 五月 2024 17:58:54 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
index a7432b1..0654d4a 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
@@ -5,21 +5,20 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.dto.FactoryDto;
+import com.yuanchu.mom.dto.SampleTypeDto;
import com.yuanchu.mom.mapper.StandardMethodListMapper;
import com.yuanchu.mom.mapper.StandardProductListMapper;
-import com.yuanchu.mom.pojo.StandardMethodList;
+import com.yuanchu.mom.mapper.StandardTreeMapper;
import com.yuanchu.mom.pojo.StandardProductList;
import com.yuanchu.mom.pojo.StandardTree;
import com.yuanchu.mom.service.StandardMethodListService;
+import com.yuanchu.mom.service.StandardProductListService;
import com.yuanchu.mom.service.StandardTreeService;
-import com.yuanchu.mom.mapper.StandardTreeMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
/**
* @author Administrator
@@ -39,12 +38,15 @@
private StandardProductListMapper standardProductListMapper;
+ private StandardProductListService standardProductListService;
+
@Override
public List<FactoryDto> selectStandardTreeList() {
return standardTreeMapper.selectStandardTreeList();
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public int addStandardTree(StandardTree standardTree) {
return standardTreeMapper.insert(standardTree);
}
@@ -57,7 +59,7 @@
case 5:
standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]).eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).eq(StandardTree::getSample, trees[3]).eq(StandardTree::getModel, trees[4]));
break;
- case 4:
+ /*case 4:
standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]).eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).eq(StandardTree::getSample, trees[3]));
break;
case 3:
@@ -68,14 +70,7 @@
break;
case 1:
standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]));
- break;
- }
- Map<String, List<?>> listMap = standardMethodListService.selectsStandardMethodByFLSSM(tree);
- if(listMap.get("standardMethodList").size() != 0){
- standardMethodListMapper.deleteBatchIds(listMap.get("standardMethodList"));
- }
- if(listMap.get("standardProductList").size() != 0){
- standardProductListMapper.deleteBatchIds(listMap.get("standardProductList"));
+ break;*/
}
return 1;
}
@@ -90,20 +85,30 @@
standardProductList.setFactory(trees[0]);
try {
standardProductList.setLaboratory(trees[1]);
- }catch (Exception e){}
+ } catch (Exception e) {
+ }
try {
standardProductList.setSampleType(trees[2]);
- }catch (Exception e){}
+ } catch (Exception e) {
+ }
try {
standardProductList.setSample(trees[3]);
- }catch (Exception e){}
+ } catch (Exception e) {
+ }
try {
standardProductList.setModel(trees[4]);
- }catch (Exception e){}
+ } catch (Exception e) {
+ }
standardProductListMapper.insert(standardProductList);
}
return 1;
}
+
+ @Override
+ public List<SampleTypeDto> getStandardTree2() {
+ return standardTreeMapper.getStandardTree2();
+ }
+
}
--
Gitblit v1.9.3