From f201f17d7e25e71d22b9c8b821e387bdc8fba52d Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 12 五月 2025 16:42:07 +0800
Subject: [PATCH] 添加判断当前时间是否没有该检测项的抽样计划功能
---
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceExaminePlanController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceExaminePlanController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceExaminePlanController.java
index 5050b64..fa77f8f 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceExaminePlanController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceExaminePlanController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.device.dto.DeviceExaminePlanDetailsDto;
import com.ruoyi.device.dto.DeviceExaminePlanDto;
import com.ruoyi.device.dto.DeviceExamineRecordContrastDto;
import com.ruoyi.device.dto.DeviceExamineRecordDto;
@@ -90,8 +91,8 @@
* @return
*/
@ApiOperation(value = "璁惧鏍告煡璁″垝鍒犻櫎")
- @GetMapping("/delQualitySupervise")
- public Result delQualitySupervise(Integer planId){
+ @DeleteMapping("/delDeviceExaminePlan")
+ public Result delDeviceExaminePlan(Integer planId){
return Result.success(deviceExaminePlanService.removeById(planId));
}
@@ -122,7 +123,7 @@
* @return
*/
@ApiOperation(value = "璁惧鏍告煡璁″垝鍒楄〃")
- @PostMapping("/pageDeviceExaminePlan")
+ @GetMapping("/pageDeviceExaminePlan")
public Result<IPage<DeviceExaminePlanDto>> pageDeviceExaminePlan(Page page, DeviceExaminePlan DeviceExaminePlan) {
return Result.success(deviceExaminePlanService.pageDeviceExaminePlan(page, DeviceExaminePlan));
}
@@ -132,8 +133,8 @@
* @return
*/
@ApiOperation(value = "璁惧鏍告煡璁″垝璇︽儏鍒楄〃")
- @PostMapping("/pageDeviceExaminePlanDetail")
- public Result<IPage<DeviceExaminePlanDetails>> pageDeviceExaminePlanDetail(Page page, DeviceExaminePlanDetails deviceExaminePlanDetails) {
+ @GetMapping("/pageDeviceExaminePlanDetail")
+ public Result<IPage<DeviceExaminePlanDetailsDto>> pageDeviceExaminePlanDetail(Page page, DeviceExaminePlanDetails deviceExaminePlanDetails) {
return Result.success(deviceExaminePlanService.pageDeviceExaminePlanDetail(page, deviceExaminePlanDetails));
}
@@ -165,7 +166,7 @@
* @return
*/
@ApiOperation(value = "鍒犻櫎璁惧鏍告煡璁″垝璇︽儏")
- @GetMapping("/delDeviceExaminePlanDetail")
+ @DeleteMapping("/delDeviceExaminePlanDetail")
public Result delDeviceExaminePlanDetail(Integer planDetailsId){
return Result.success(deviceExaminePlanDetailsService.removeById(planDetailsId));
}
--
Gitblit v1.9.3