From 12e35c60f9be4403b5cdec5f0d87c2d0f7384dd3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 18 六月 2024 10:28:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 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 52d84ba..b1cf762 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,12 +11,10 @@
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.*;
+import org.springframework.web.multipart.MultipartFile;
import java.util.Map;
@@ -62,7 +60,8 @@
@ValueClassify("鏍囧噯搴�")
@ApiOperation(value = "淇敼鏍囧噯搴撲腑鐨勫唴瀹�")
@PostMapping("/upStandardProductList")
- public Result upStandardProductList(@RequestBody StandardProductList list){
+ public Result upStandardProductList(String str){
+ StandardProductList list = JSON.parseObject(str, StandardProductList.class);
return Result.success(standardProductListService.upStandardProductList(list));
}
@ValueAuth
@@ -147,4 +146,35 @@
public Result upStandardProducts(@RequestBody Map<String, Object> product){
return Result.success(standardTreeService.upStandardProducts(product));
}
+
+ @ValueAuth
+ @PostMapping("/getStandTreeBySampleType")
+ @ApiOperation("浠呰幏鍙栧厜绾ょ殑鍨嬪彿")
+ public Result<?> getStandTreeBySampleType(String laboratory, String sampleType){
+ return Result.success(standardTreeService.getStandTreeBySampleType(laboratory, sampleType));
+ }
+
+ @ValueClassify("鏍囧噯搴�")
+ @ApiOperation("瀵煎叆鏍囧噯搴�")
+ @PostMapping("/inExcelOfTree")
+ public Result inExcelOfTree(@RequestParam("file") MultipartFile file){
+ standardTreeService.inExcelOfTree(file);
+ return Result.success();
+ }
+
+ @ValueAuth
+ @ApiOperation("閲嶇疆鏍囧噯搴撳崟浠�")
+ @PostMapping("/resetTreeOfPrice")
+ public Result resetTreeOfPrice(String tree, Integer standardId){
+ standardTreeService.resetTreeOfPrice(tree, standardId);
+ return Result.success();
+ }
+
+ @ValueAuth
+ @ApiOperation("閲嶇疆鏍囧噯搴撳伐鏃剁郴鏁�")
+ @PostMapping("/resetTreeOfHour")
+ public Result resetTreeOfHour(String tree, Integer standardId){
+ standardTreeService.resetTreeOfHour(tree, standardId);
+ return Result.success();
+ }
}
--
Gitblit v1.9.3