From 4b55cf8d21443e366f83acf20c4333abef8f54ae Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 21 八月 2023 13:40:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 34 ++++++----------------------------
1 files changed, 6 insertions(+), 28 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
index dd191cd..fd379d3 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.yuanchu.limslaboratory.pojo.Inspection;
+import com.yuanchu.limslaboratory.pojo.Report;
import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
import com.yuanchu.limslaboratory.service.LinkBasicInformationService;
import com.yuanchu.limslaboratory.service.RawMaterialService;
@@ -21,6 +22,7 @@
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.service.InspectionService;
+
import javax.annotation.Resource;
/**
@@ -66,40 +68,17 @@
@GetMapping("/selectAll")
public Result selectAll(Integer type) {
switch (type) {
- case 0 :
+ case 0:
//鍘熸潗鏂�
return Result.success(rawMaterialService.selectRawmaAll());
- case 1 :
+ case 1:
//濮旀墭鍗�
return Result.success(linkBasicInformationService.selectLinkAll());
- case 2 :
+ case 2:
//鎴愬搧妫�楠�
return Result.success("璇疯緭鍏ユ楠屼俊鎭�!");
}
return Result.fail("绫诲瀷閿欒!");
- }
-
-
- @ApiOperation(value = "閫夋嫨鍘熸潗鏂欐姤妫�")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "鍘熸潗鏂欐姤妫�鍗昳d", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "startTime", value = "妫�楠屽紑濮嬫棩鏈�", dataTypeClass = String.class, required = true),
- @ApiImplicitParam(name = "endTime", value = "妫�楠岀粨鏉熸棩鏈�", dataTypeClass = String.class, required = true)
- })
- @GetMapping("/selectRawmaById")
- public Result selectRawmaById(Integer id, String startTime, String endTime) throws ParseException {
- return Result.success(rawMaterialService.selectRawmaById(id,startTime,endTime));
- }
-
-
- @ApiOperation(value = "閫夋嫨濮旀墭鎶ユ鍜屾牱鍝�")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "bid", value = "濮旀墭鎶ユ鍗昳d", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "did", value = "濮旀墭鎶ユ鏍峰搧id", dataTypeClass = Integer.class, required = true)
- })
- @GetMapping("/selectLinkByid")
- public Result selectLinkByid(Integer bid, Integer did) {
- return Result.success(linkBasicInformationService.selectLinkByid(bid, did));
}
@@ -111,7 +90,7 @@
return Result.success(inspectionService.addInspect((Integer) unmarshal.get("id"), inspectionVo));
}
- @ApiOperation(value = "鏍规嵁妫�楠屽崟id鏌ヨ鍘熸潗鏂欐楠屽崟璇︽儏")
+ @ApiOperation(value = "鏍规嵁妫�楠屽崟id鏌ヨ妫�楠屽崟璇︽儏")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true)
})
@@ -133,7 +112,6 @@
}
return Result.success(inspectionService.updateInspectsById(id));
}
-
}
--
Gitblit v1.9.3