From 0e1722e96e5483d560eda8f1cf96282955d4f224 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 27 七月 2023 15:04:40 +0800
Subject: [PATCH] 检验模块
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 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 c3c2dfa..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,10 +1,8 @@
package com.yuanchu.limslaboratory.controller;
-
-import com.yuanchu.limslaboratory.pojo.InspectionProductList;
-import com.yuanchu.limslaboratory.pojo.User;
-import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
+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;
@@ -12,7 +10,6 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
-
import javax.annotation.Resource;
/**
@@ -32,6 +29,9 @@
UserService userService;
@Resource
+ InstrumentService instrumentService;
+
+ @Resource
InspectionProductListService inspectionProductListService;
@ApiOperation("鏌ヨ璇曢獙鍛樹俊鎭�")
@@ -49,6 +49,22 @@
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)
--
Gitblit v1.9.3