From ba0d35c0b005d7687ff1abc4dd30eb15de46dcd0 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 28 五月 2024 14:06:44 +0800
Subject: [PATCH] 光纤配置
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java | 8 ++++++++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java | 5 +----
inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java | 2 ++
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 4 ++--
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java | 12 ++++++++----
5 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
index 5d20623..4b5d354 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
@@ -140,15 +140,15 @@
}
@ValueClassify("妫�楠屼笅鍗�")
- @ApiOperation(value = "鏇存柊鐘舵��")
+ @ApiOperation(value = "鎾ら攢")
@PutMapping("/updateStatus")
public Result<?> updateStatus(Integer id) {
insOrderService.updateStatus(id);
return Result.success();
}
@ValueClassify("妫�楠屼笅鍗�")
- @ApiOperation("灏嗗緟妫�楠岀殑鐨勬挙閿�鏇存敼")
@PutMapping("/updateInspected")
+ @ValueAuth
public Result<?> updateInspected(Integer id){
insProductService.updateInspected(id);
return Result.success();
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
index 52d84ba..c629729 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
@@ -11,10 +11,7 @@
import com.yuanchu.mom.service.StandardProductListService;
import com.yuanchu.mom.service.StandardTreeService;
import com.yuanchu.mom.vo.Result;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -147,4 +144,11 @@
public Result upStandardProducts(@RequestBody Map<String, Object> product){
return Result.success(standardTreeService.upStandardProducts(product));
}
+
+ @ValueAuth
+ @GetMapping("/getStandTreeBySampleType")
+ @ApiModelProperty("浠呰幏鍙栧厜绾ょ殑鍨嬪彿")
+ public Result<?> getStandTreeBySampleType(){
+ return Result.success(standardTreeService.getStandTreeBySampleType());
+ }
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
index 2805ef6..a1ffb3d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
@@ -27,4 +27,6 @@
int upStandardProducts(Map<String, Object> product);
+ List<StandardTree> getStandTreeBySampleType();
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java
index ff4d0bc..83a74fd 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java
@@ -10,10 +10,7 @@
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @author Administrator
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 0c66337..21c61a5 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
@@ -118,6 +118,14 @@
standardProductListMapper.update(productList, Wrappers.<StandardProductList>lambdaUpdate().in(StandardProductList::getId, ids));
return 1;
}
+
+ @Override
+ public List<StandardTree> getStandTreeBySampleType() {
+ return standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery()
+ .eq(StandardTree::getLaboratory, "閫氫俊浜у搧瀹為獙瀹�")
+ .eq(StandardTree::getSampleType, "鍏夌氦")
+ .select(StandardTree::getModel, StandardTree::getSample));
+ }
}
--
Gitblit v1.9.3