From e0ef38a77c4bbe67d8a9eab46134ed00fb1e8293 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 24 八月 2023 10:53:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
index 853f518..e7a7ce8 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
@@ -30,7 +30,13 @@
@Autowired
private MaterialService materialService;
- @ApiOperation("娣诲姞鐗╂枡")
+ @ApiOperation(value = "娣诲姞鎸囨爣-->閫夋嫨鏍峰搧鍚嶇О")
+ @GetMapping("/selectmater")
+ public Result selectmater() {
+ return Result.success(materialService.selectmater());
+ }
+
+ @ApiOperation("娣诲姞鎸囨爣")
@PostMapping("/add")
public Result<?> addMaterialInformation(@Validated @RequestBody AddMaterialDto addMaterialDto) {
Integer isMaterialSuccess = materialService.addMaterialInformation(addMaterialDto);
@@ -53,13 +59,10 @@
return Result.fail("鍒犻櫎澶辫触锛�");
}
- @ApiOperation("渚ц竟鏍忓洓绾у睍寮�")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(value = "鍨嬪彿/鍨嬪彿鍚嶇О", name = "specificationName", dataTypeClass = String.class)
- })
+ @ApiOperation(value = "鏍囧噯搴�-->鐗╂枡-->渚ц竟鏍忓洓绾у睍寮�")
@GetMapping("/list")
- public Result<?> getFourLevelInformation(String specificationName) {
- List<Map<String, Object>> fourLevelInformation = materialService.getFourLevelInformation(specificationName);
+ public Result<?> getFourLevelInformation() {
+ List<Map<String, Object>> fourLevelInformation = materialService.getFourLevelInformation();
return Result.success(fourLevelInformation);
}
}
--
Gitblit v1.9.3