From 8ce50189f0b00d62390d67fd27f859ca7831616b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 23 五月 2024 17:32:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java | 101 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 94 insertions(+), 7 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 139ce93..1fe8cf3 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,26 +1,45 @@
package com.yuanchu.mom.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+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.pojo.StandardTree;
-import com.yuanchu.mom.service.StandardTreeService;
+import com.yuanchu.mom.dto.SampleTypeDto;
+import com.yuanchu.mom.mapper.StandardMethodListMapper;
+import com.yuanchu.mom.mapper.StandardProductListMapper;
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 lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
+import java.util.Map;
/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恠tandard_tree(鏍囧噯鏍�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2024-03-01 15:06:44
-*/
+ * @author Administrator
+ * @description 閽堝琛ㄣ�恠tandard_tree(鏍囧噯鏍�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+ * @createDate 2024-03-01 15:06:44
+ */
@Service
@AllArgsConstructor
public class StandardTreeServiceImpl extends ServiceImpl<StandardTreeMapper, StandardTree>
- implements StandardTreeService{
+ implements StandardTreeService {
private StandardTreeMapper standardTreeMapper;
+
+ private StandardMethodListMapper standardMethodListMapper;
+
+ private StandardMethodListService standardMethodListService;
+
+ private StandardProductListMapper standardProductListMapper;
+
+ private StandardProductListService standardProductListService;
@Override
public List<FactoryDto> selectStandardTreeList() {
@@ -28,9 +47,77 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public int addStandardTree(StandardTree standardTree) {
return standardTreeMapper.insert(standardTree);
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int delStandardTree(String tree) {
+ String[] trees = tree.split(" - ");
+ switch (trees.length) {
+ 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:
+ 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:
+ standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]).eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]));
+ break;
+ case 2:
+ standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]).eq(StandardTree::getLaboratory, trees[1]));
+ break;
+ case 1:
+ standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]));
+ break;*/
+ }
+ return 1;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int addStandardProduct(String ids, String tree) {
+ String[] trees = tree.split(" - ");
+ JSONArray jsonArray = JSON.parseArray(ids);
+ for (Object o : jsonArray) {
+ StandardProductList standardProductList = standardTreeMapper.selectStandardProductById(Integer.parseInt("" + o));
+ standardProductList.setFactory(trees[0]);
+ try {
+ standardProductList.setLaboratory(trees[1]);
+ } catch (Exception e) {
+ }
+ try {
+ standardProductList.setSampleType(trees[2]);
+ } catch (Exception e) {
+ }
+ try {
+ standardProductList.setSample(trees[3]);
+ } catch (Exception e) {
+ }
+ try {
+ standardProductList.setModel(trees[4]);
+ } catch (Exception e) {
+ }
+ standardProductListMapper.insert(standardProductList);
+ }
+ return 1;
+ }
+
+ @Override
+ public List<SampleTypeDto> getStandardTree2() {
+ return standardTreeMapper.getStandardTree2();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int upStandardProducts(Map<String, Object> product) {
+ List<Integer> ids = JSON.parseArray(JSON.toJSONString(product.get("ids")));
+ StandardProductList productList = JSON.parseObject(JSON.toJSONString(product.get("standardProductList")), StandardProductList.class);
+ standardProductListMapper.update(productList, Wrappers.<StandardProductList>lambdaUpdate().in(StandardProductList::getId, ids));
+ return 1;
+ }
}
--
Gitblit v1.9.3