From 390e54f20695b7f369fb50f584447d193543539d Mon Sep 17 00:00:00 2001
From: “zhuo” <“zhuo@itcast.cn”>
Date: 星期四, 10 八月 2023 12:52:28 +0800
Subject: [PATCH] 8-10提交代码
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java | 10 ++++------
1 files changed, 4 insertions(+), 6 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 6768f4c..79bace6 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,5 @@
package com.yuanchu.limslaboratory.controller;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
import com.yuanchu.limslaboratory.service.PlanService;
import com.yuanchu.limslaboratory.vo.Result;
@@ -36,14 +34,14 @@
@ApiOperation("鏌ヨ妫�楠岃鍒�")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "deviceId", value = "璁惧鍚嶇ОId", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "device", value = "璁惧鍚嶇ОId", dataTypeClass = String.class),
@ApiImplicitParam(name = "beginTime", value = "妫�楠屽紑濮嬫椂闂�", dataTypeClass = Date.class),
@ApiImplicitParam(name = "endTime", value = "妫�楠岀粨鏉熸椂闂�", dataTypeClass = Date.class),
- @ApiImplicitParam(name = "userId", value = "妫�楠屼汉", dataTypeClass = Integer.class)
+ @ApiImplicitParam(name = "user", value = "妫�楠屼汉", dataTypeClass = String.class)
})
@GetMapping("/selectAllPlan")
- public Result selectAllPlan(Integer deviceId, @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime, Integer userId) {
- List<PlanVo> planVoList = planService.selectAllPlan(deviceId, beginTime, endTime, userId);
+ 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);
}
}
--
Gitblit v1.9.3