From 8e89de5320fbfebc14851fc4fd7ea9231ba28896 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期六, 18 五月 2024 08:09:03 +0800
Subject: [PATCH] 标准库修复
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 28 +++++++++++++++++++++++++---
inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java | 2 ++
inspect-server/src/main/resources/mapper/StandardTreeMapper.xml | 9 ++++++---
user-server/src/main/java/com/yuanchu/mom/dto/Custom.java | 2 +-
4 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java
index 82b2d4b..4df0458 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java
@@ -177,4 +177,6 @@
private String dic;
private String tree;
+
+ private Integer structureItemParameterId;
}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
index 660938b..a3fef54 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
@@ -40,6 +40,9 @@
@Override
public int upStandardProductList(StandardProductList list) {
+ /*if(list.getId()==null || list.getId().equals("")){
+
+ }*/
return standardProductListMapper.updateById(list);
}
@@ -106,12 +109,27 @@
List<StandardProductList> list = new ArrayList<>();
if (trees.length == 3) {
List<StandardTree> treeList = standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]));
+ if(treeList.size()==0){
+ StandardTree standardTree = new StandardTree();
+ standardTree.setFactory(trees[0]);
+ standardTree.setLaboratory(trees[1]);
+ standardTree.setSampleType(trees[2]);
+ treeList.add(standardTree);
+ }
for (StandardTree standardTree : treeList) {
String str = tree+" - "+standardTree.getSample()+" - "+standardTree.getModel();
list.addAll(standardTreeMapper.selectStandardProductListByTree3("\"" + trees[2] + "\"", standardTree.getSample(), standardTree.getModel(), str));
}
} else if (trees.length == 4){
List<StandardTree> treeList = standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).eq(StandardTree::getSample, trees[3]));
+ if(treeList.size()==0){
+ StandardTree standardTree = new StandardTree();
+ standardTree.setFactory(trees[0]);
+ standardTree.setLaboratory(trees[1]);
+ standardTree.setSampleType(trees[2]);
+ standardTree.setSample(trees[2]);
+ treeList.add(standardTree);
+ }
for (StandardTree standardTree : treeList) {
String str = tree+" - "+standardTree.getModel();
list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", standardTree.getSample(), standardTree.getModel(), str));
@@ -125,10 +143,14 @@
for (StandardProductList sp : standardProductLists) {
for (StandardProductList pl : list) {
if (Objects.equals(sp.getInspectionItem(), pl.getInspectionItem())
- && Objects.equals(sp.getInspectionItemSubclass(), pl.getInspectionItemSubclass())
- && Objects.equals(sp.getModel(), pl.getModel())) {
+ && Objects.equals(sp.getInspectionItemSubclass()==null?"":sp.getInspectionItemSubclass(), pl.getInspectionItemSubclass()==null?"":pl.getInspectionItemSubclass())
+ && Objects.equals(sp.getModel(), pl.getModel()) && Objects.equals(sp.getStructureItemParameterId(), pl.getStructureItemParameterId())) {
pl.setId(sp.getId());
- pl.setState(id==0?1:sp.getState());
+ if(sp.getState()!=null&&!sp.getState().equals("")){
+ pl.setState(sp.getState());
+ }else{
+ pl.setState(id==0?1:0);
+ }
pl.setMethodS(sp.getMethodS());
if(sp.getAsk()!=null&&!sp.getAsk().equals("")){
pl.setAsk(sp.getAsk());
diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index 23b0adc..ce4a5cc 100644
--- a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -157,7 +157,8 @@
0 state,
#{model} model,
#{sample} sample,
- #{trees} tree
+ #{trees} tree,
+ id structure_item_parameter_id
from structure_item_parameter
where (
sample is NULL
@@ -193,7 +194,8 @@
0 state,
#{model} model,
#{sample} sample,
- #{trees} tree
+ #{trees} tree,
+ id structure_item_parameter_id
from structure_item_parameter
where sample LIKE CONCAT('%[', #{tree}, ']%')
</select>
@@ -233,7 +235,8 @@
0 state,
#{model} model,
#{sample} sample,
- #{trees} tree
+ #{trees} tree,
+ id structure_item_parameter_id
from structure_item_parameter
where (
sample is NULL
diff --git a/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java b/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java
index aef0096..cfece7c 100644
--- a/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java
+++ b/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java
@@ -24,7 +24,7 @@
@TableId(type = IdType.AUTO)
private Integer id;
- @ValueTableShow(2)
+ @ValueTableShow(value = 2)
@ApiModelProperty(value = "瀹㈡埛璐﹀彿")
private String account;
--
Gitblit v1.9.3