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/pojo/QualityMonitor.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/QualityMonitor.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/QualityMonitor.java
index a56d3f8..3c16f7c 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/QualityMonitor.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/QualityMonitor.java
@@ -18,6 +18,7 @@
@Schema(description = "璐ㄩ噺鐩戞帶璁″垝涓昏〃")
public class QualityMonitor {
+ @Schema(description = "骞村害璐ㄩ噺鐩戞帶璁″垝ID")
@TableId(type = IdType.AUTO)
private Integer qualityMonitorId;
@@ -27,6 +28,12 @@
@Schema(description = "璁″垝骞翠唤")
private String monitorYear;
+ @Schema(description = "娴佺▼鐘舵�侊細DRAFT/PENDING_REVIEW/REVIEW_REJECTED/PENDING_APPROVAL/APPROVAL_REJECTED/APPROVED")
+ private String workflowStatus;
+
+ @Schema(description = "鍏煎鏃ф暟鎹殑鐗堟湰鏍囪锛屾柊娴佺▼涓嶅啀浣跨敤")
+ private Integer isCurrent;
+
@Schema(description = "澶栭敭锛氱敤鎴穒d锛堢紪鍒朵汉锛�")
private Integer writeUserId;
--
Gitblit v1.9.3