From ec6c3bc0b778178b2518302ffc9099ac8f6cc8a2 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 30 四月 2024 00:54:34 +0800
Subject: [PATCH] 标准库修复
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 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 ff4d346..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
@@ -2,11 +2,10 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
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.dto.FactoryDto;
+import com.yuanchu.mom.dto.SampleTypeDto;
import com.yuanchu.mom.mapper.StandardMethodListMapper;
import com.yuanchu.mom.mapper.StandardProductListMapper;
import com.yuanchu.mom.mapper.StandardTreeMapper;
@@ -20,7 +19,6 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
-import java.util.Map;
/**
* @author Administrator
@@ -42,8 +40,6 @@
private StandardProductListService standardProductListService;
- private GetLook getLook;
-
@Override
public List<FactoryDto> selectStandardTreeList() {
return standardTreeMapper.selectStandardTreeList();
@@ -63,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:
@@ -74,18 +70,7 @@
break;
case 1:
standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]));
- break;
- }
- Map<String, List<?>> listMap = standardMethodListService.selectsStandardMethodByFLSSM2(tree);
- if (listMap.get("standardMethodList").size() != 0) {
- for (Object o : listMap.get("standardMethodList")) {
- JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(o));
- List<StandardProductList> list = standardProductListService.selectStandardProductListByMethodId((Integer) jsonObject.get("id"), tree);
- if (list.size() != 0) {
- standardProductListMapper.deleteBatchIds(list);
- }
- }
- standardMethodListMapper.deleteBatchIds(listMap.get("standardMethodList"));
+ break;*/
}
return 1;
}
@@ -119,6 +104,11 @@
return 1;
}
+ @Override
+ public List<SampleTypeDto> getStandardTree2() {
+ return standardTreeMapper.getStandardTree2();
+ }
+
}
--
Gitblit v1.9.3