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/excel/QualityMonitorDetailsUpload.java | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/excel/QualityMonitorDetailsUpload.java b/cnas-process/src/main/java/com/ruoyi/process/excel/QualityMonitorDetailsUpload.java
index d6489af..4cb97bc 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/excel/QualityMonitorDetailsUpload.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/excel/QualityMonitorDetailsUpload.java
@@ -1,6 +1,7 @@
package com.ruoyi.process.excel;
import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
@@ -8,26 +9,51 @@
* @Date 2024/11/8
*/
@Data
+@Schema(description = "骞村害璐ㄩ噺鐩戞帶璁″垝鏄庣粏瀵煎叆琛�")
public class QualityMonitorDetailsUpload {
- @ExcelProperty("鐩戞帶鐩殑")
+ @Schema(description = "璁″垝鍐呮帓搴忓彿")
+ @ExcelProperty("搴忓彿")
+ private Integer sortNo;
+
+ @Schema(description = "璐ㄦ帶椤圭洰")
+ @ExcelProperty("璐ㄦ帶椤圭洰")
+ private String monitorProject;
+
+ @Schema(description = "鎶�鏈爣鍑�")
+ @ExcelProperty("鎶�鏈爣鍑�")
+ private String technicalStandardText;
+
+ @Schema(description = "璐ㄦ帶鏂瑰紡")
+ @ExcelProperty("璐ㄦ帶鏂瑰紡")
+ private String monitorWay;
+
+ @Schema(description = "璁″垝瀹屾垚鏈堜唤")
+ @ExcelProperty("瀹屾垚鏃堕檺")
+ private String completionMonth;
+
+ @Schema(description = "璐熻矗浜哄鍚�")
+ @ExcelProperty("璐熻矗浜�")
+ private String responsibleName;
+
+ @Schema(description = "鐩戞帶鐩殑锛屽吋瀹瑰巻鍙插鍏ュ垪")
+ @ExcelProperty(value = "鐩戞帶鐩殑", index = -1)
private String monitorPurpose;
+ @Schema(description = "璁″垝寮�灞曟椂闂达紝鍏煎鍘嗗彶瀵煎叆鍒�")
@ExcelProperty("璁″垝寮�灞曟椂闂�")
private String plannedTime;
- @ExcelProperty("鐩戞帶椤圭洰")
- private String monitorProject;
-
+ @Schema(description = "鍙傚姞鍗曚綅鎴栦汉鍛�")
@ExcelProperty("鍙傚姞鍗曚綅锛堜汉鍛橈級")
private String participant;
+ @Schema(description = "棰勭畻閲戦")
@ExcelProperty("棰勭畻锛堝厓锛�")
private String budget;
+ @Schema(description = "缁勭粐浜哄憳")
@ExcelProperty("缁勭粐浜哄憳")
private String organization;
- @ExcelProperty("鐩戞帶鏂瑰紡")
- private String monitorWay;
}
--
Gitblit v1.9.3