From c6c30ead51b2ac1f7ffd4fb7e4b193c5d11d7bdf Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 27 七月 2023 16:02:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
index 665a37e..3d2fb9e 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
@@ -2,7 +2,11 @@
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
+import com.yuanchu.limslaboratory.pojo.Instrument;
+import com.yuanchu.limslaboratory.pojo.Product;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
import com.yuanchu.limslaboratory.service.PlanService;
+import com.yuanchu.limslaboratory.service.ProductService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -28,6 +32,9 @@
@Resource
private PlanService planService;
+ @Resource
+ ProductService productService;
+
@ApiOperation("鏌ヨ鎵�鏈夋楠岃鍒掑垎閰�")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
@@ -39,19 +46,29 @@
return Result.success(planService.selectAllPlan(pageSize, countSize, state));
}
- @ApiOperation("鏌ヨ妫�楠岃鍒掗噷闈㈢殑妫�楠岄」鐩�")
+ @ApiOperation("鏍规嵁椤圭洰鍚嶆煡璇㈡墍鏈夎瘯楠屾柟娉�")
+ @GetMapping("/selectInstrumentByProname")
+ public Result selectInstrumentByProname(String name) {
+ return Result.success(productService.selectInstrumentByProname(name));
+ }
+
+ @ApiOperation("閫夋嫨璇曢獙鏂规硶")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "鏍峰搧id", dataTypeClass = Integer.class, required = true)
+ @ApiImplicitParam(name = "id", value = "椤圭洰id", dataTypeClass = Integer.class, required = true),
})
- @GetMapping("/selectProductById/{id}")
- public Result selectProductById(@PathVariable Integer id) {
- return Result.success(planService.selectProductById(id));
+ @PostMapping("/selectProMethodById")
+ public Result selectProMethodById(Integer id) {
+ Product product = productService.getById(id);
+ return Result.success(product.getMethod());
}
@ApiOperation("鍒嗛厤妫�楠岃鍒掍腑鍒嗛厤椤圭洰")
- @PostMapping("/upPlan")
- public Result upPlan(@RequestBody InspectionProductList inspectionProductList) {
- planService.upPlan(inspectionProductList);
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "妫�楠屾牱鍝両D", dataTypeClass = Integer.class, required = true),
+ })
+ @PutMapping("/upPlan/{id}")
+ public Result upPlan(@PathVariable Integer id ,@RequestBody InspectionProductListDto inspectionProductListDto) {
+ planService.upPlan(id,inspectionProductListDto);
return Result.success();
}
@@ -61,7 +78,8 @@
})
@PutMapping("/delPlan/{id}")
public Result delPlan(@PathVariable Integer id) {
- return Result.success(planService.delPlan(id));
+ planService.delPlan(id);
+ return Result.success();
}
@ApiOperation("鏌ヨ鎴愬搧妫�楠�")
--
Gitblit v1.9.3