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/QualityMonitorDetailsEvaluate.java | 75 +++++++++++++++++++++++++++++++++++++
1 files changed, 75 insertions(+), 0 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/QualityMonitorDetailsEvaluate.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/QualityMonitorDetailsEvaluate.java
index 47a0666..622320e 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/QualityMonitorDetailsEvaluate.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/QualityMonitorDetailsEvaluate.java
@@ -6,6 +6,8 @@
import lombok.Data;
import java.time.LocalDateTime;
+import java.time.LocalDate;
+import java.util.List;
/**
* 璐ㄩ噺鐩戞帶璁″垝璇︽儏璇勪环琛�
@@ -18,12 +20,85 @@
@Schema(description = "璐ㄩ噺鐩戞帶璁″垝璇︽儏璇勪环琛�")
public class QualityMonitorDetailsEvaluate {
+ @Schema(description = "璐ㄩ噺鎺у埗璇勪环璁板綍ID")
@TableId(type = IdType.AUTO)
private Integer detailsEvaluateId;
@Schema(description = "鐩戞帶璁″垝璇︽儏id")
private Integer qualityMonitorDetailsId;
+ @Schema(description = "鍏宠仈鐨勮川鎺ф楠屼换鍔D")
+ private Integer insOrderId;
+ @Schema(description = "鐩戠潱鍛樼敤鎴稩D锛屼笌璇勪环浜哄垎寮�")
+ private Integer supervisorUserId;
+ @Schema(description = "琚洃鐫ｆ娴嬪憳鐢ㄦ埛ID")
+ private Integer inspectorUserId;
+ @Schema(description = "妫�娴嬫牱鍝佸悕绉�")
+ private String sampleName;
+ @Schema(description = "妫�娴嬫牱鍝佽鏍�")
+ private String sampleSpec;
+ @Schema(description = "鍘嗗彶鍗曚竴妫�娴嬫椂闂达紱鏂拌瘎浠烽〉闈粠鍘熷璁板綍璇诲彇鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime inspectionTime;
+ @Schema(description = "鍘嗗彶璁惧鍚嶇О锛涙柊璇勪环椤甸潰浠庡師濮嬭褰曡鍙栨墍鐢ㄨ澶�")
+ private String equipmentDescription;
+ @Schema(description = "鍘嗗彶璁惧瑙勬牸锛涙柊璇勪环椤甸潰浠庡師濮嬭褰曡鍙栨墍鐢ㄨ澶�")
+ private String equipmentSpec;
+ @Schema(description = "鍘嗗彶璁惧缂栧彿锛涙柊璇勪环椤甸潰浠庡師濮嬭褰曡鍙栨墍鐢ㄨ澶�")
+ private String equipmentCode;
+ @Schema(description = "妫�娴嬫儏鍐靛強璇勪环")
+ private String evaluationConclusion;
+ @Schema(description = "绾犳鎺柦鍙婇闃叉帾鏂�")
+ private String correctiveAction;
+ @Schema(description = "楠岃瘉鎯呭喌")
+ private String verificationResult;
+ @Schema(description = "绾犳鎺柦璐ｄ换浜虹敤鎴稩D")
+ private Integer correctiveResponsibleUserId;
+ @Schema(description = "绾犳鎺柦瀹屾垚鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate correctiveDueDate;
+ @Schema(description = "楠岃瘉璐ｄ换浜虹敤鎴稩D")
+ private Integer verificationResponsibleUserId;
+ @Schema(description = "楠岃瘉鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate verificationDate;
+
+ @Schema(description = "妫�娴嬫暟鎹笌鐩叉牱鍊煎鐓ц锛岄潪鏁版嵁搴撳瓧娈�")
+ @TableField(exist = false)
+ private List<QualityMonitorEvaluateResult> resultRows;
+
+ @Schema(description = "璇勪环浜哄凡鏍稿鍘熷璁板綍妫�娴嬫暟鎹紝鎻愪氦鏍￠獙浣跨敤")
+ @TableField(exist = false)
+ private Boolean measurementConfirmed;
+
+ @Schema(description = "褰撳墠鐧诲綍鐢ㄦ埛鑳藉惁缂栧啓璇勪环锛岄潪鏁版嵁搴撳瓧娈�")
+ @TableField(exist = false)
+ private Boolean evaluationEditable;
+
+ @Schema(description = "褰撳墠涓嶈兘缂栧啓璇勪环鐨勫師鍥狅紝闈炴暟鎹簱瀛楁")
+ @TableField(exist = false)
+ private String evaluationEditReason;
+
+ @Schema(description = "璐ㄦ帶妫�楠屼换鍔＄姸鎬侊紝闈炴暟鎹簱瀛楁")
+ @TableField(exist = false)
+ private Integer inspectionTaskState;
+
+ @Schema(description = "宸插鏍稿師濮嬭褰曚腑鐨勬娴嬫棩鏈熼泦鍚堬紝闈炴暟鎹簱瀛楁")
+ @TableField(exist = false)
+ private List<String> rawInspectionDates;
+
+ @Schema(description = "宸插鏍稿師濮嬭褰曚腑鐨勮澶囧悕绉帮紝闈炴暟鎹簱瀛楁")
+ @TableField(exist = false)
+ private String rawEquipmentDescription;
+
+ @Schema(description = "宸插鏍稿師濮嬭褰曚腑鐨勮澶囪鏍硷紝闈炴暟鎹簱瀛楁")
+ @TableField(exist = false)
+ private String rawEquipmentSpec;
+
+ @Schema(description = "宸插鏍稿師濮嬭褰曚腑鐨勮澶囩紪鍙凤紝闈炴暟鎹簱瀛楁")
+ @TableField(exist = false)
+ private String rawEquipmentCode;
+
@Schema(description = "璇勫鐩殑")
private String reviewPurpose;
--
Gitblit v1.9.3