From 0a62550520293dacf31c4cf0dd58735db066e2dd Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 26 七月 2023 09:29:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 816739d..c0295d4 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.yuanchu.limslaboratory.pojo.Inspection;
+import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.service.*;
@@ -28,7 +29,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
-@Api(tags = "妫�楠屾ā鍧�")
+@Api(tags = "妫�楠屾ā鍧�-->妫�楠屽崟")
@RestController
@RequestMapping("/inspection")
public class InspectionController {
@@ -95,4 +96,21 @@
return Result.success(materialService.selectMaterialById(materialId));
}
+ @ApiOperation("鎻愪氦妫�楠屽崟鐢宠")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "inspectionId", value = "妫�楠屽崟ID", dataTypeClass = String.class, required = true),
+ })
+ @PostMapping("/submitInspection")
+ public Result submitInspection(String inspectionId) {
+ return Result.success(inspectionService.subInspectionByInsId(inspectionId));
+ }
+
+ @ApiOperation("浣滃簾妫�楠屽崟鐢宠")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "inspectionId", value = "妫�楠屽崟ID", dataTypeClass = String.class, required = true),
+ })
+ @PostMapping("/delInspection")
+ public Result delInspection(String inspectionId) {
+ return Result.success(inspectionService.delInspectionByInsId(inspectionId));
+ }
}
--
Gitblit v1.9.3