From 032b976ab803a263e734dcdca3ceadaed48f1070 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 27 七月 2023 16:51:08 +0800
Subject: [PATCH] LIMS管理系统框架-开发7-27下班合并代码
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 c0295d4..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
@@ -8,6 +8,7 @@
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.*;
@@ -68,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),
})
@@ -80,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("閫夋嫨鐗╂枡淇℃伅")
@@ -102,7 +104,8 @@
})
@PostMapping("/submitInspection")
public Result submitInspection(String inspectionId) {
- return Result.success(inspectionService.subInspectionByInsId(inspectionId));
+ inspectionService.subInspectionByInsId(inspectionId);
+ return Result.success();
}
@ApiOperation("浣滃簾妫�楠屽崟鐢宠")
@@ -111,6 +114,7 @@
})
@PostMapping("/delInspection")
public Result delInspection(String inspectionId) {
- return Result.success(inspectionService.delInspectionByInsId(inspectionId));
+ inspectionService.delInspectionByInsId(inspectionId);
+ return Result.success();
}
}
--
Gitblit v1.9.3