From 30f6da8bf0143906b42fa600f6a604cea6c81f71 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 26 七月 2023 09:16:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
index 4067891..665a37e 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
@@ -1,7 +1,7 @@
package com.yuanchu.limslaboratory.controller;
-import com.yuanchu.limslaboratory.pojo.Plan;
+import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.yuanchu.limslaboratory.service.PlanService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
@@ -20,7 +20,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
-@Api(tags = "妫�楠屾ā鍧�")
+@Api(tags = "妫�楠屾ā鍧�-->妫�楠岃鍒�")
@RestController
@RequestMapping("/plan")
public class PlanController {
@@ -28,7 +28,7 @@
@Resource
private PlanService planService;
- @ApiOperation("鏌ヨ鎵�鏈夋楠岃鍒掕〃")
+ @ApiOperation("鏌ヨ鎵�鏈夋楠岃鍒掑垎閰�")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
@@ -39,21 +39,39 @@
return Result.success(planService.selectAllPlan(pageSize, countSize, state));
}
- @ApiOperation("鏌ヨ妫�楠岃鍒掗噷闈㈢殑鍒嗛厤淇℃伅")
+ @ApiOperation("鏌ヨ妫�楠岃鍒掗噷闈㈢殑妫�楠岄」鐩�")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "鏍峰搧缂栧彿", dataTypeClass = Integer.class, required = true)
+ @ApiImplicitParam(name = "id", value = "鏍峰搧id", dataTypeClass = Integer.class, required = true)
})
- @PutMapping("/selectPlanById/{id}")
- public Result selectPlanById(@PathVariable Integer id) {
- return Result.success(planService.selectById(id));
+ @GetMapping("/selectProductById/{id}")
+ public Result selectProductById(@PathVariable Integer id) {
+ return Result.success(planService.selectProductById(id));
+ }
+
+ @ApiOperation("鍒嗛厤妫�楠岃鍒掍腑鍒嗛厤椤圭洰")
+ @PostMapping("/upPlan")
+ public Result upPlan(@RequestBody InspectionProductList inspectionProductList) {
+ planService.upPlan(inspectionProductList);
+ return Result.success();
}
@ApiOperation("浣滃簾妫�楠岃鍒�")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id", value = "妫�楠岃鍒扞D", dataTypeClass = Integer.class, required = true),
})
- @PostMapping("/delPlan")
- public Result delPlan(Integer id) {
+ @PutMapping("/delPlan/{id}")
+ public Result delPlan(@PathVariable Integer id) {
return Result.success(planService.delPlan(id));
}
+
+ @ApiOperation("鏌ヨ鎴愬搧妫�楠�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "state", value = "鐘舵��(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class)
+ })
+ @GetMapping("/selectInspection")
+ public Result selectInspection(int pageSize, int countSize, Integer state) {
+ return Result.success(planService.selectInspection(pageSize,countSize,state));
+ }
}
--
Gitblit v1.9.3