From 29cadb9df9e289fc4dd45d17e577fe9695232ea4 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 30 五月 2024 22:35:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 1fe8cf3..2db4f2a 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
@@ -113,11 +113,19 @@
@Override
@Transactional(rollbackFor = Exception.class)
public int upStandardProducts(Map<String, Object> product) {
- List<Integer> ids = JSON.parseArray(JSON.toJSONString(product.get("ids")));
+ List<Integer> ids = JSON.parseArray(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;
}
+
+ @Override
+ public List<StandardTree> getStandTreeBySampleType(String laboratory, String sampleType) {
+ return standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery()
+ .eq(StandardTree::getLaboratory, laboratory)
+ .eq(StandardTree::getSampleType, sampleType)
+ .select(StandardTree::getModel, StandardTree::getSample));
+ }
}
--
Gitblit v1.9.3