From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml b/laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml
index f1af9c6..1a7b226 100644
--- a/laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml
+++ b/laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml
@@ -77,14 +77,22 @@
im.imName imName,
im.create_time imCreateTime,
im.measurement_unit imUnit,
- im.`code` imCode
+ im.`code` imCode,
+ im.id imId,
+ im.uncertainty uncertainty ,
+ im.performance_index performanceIndex ,
+ im.remarks remarks
FROM metering_plan m
LEFT JOIN `user` u ON m.create_Person = u.id
LEFT JOIN (
SELECT i.equipment_code,
i.equipment_name,
i.measuring_range,
+ im.id,
i.term_validity,
+ im.uncertainty,
+ im.performance_index,
+ im.remarks,
im.result,
im.end_date,
(SELECT NAME FROM USER WHERE id = im.user_id) imName,
@@ -114,7 +122,11 @@
(SELECT NAME FROM USER WHERE id = im.user_id) imName,
im.create_time imCreateTime,
im.measurement_unit imUnit,
- im.`code` imCode
+ im.`code` imCode,
+ im.id imId,
+ im.uncertainty uncertainty ,
+ im.performance_index performanceIndex ,
+ im.remarks remarks
FROM metrical_information im,
metering_plan m,
instrument i
@@ -144,6 +156,10 @@
<result property="measuringRange" column="measuringRange"/>
<result property="equipmentName" column="equipmentName"/>
<result property="equipmentCode" column="equipmentCode"/>
+ <result property="imId" column="imId"/>
+ <result property="performanceIndex" column="performanceIndex"/>
+ <result property="uncertainty" column="uncertainty"/>
+ <result property="remarks" column="remarks"/>
</resultMap>
<resultMap id="measureInsAndPlanMap" type="meteringPlanAndInfoAndIns">
@@ -166,6 +182,10 @@
<result property="measuringRange" column="measuringRange"/>
<result property="equipmentName" column="equipmentName"/>
<result property="equipmentCode" column="equipmentCode"/>
+ <result property="imId" column="imId"/>
+ <result property="performanceIndex" column="performanceIndex"/>
+ <result property="uncertainty" column="uncertainty"/>
+ <result property="remarks" column="remarks"/>
</collection>
</resultMap>
--
Gitblit v1.9.3