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中关联质控明细表返回任务来源和评价状态
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index ad6224c..60b24f3 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -205,6 +205,24 @@
io.appointed,
io.send_time,
io.order_type,
+ io.task_source,
+ io.quality_monitor_details_id,
+ cqmd.monitor_project,
+ cqmd.due_date,
+ cqmd.monitor_purpose,
+ cqmd.monitor_way,
+ cqmd.sample_spec,
+ cqmd.evaluator_user_id,
+ cqmd.technical_standard_text,
+ qmp.ratify_user_id plan_ratify_user_id,
+ CASE
+ WHEN cqmde.is_finish = 1 THEN 3
+ WHEN cqmde.ratify_user_id IS NOT NULL THEN 2
+ WHEN cqmde.details_evaluate_id IS NOT NULL THEN 1
+ WHEN io.ins_state = 5 THEN 1
+ ELSE 0
+ END evaluate_status,
+ qsm.code standard_code,
case when
io.type_source = 0
then io.sample_view
@@ -230,6 +248,10 @@
iiq.material_prop AS material_prop
FROM
ins_order io
+ LEFT JOIN cnas_quality_monitor_details cqmd ON cqmd.quality_monitor_details_id = io.quality_monitor_details_id
+ LEFT JOIN cnas_quality_monitor qmp ON qmp.quality_monitor_id = cqmd.quality_monitor_id
+ LEFT JOIN cnas_quality_monitor_details_evaluate cqmde ON cqmde.quality_monitor_details_id = cqmd.quality_monitor_details_id
+ LEFT JOIN standard_method qsm ON qsm.id = cqmd.standard_method_id
LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
LEFT JOIN ins_report ira ON ira.ins_order_id = io.id
LEFT JOIN ifs_inventory_quantity iiq ON iiq.id = io.ifs_inventory_id
@@ -310,6 +332,7 @@
SELECT
io.id,
io.entrust_code,
+ io.task_source,
io.type,
io.appointed,
io.send_time,
--
Gitblit v1.9.3