From 83488c1cbce53028c9602d2fc96005528d11fb4c Mon Sep 17 00:00:00 2001 From: XiaoRuby <3114200645@qq.com> Date: 星期二, 08 八月 2023 14:08:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml b/laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml index 8011603..ca6ab6b 100644 --- a/laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml +++ b/laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml @@ -2,4 +2,10 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.yuanchu.limslaboratory.mapper.MeteringPlanMapper"> + <select id="pagingQueryOfMeasurementLedger" resultType="map"> + SELECT i.`equipment_code`, i.`equipment_name`, i.`specifications_models`, m.`create_time`, m.`uncertainty`, + m.`end_date`, i.`term_validity`, i.`storage_place`, i.`conditions` + FROM instrument i, metrical_information m + WHERE i.`id` = m.`instrument_id` + </select> </mapper> -- Gitblit v1.9.3