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/QualityMonitorDetails.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/QualityMonitorDetails.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/QualityMonitorDetails.java
index 667aabe..4fd0053 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/QualityMonitorDetails.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/QualityMonitorDetails.java
@@ -6,6 +6,7 @@
import lombok.Data;
import java.time.LocalDateTime;
+import java.time.LocalDate;
/**
* 璐ㄩ噺鐩戞帶璁″垝璇︽儏琛�
@@ -18,11 +19,24 @@
@Schema(description = "璐ㄩ噺鐩戞帶璁″垝璇︽儏琛�")
public class QualityMonitorDetails {
+ @Schema(description = "璐ㄩ噺鐩戞帶璁″垝鏄庣粏ID")
@TableId(type = IdType.AUTO)
private Integer qualityMonitorDetailsId;
@Schema(description = "鐩戞帶璁″垝id")
private Integer qualityMonitorId;
+
+ @Schema(description = "璁″垝鍐呮帓搴忓彿")
+ private Integer sortNo;
+
+ @Schema(description = "骞村害璁″垝琛ㄤ腑鐨勬妧鏈爣鍑嗘枃鏈�")
+ private String technicalStandardText;
+
+ @Schema(description = "瀹屾垚鏈堜唤锛屾牸寮弝yyy-MM")
+ private String completionMonth;
+
+ @Schema(description = "璐熻矗浜虹敤鎴稩D")
+ private Integer responsibleUserId;
@Schema(description = "鐩戞帶鐩殑")
private String monitorPurpose;
@@ -44,6 +58,32 @@
@Schema(description = "鐩戞帶鏂瑰紡")
private String monitorWay;
+
+ @Schema(description = "浜嬮」绫诲埆锛欼NSPECTION妫�娴嬬被锛孫THER闈炴娴嬬被")
+ private String itemKind;
+
+ @Schema(description = "妫�娴嬫爣鍑咺D")
+ private Integer standardMethodId;
+
+ @Schema(description = "鍏煎鏃ф暟鎹殑棣栦釜鍘熷璁板綍妯℃澘ID")
+ private Integer templateId;
+
+ @Schema(description = "鍘熷璁板綍妯℃澘ID闆嗗悎锛屽涓狪D浣跨敤鑻辨枃閫楀彿鍒嗛殧")
+ private String templateIds;
+
+ @Schema(description = "妫�娴嬪憳鐢ㄦ埛ID")
+ private Integer inspectorUserId;
+ @Schema(description = "鍘嗗彶璁″垝澶嶆牳浜虹敤鎴稩D锛屾柊娴佺▼涓嶄娇鐢�")
+ private Integer reviewerUserId;
+ @Schema(description = "璇勪环浜虹敤鎴稩D")
+ private Integer evaluatorUserId;
+ @Schema(description = "妫�娴嬫牱鍝佸悕绉�")
+ private String sampleName;
+ @Schema(description = "妫�娴嬫牱鍝佽鏍�")
+ private String sampleSpec;
+ @Schema(description = "璐ㄦ帶妫�楠屼换鍔℃埅姝㈡棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate dueDate;
@Schema(description = "瀹屾垚鎶ュ憡鍦板潃")
private String finishReportUrl;
@@ -85,6 +125,7 @@
private LocalDateTime updateTime;
// 瀵煎嚭浣跨敤
+ @Schema(description = "瀵煎嚭琛屽簭鍙凤紝闈炴暟鎹簱瀛楁")
@TableField(select = false, exist = false)
private Integer index;
--
Gitblit v1.9.3