From 5322edbcc5529864aaea26d78289df7a8a36fb77 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 20 七月 2023 11:25:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
index 62c8682..ae95e8a 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
@@ -51,13 +51,13 @@
@ApiImplicitParams(value = {
@ApiImplicitParam(value = "鐗╂枡ID", name = "materialId", dataTypeClass = String.class)
})
- public Result<?> getListProductInformation(Integer materialId) {
+ public Result<?> getListProductInformation(String materialId) {
List<Map<String, Object>> listMaterialInformation = productService.getListProductInformation(materialId);
return Result.success(listMaterialInformation);
}
@ApiOperation("鐗╂枡搴�-->鏍规嵁娴嬭瘯鏍囧噯ID鏌ヨ鍩烘湰淇℃伅")
- @GetMapping("/delete")
+ @GetMapping("/productId")
@ApiImplicitParams(value = {
@ApiImplicitParam(value = "娴嬭瘯鏍囧噯ID", name = "productId", dataTypeClass = String.class)
})
@@ -79,13 +79,13 @@
return Result.fail("鍒犻櫎澶辫触锛�");
}
-// @ApiOperation("鐗╂枡搴�-->淇敼鐗╂枡")
-// @PutMapping("/update")
-// public Result<?> updateMaterialInformation(@RequestBody Material material) {
-// Integer isUpdateMaterialSuccess = materialService.updateMaterialInformation(material);
-// if (isUpdateMaterialSuccess == 1) {
-// return Result.success("淇敼鐗╂枡銆�"+ material.getName() +"銆戞垚鍔燂紒");
-// }
-// return Result.fail("淇敼鐗╂枡銆�"+ material.getName() +"銆戝け璐ワ紒");
-// }
+ @ApiOperation("鐗╂枡搴�-->鏍规嵁娴嬭瘯鏍囧噯Id淇敼鏁版嵁")
+ @PutMapping("/update")
+ public Result<?> updateMaterialInformation(@RequestBody Product product) {
+ Integer isUpdateMaterialSuccess = productService.updateMaterialInformation(product);
+ if (isUpdateMaterialSuccess == 1) {
+ return Result.success("淇敼銆�"+ product.getName() +"銆戞垚鍔燂紒");
+ }
+ return Result.fail("淇敼銆�"+ product.getName() +"銆戝け璐ワ紒");
+ }
}
--
Gitblit v1.9.3