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-process/src/main/java/com/ruoyi/process/controller/QualityMonitorController.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/QualityMonitorController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/QualityMonitorController.java
index b47ab14..3a4a0a3 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/QualityMonitorController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/QualityMonitorController.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.framework.exception.ErrorException;
+import com.ruoyi.process.dto.QualityMonitorDetailsDto;
import com.ruoyi.process.dto.QualityMonitorDto;
import com.ruoyi.process.mapper.QualityMonitorDetailsEvaluateFileMapper;
import com.ruoyi.process.pojo.*;
@@ -68,7 +69,7 @@
* @return
*/
@ApiOperation(value = "鐩戞帶璁″垝鍒犻櫎")
- @GetMapping("/delQualitySupervise")
+ @DeleteMapping("/delQualitySupervise")
public Result delQualitySupervise(Integer qualityMonitorId) {
return Result.success(qualityMonitorService.removeById(qualityMonitorId));
}
@@ -101,7 +102,7 @@
*/
@ApiOperation(value = "鐩戞帶璁″垝璇︽儏鍒楄〃")
@GetMapping("/pageQualityMonitorDetail")
- public Result<IPage<QualityMonitorDetails>> pageQualityMonitorDetail(QualityMonitorDetails qualityMonitorDetails,Page page) throws Exception {
+ public Result<IPage<QualityMonitorDetailsDto>> pageQualityMonitorDetail(QualityMonitorDetails qualityMonitorDetails, Page page) throws Exception {
return Result.success(qualityMonitorService.pageQualityMonitorDetail(page, qualityMonitorDetails));
}
@@ -236,14 +237,14 @@
/**
* 鏂板鐩戞帶璇勪环闄勪欢琛�
- * @param detailsEvaluateId
+ * @param qualityMonitorDetailsId
* @param file
* @return
*/
@ApiOperation(value = "鏂板鐩戞帶璇勪环闄勪欢琛�")
@PostMapping("/uploadEvaluateFile")
- public Result<?> uploadEvaluateFile(Integer detailsEvaluateId, MultipartFile file) {
- return Result.success(qualityMonitorService.uploadEvaluateFile(detailsEvaluateId, file));
+ public Result<?> uploadEvaluateFile(Integer qualityMonitorDetailsId, MultipartFile file) {
+ return Result.success(qualityMonitorService.uploadEvaluateFile(qualityMonitorDetailsId, file));
}
@@ -253,8 +254,8 @@
*/
@ApiOperation(value = "鏌ヨ鐩戞帶璇勪环闄勪欢鍒楄〃")
@GetMapping("/getEvaluateFileList")
- public Result<List<QualityMonitorDetailsEvaluateFile>> getEvaluateFileList(Integer detailsEvaluateId) {
- return Result.success(qualityMonitorService.getEvaluateFileList(detailsEvaluateId));
+ public Result<List<QualityMonitorDetailsEvaluateFile>> getEvaluateFileList(Integer qualityMonitorDetailsId) {
+ return Result.success(qualityMonitorService.getEvaluateFileList(qualityMonitorDetailsId));
}
/**
@@ -262,7 +263,7 @@
* @return
*/
@ApiOperation(value = "鍒犻櫎鐩戞帶璇勪环闄勪欢琛�")
- @GetMapping("/delVerifyEvaluateFileList")
+ @DeleteMapping("/delVerifyEvaluateFileList")
public Result delVerifyMethodFileList(Integer evaluateFileId) {
return Result.success(qualityMonitorDetailsEvaluateFileMapper.deleteById(evaluateFileId));
}
--
Gitblit v1.9.3