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/InspectionProductListController.java | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java
index e9d023e..7002ef8 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java
@@ -1,7 +1,8 @@
package com.yuanchu.limslaboratory.controller;
-
-import com.yuanchu.limslaboratory.pojo.User;
+import com.yuanchu.limslaboratory.pojo.Instrument;
+import com.yuanchu.limslaboratory.service.InspectionProductListService;
+import com.yuanchu.limslaboratory.service.InstrumentService;
import com.yuanchu.limslaboratory.service.UserService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
@@ -9,7 +10,6 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
-
import javax.annotation.Resource;
/**
@@ -20,13 +20,19 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
-@Api(tags = "妫�楠屾ā鍧�-->鍒嗛厤璁″垝-->妫�楠岄」鐩�")
+@Api(tags = "妫�楠屾ā鍧�-->妫�楠屾牱鍝�-->妫�楠岄」鐩�")
@RestController
@RequestMapping("/inspection-product-list")
public class InspectionProductListController {
@Resource
UserService userService;
+
+ @Resource
+ InstrumentService instrumentService;
+
+ @Resource
+ InspectionProductListService inspectionProductListService;
@ApiOperation("鏌ヨ璇曢獙鍛樹俊鎭�")
@GetMapping("/selectUser")
@@ -42,4 +48,30 @@
public Result selectUserById(Integer id) {
return Result.success(userService.selectByUserId(id));
}
+
+ @ApiOperation("鏌ヨ璁惧淇℃伅")
+ @GetMapping("/selectInstrument")
+ public Result selectInstrument() {
+ return Result.success(instrumentService.selectInstrument());
+ }
+
+ @ApiOperation("閫夋嫨璁惧淇℃伅")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "璁惧ID", dataTypeClass = Integer.class, required = true),
+ })
+ @PostMapping("/selectInstrumentById")
+ public Result selectInstrumentById(Integer id) {
+ Instrument instrument = instrumentService.getById(id);
+ return Result.success(instrument.getEquipmentName());
+ }
+
+ @ApiOperation("鏍规嵁妫�楠岃鍒掓牱鍝乮d鏌ヨ妫�楠岄」鐩�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "鏍峰搧id", dataTypeClass = Integer.class, required = true)
+ })
+ @GetMapping("/selectProductById/{id}")
+ public Result selectProductById(@PathVariable Integer id) {
+ return Result.success(inspectionProductListService.selectProductById(id));
+ }
+
}
--
Gitblit v1.9.3