From 0ed3d6d60ece4effae6072556165a0aad9fe8f9f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 15 八月 2025 13:21:43 +0800
Subject: [PATCH] 如果其他检验不检也可以生成报告结束试验跳过
---
cnas-server/src/main/resources/mapper/DeviceMapper.xml | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/DeviceMapper.xml b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
index 6d1de4a..4a8ddca 100644
--- a/cnas-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
@@ -102,12 +102,25 @@
SEPARATOR ';'
) AS insProductItem,
u.name ,
- l.laboratory_name
+ l.laboratory_name,
+ cmr.next_calibration_date nextCalibrationDateTwo,
+ CASE
+ WHEN cmr.next_calibration_date IS NULL THEN 0
+ WHEN cmr.next_calibration_date BETWEEN NOW() AND DATE_ADD(NOW(), INTERVAL 45 DAY) THEN 1
+ ELSE 0
+ END AS status
FROM
device d
LEFT JOIN `user` u ON u.id = d.equipment_manager
LEFT JOIN laboratory l ON l.id = d.subordinate_departments_id
- LEFT JOIN device_metric_record cmr ON d.id = cmr.device_id
+ LEFT JOIN (SELECT
+ device_id,
+ type,
+ MAX(next_calibration_date) AS next_calibration_date
+ FROM
+ device_metric_record
+ GROUP BY
+ device_id )cmr ON d.id = cmr.device_id
LEFT JOIN structure_item_parameter sip ON FIND_IN_SET(sip.id, d.ins_product_ids)
<where>
<if test="laboratoryNameIsNull != null and laboratoryNameIsNull == true">
@@ -117,7 +130,7 @@
</where>
GROUP BY
d.id,
- u.name, l.laboratory_name
+ u.name, l.laboratory_name,cmr.next_calibration_date,status
) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
--
Gitblit v1.9.3