From 781f2999683ca99577026df7ef4b748bf6366dac Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 31 五月 2024 17:17:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
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 a1a80cf..c41b490 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,13 +11,16 @@
import com.yuanchu.mom.service.StandardProductListService;
import com.yuanchu.mom.service.StandardTreeService;
import com.yuanchu.mom.vo.Result;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
@RestController
@AllArgsConstructor
@RequestMapping("/standardTree")
+@Api(tags="鏍囧噯搴�")
public class StandardTreeController {
private StandardTreeService standardTreeService;
@@ -53,7 +56,6 @@
public Result selectsStandardMethodByFLSSM(String tree){
return Result.success(standardMethodListService.selectsStandardMethodByFLSSM(tree));
}
- @ValueAuth
@ValueClassify("鏍囧噯搴�")
@ApiOperation(value = "淇敼鏍囧噯搴撲腑鐨勫唴瀹�")
@PostMapping("/upStandardProductList")
@@ -104,6 +106,20 @@
return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree, page));
}
+ @ApiOperation(value = "鎵归噺缂栬緫鏌ヨ妫�楠岄」鐩�")
+ @PostMapping("/selectStandardProductByMethodId")
+ @ValueAuth
+ public Result selectStandardProductByMethodId(Integer id, String tree, Integer page,String laboratory,String item,String items){
+ return Result.success(standardProductListService.selectStandardProductByMethodId(id, tree, page, laboratory, item, items));
+ }
+
+ @ApiOperation(value = "鎵归噺缂栬緫鏌ヨ鎵�鏈夋楠岄」鐩拰妫�楠屽瓙椤规灇涓�")
+ @PostMapping("/selectStandardProductEnumByMethodId")
+ @ValueAuth
+ public Result selectStandardProductEnumByMethodId(Integer id, String tree){
+ return Result.success(standardProductListService.selectStandardProductEnumByMethodId(id, tree));
+ }
+
@ApiOperation(value = "鑾峰彇鏍囧噯鏍戜笅鏍囧噯鏂规硶鏋氫妇")
@GetMapping("/selectStandardMethodEnum")
@ValueAuth
@@ -118,4 +134,21 @@
return Result.success(standardTreeService.getStandardTree2());
}
+ @ValueClassify("鏍囧噯搴�")
+ @ApiOperation(value = "鎵归噺淇敼椤圭洰鍐呭")
+ @PostMapping("/upStandardProducts")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "standardProductList",dataTypeClass = StandardProductList.class),
+ @ApiImplicitParam(name = "ids",dataTypeClass = Integer.class)
+ })
+ public Result upStandardProducts(@RequestBody Map<String, Object> product){
+ return Result.success(standardTreeService.upStandardProducts(product));
+ }
+
+ @ValueAuth
+ @PostMapping("/getStandTreeBySampleType")
+ @ApiModelProperty("浠呰幏鍙栧厜绾ょ殑鍨嬪彿")
+ public Result<?> getStandTreeBySampleType(String laboratory, String sampleType){
+ return Result.success(standardTreeService.getStandTreeBySampleType(laboratory, sampleType));
+ }
}
--
Gitblit v1.9.3