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/PlanController.java | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 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 79bace6..84e6ac8 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,19 +1,17 @@
package com.yuanchu.limslaboratory.controller;
-import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
import com.yuanchu.limslaboratory.service.PlanService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
-import java.util.*;
/**
* <p>
@@ -32,16 +30,38 @@
private PlanService planService;
- @ApiOperation("鏌ヨ妫�楠岃鍒�")
+ @ApiOperation("鏌ヨ鎵�鏈夋楠岃鍒�")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "device", value = "璁惧鍚嶇ОId", dataTypeClass = String.class),
- @ApiImplicitParam(name = "beginTime", value = "妫�楠屽紑濮嬫椂闂�", dataTypeClass = Date.class),
- @ApiImplicitParam(name = "endTime", value = "妫�楠岀粨鏉熸椂闂�", dataTypeClass = Date.class),
- @ApiImplicitParam(name = "user", value = "妫�楠屼汉", dataTypeClass = String.class)
+ @ApiImplicitParam(name = "code", value = "鐢宠鍗曠紪鍙�", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "beginTime", value = "妫�楠屽紑濮嬫椂闂�", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "endTime", value = "妫�楠岀粨鏉熸椂闂�", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "status", value = "妫�楠岀粨鏋�", dataTypeClass = Integer.class)
})
@GetMapping("/selectAllPlan")
- public Result selectAllPlan(String device, @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime, String user) {
- List<PlanVo> planVoList = planService.selectAllPlan(device, beginTime, endTime, user);
- return Result.success(planVoList);
+ public Result selectAllPlan(String code, String beginTime, String endTime, Integer status) {
+ return Result.success(planService.selectAllPlan(code, beginTime, endTime, status));
+ }
+
+ @ApiOperation("鍒嗛厤-->閫夋嫨妫�楠屼汉")
+ @GetMapping("/choosecheck")
+ public Result choosecheck() {
+ return Result.success(planService.choosecheck());
+ }
+
+ @ApiOperation("鍒嗛厤--閫夋嫨璁惧")
+ @GetMapping("/chooseinstum")
+ public Result chooseinstum() {
+ return Result.success(planService.chooseinstum());
+ }
+
+ @ApiOperation("鍒嗛厤")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "妫�楠岄」鐩甶d", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "userId", value = "妫�楠屼汉id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "instrumentId", value = "璁惧id", dataTypeClass = Integer.class, required = true)
+ })
+ @PostMapping("/distribution")
+ public Result distribution(Integer id, Integer userId, Integer instrumentId) {
+ return Result.success(planService.distribution(id, userId, instrumentId));
}
}
--
Gitblit v1.9.3