From 993095c3d36d62e52aaa6cb229c309231205f343 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 19 十月 2026 17:11:52 +0800
Subject: [PATCH] feat(qualityMonitor): 实现质量监控检验任务完整流程 - 新增年度质量监控计划创建、提交审核及按年度查询接口 - 新增质量监控检验任务下发、查询及取消接口 - 新增质量监控检验评价提交与批准/退回流程 - 在检验订单中增加任务来源和质量监控明细ID字段 - 增加质控任务认领、原始记录填写、提交、复核等环节的权限校验 - 质控任务复核通过后发送评价通知给指定评价人 - 质控任务不生成检验报告，由评价环节完成归档 - 新增从已复核质控原始记录读取检测数据和上下文信息的方法 - 增加标准方法验证中实时查看所选设备校准证书的功能 - 补充质量监控计划明细的模板ID规范化及字段校验逻辑 - 在样品查询SQL中关联质控明细表返回任务来源和评价状态
---
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java
index af266b6..c8a5363 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java
@@ -17,10 +17,12 @@
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.device.mapper.DeviceMapper;
+import com.ruoyi.device.pojo.Device;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.inspect.util.UserUtils;
import com.ruoyi.process.dto.ProcessMethodVerifyDto;
+import com.ruoyi.process.dto.ProcessMethodVerifyCalibrationsFileDto;
import com.ruoyi.process.dto.ProcessMethodVerifyExportWordDto;
import com.ruoyi.process.mapper.ProcessMethodVerifyCalibrationsFileMapper;
import com.ruoyi.process.mapper.ProcessMethodVerifyMapper;
@@ -191,6 +193,39 @@
return files;
}
+ @Override
+ public List<ProcessMethodVerifyCalibrationsFileDto> getCurrentCalibrationFiles(String deviceIds) {
+ List<ProcessMethodVerifyCalibrationsFileDto> files = new ArrayList<>();
+ if (StringUtils.isBlank(deviceIds)) return files;
+
+ Set<Integer> ids = new LinkedHashSet<>();
+ for (String value : StrUtil.split(deviceIds, ",")) {
+ try {
+ ids.add(Integer.valueOf(value.trim()));
+ } catch (NumberFormatException e) {
+ throw new ErrorException("璁惧ID鏃犳晥");
+ }
+ }
+ if (ids.size() > 50) throw new ErrorException("鏈�澶氭煡鐪�50鍙拌澶囩殑鏍″噯璇佷功");
+
+ for (Integer deviceId : ids) {
+ String fileName = processMethodVerifyCalibrationsFileMapper.selectCalibrationsFile(deviceId);
+ if (StringUtils.isBlank(fileName)) continue;
+ Device device = deviceMapper.selectById(deviceId);
+ if (device == null) continue;
+
+ ProcessMethodVerifyCalibrationsFileDto file = new ProcessMethodVerifyCalibrationsFileDto();
+ file.setDeviceId(deviceId);
+ file.setDeviceName(device.getDeviceName());
+ file.setManagementNumber(device.getManagementNumber());
+ file.setFileName(fileName);
+ file.setFileUrl(fileName);
+ file.setType(fileName.matches("(?i).*\\.(png|jpe?g|gif|bmp|webp)$") ? 1 : 2);
+ files.add(file);
+ }
+ return files;
+ }
+
/**
* 淇敼鏍囧噯鏂规硶楠岃瘉
*
@@ -243,6 +278,13 @@
processMethodVerifyMethodFileService.remove(Wrappers.<ProcessMethodVerifyMethodFile>lambdaQuery()
.eq(ProcessMethodVerifyMethodFile::getMethodVerifyId, methodVerifyId));
+ // 鍒犻櫎鎵�鏈変笂宀楄瘉
+ processMethodVerifyWorkFileService.remove(Wrappers.<ProcessMethodVerifyWorkFile>lambdaQuery()
+ .eq(ProcessMethodVerifyWorkFile::getMethodVerifyId, methodVerifyId));
+
+ // 鍒犻櫎鎵�鏈夋牎鍑嗚瘉涔�
+ processMethodVerifyCalibrationsFileService.remove(Wrappers.<ProcessMethodVerifyCalibrationsFile>lambdaQuery()
+ .eq(ProcessMethodVerifyCalibrationsFile::getMethodVerifyId, methodVerifyId));
baseMapper.deleteById(methodVerifyId);
--
Gitblit v1.9.3