From 31ccc9cd47f96cea6e4e13b078187fd3201c4666 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 04 九月 2026 16:35:24 +0800
Subject: [PATCH] feat(report): 更新检测报告模板并优化报告生成功能 - 优化设备信息展示格式，支持多设备列表显示 - 统一检测报告和检验报告使用新版模板格式
---
cnas-process/src/main/java/com/ruoyi/process/service/QualityMonitorService.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/QualityMonitorService.java b/cnas-process/src/main/java/com/ruoyi/process/service/QualityMonitorService.java
index 8bd261e..2d3e230 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/QualityMonitorService.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/QualityMonitorService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.process.dto.QualityMonitorDetailsDto;
import com.ruoyi.process.dto.QualityMonitorDto;
import com.ruoyi.process.pojo.*;
import org.springframework.web.multipart.MultipartFile;
@@ -54,7 +55,7 @@
* @param qualityMonitorDetails
* @return
*/
- IPage<QualityMonitorDetails> pageQualityMonitorDetail(Page page, QualityMonitorDetails qualityMonitorDetails);
+ IPage<QualityMonitorDetailsDto> pageQualityMonitorDetail(Page page, QualityMonitorDetails qualityMonitorDetails);
/**
@@ -123,17 +124,17 @@
/**
* 鏂板鐩戞帶璇勪环闄勪欢琛�
- * @param detailsEvaluateId
+ * @param qualityMonitorDetailsId
* @param file
* @return
*/
- boolean uploadEvaluateFile(Integer detailsEvaluateId, MultipartFile file);
+ boolean uploadEvaluateFile(Integer qualityMonitorDetailsId, MultipartFile file);
/**
* 鏌ヨ鐩戞帶璇勪环闄勪欢鍒楄〃
* @return
*/
- List<QualityMonitorDetailsEvaluateFile> getEvaluateFileList(Integer detailsEvaluateId);
+ List<QualityMonitorDetailsEvaluateFile> getEvaluateFileList(Integer qualityMonitorDetailsId);
/**
--
Gitblit v1.9.3