From 23eb9c9a21afc8ed065706f0e6494ee998a217b5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:27 +0800
Subject: [PATCH] fix:1.班次页面：月度统计时间调整为上月26到本月25；班次支持右键添加批注 2.外购下单：KJNS域订单免检自动更新批次属性；外购下单-全部页新增【更新IFS批次属性】按钮，支持更新已提交订单的批次属性 3.资源要求-设备：设备核查计划：核查负责人回显问题修复；设备使用授权：检验项目导出数据错误问题修复
---
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceExaminePlanController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 b139e97..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 = "璁惧鏍告煡璁″垝鍒犻櫎")
- @DeleteMapping("/delQualitySupervise")
- public Result delQualitySupervise(Integer planId){
+ @DeleteMapping("/delDeviceExaminePlan")
+ public Result delDeviceExaminePlan(Integer planId){
return Result.success(deviceExaminePlanService.removeById(planId));
}
@@ -133,7 +134,7 @@
*/
@ApiOperation(value = "璁惧鏍告煡璁″垝璇︽儏鍒楄〃")
@GetMapping("/pageDeviceExaminePlanDetail")
- public Result<IPage<DeviceExaminePlanDetails>> pageDeviceExaminePlanDetail(Page page, DeviceExaminePlanDetails deviceExaminePlanDetails) {
+ public Result<IPage<DeviceExaminePlanDetailsDto>> pageDeviceExaminePlanDetail(Page page, DeviceExaminePlanDetails deviceExaminePlanDetails) {
return Result.success(deviceExaminePlanService.pageDeviceExaminePlanDetail(page, deviceExaminePlanDetails));
}
--
Gitblit v1.9.3