From 4243b6500bbc58ea17b452cd7800e8fd94765f76 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 04 八月 2023 11:34:13 +0800
Subject: [PATCH] LIMS管理系统框架-开发8-4
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 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..f13bb17 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,10 +3,12 @@
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.*;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
+import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.*;
@@ -28,7 +30,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
-@Api(tags = "妫�楠屾ā鍧�")
+@Api(tags = "妫�楠屾ā鍧�-->妫�楠屽崟")
@RestController
@RequestMapping("/inspection")
public class InspectionController {
@@ -67,7 +69,7 @@
return Result.success(inspectionService.selectAllInspection(pageSize, countSize, state));
}
- @ApiOperation("鏌ヨ妫�楠屽崟閲岄潰鐨勭墿鏂欎俊鎭�")
+ @ApiOperation("鏌ヨ妫�楠屽崟閲岄潰鐨勬牱鍝佷俊鎭�")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "inspectionId", value = "鎶ユ鍗旾D", dataTypeClass = String.class, required = true),
})
@@ -79,11 +81,12 @@
@ApiOperation("鏌ヨ鐗╂枡淇℃伅")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true)
+ @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "type", value = "绫诲瀷", dataTypeClass = Integer.class, required = true)
})
@GetMapping("/selectMaterialLimit")
- public Result selectMaterialLimit(int pageSize, int countSize) {
- return Result.success(materialService.selectMaterialLimit(pageSize, countSize));
+ public Result selectMaterialLimit(int pageSize, int countSize, int type) {
+ return Result.success(materialService.selectMaterialLimit(pageSize, countSize, type));
}
@ApiOperation("閫夋嫨鐗╂枡淇℃伅")
@@ -95,4 +98,23 @@
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) {
+ inspectionService.subInspectionByInsId(inspectionId);
+ return Result.success();
+ }
+
+ @ApiOperation("浣滃簾妫�楠屽崟鐢宠")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "inspectionId", value = "妫�楠屽崟ID", dataTypeClass = String.class, required = true),
+ })
+ @PostMapping("/delInspection")
+ public Result delInspection(String inspectionId) {
+ inspectionService.delInspectionByInsId(inspectionId);
+ return Result.success();
+ }
}
--
Gitblit v1.9.3