From 8ebf5bc4bf1cc2b70b6aa9dc295eaa9d86c95245 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 02 七月 2024 13:17:26 +0800
Subject: [PATCH] 委托编号生成规则修改+用户默认密码更改+温度循环项目新增逻辑+检验任务模版切换
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 a531710..353d6ac 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
@@ -69,6 +69,10 @@
@Override
@Transactional(rollbackFor = Exception.class)
public int addStandardTree(StandardTree standardTree) {
+ StandardTree tree = standardTreeMapper.selectOne(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getModel, standardTree.getModel()));
+ if (tree != null) {
+ throw new ErrorException("璇ュ瀷鍙峰凡瀛樺湪");
+ }
return standardTreeMapper.insert(standardTree);
}
@@ -78,7 +82,11 @@
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]));
+ if (trees[3] == null) {
+ standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]).eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).isNull(StandardTree::getSample).eq(StandardTree::getModel, trees[4]));
+ } else {
+ 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]));
@@ -178,6 +186,10 @@
str.setStandardMethodListId(standardMethodId);
str.setSampleType(list.get(1) + "");
if (list.get(2) != null) {
+ String sample = baseMapper.selSample(list.get(2) + "");
+ if (sample == null) {
+ throw new ErrorException("鏍峰搧涓嶅瓨鍦細" + list.get(2));
+ }
str.setSample(list.get(2) + "");
} else {
str.setSample(null);
@@ -256,7 +268,6 @@
try {
str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\"" + str.getSampleType() + "\"", str.getInspectionItem(), str.getInspectionItemSubclass()));
} catch (Exception e) {
- Console.log("\"" + str.getSampleType() + "\",\"" + str.getSample() + "\"");
str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\"" + str.getSampleType() + "\",\"" + str.getSample() + "\"", str.getInspectionItem(), str.getInspectionItemSubclass()));
}
if (str.getStructureItemParameterId() == null) {
--
Gitblit v1.9.3