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 | 55 ++++++++++---------------------------------------------
1 files changed, 10 insertions(+), 45 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 bae58cf..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
@@ -1,29 +1,24 @@
package com.yuanchu.mom.service.impl;
-import cn.hutool.core.bean.BeanUtil;
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.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.beans.BeanUtils;
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
@@ -53,31 +48,6 @@
@Override
@Transactional(rollbackFor = Exception.class)
public int addStandardTree(StandardTree standardTree) {
- List<StandardProductList> productList = standardTreeMapper.getStandardProductListBySample(standardTree.getSampleType());
- List<StandardMethodList> methodList = standardTreeMapper.getStandardMethodListBySample(standardTree.getSampleType());
- for (StandardMethodList standardMethod : methodList) {
- standardMethod.setFactory(standardTree.getFactory());
- standardMethod.setLaboratory(standardTree.getLaboratory());
- standardMethod.setSampleType(standardTree.getSampleType());
- standardMethod.setSample(standardTree.getSample());
- standardMethod.setModel(standardTree.getModel());
- standardMethodListMapper.insert(standardMethod);
- for (StandardProductList standardProductList : productList) {
- standardProductList.setFactory(standardTree.getFactory());
- standardProductList.setLaboratory(standardTree.getLaboratory());
- standardProductList.setSampleType(standardTree.getSampleType());
- standardProductList.setSample(standardTree.getSample());
- standardProductList.setModel(standardTree.getModel());
- standardProductList.setStandardMethodListId(standardMethod.getId());
- standardProductList.setState(1);
- standardProductList.setId(null);
- standardProductList.setCreateUser(null);
- standardProductList.setCreateTime(null);
- standardProductList.setUpdateUser(null);
- standardProductList.setUpdateTime(null);
- standardProductListMapper.insert(standardProductList);
- }
- }
return standardTreeMapper.insert(standardTree);
}
@@ -89,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:
@@ -100,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"));
- if(list.size()!=0){
- standardProductListMapper.deleteBatchIds(list);
- }
- }
- standardMethodListMapper.deleteBatchIds(listMap.get("standardMethodList"));
+ break;*/
}
return 1;
}
@@ -144,6 +103,12 @@
}
return 1;
}
+
+ @Override
+ public List<SampleTypeDto> getStandardTree2() {
+ return standardTreeMapper.getStandardTree2();
+ }
+
}
--
Gitblit v1.9.3