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/MetricalInformationMapper.xml | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/laboratory-server/src/main/resources/mapper/MetricalInformationMapper.xml b/laboratory-server/src/main/resources/mapper/MetricalInformationMapper.xml
index 21de131..58d321a 100644
--- a/laboratory-server/src/main/resources/mapper/MetricalInformationMapper.xml
+++ b/laboratory-server/src/main/resources/mapper/MetricalInformationMapper.xml
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.MetricalInformationMapper">
+ <insert id="insertBatchInformation">
+ insert metrical_information (id,code,user_id,plan,instrument_id,measurement_unit,end_date,result,create_time,update_time)
+ values
+ <foreach collection="informationList" item="info" separator=",">
+ (null,#{info.code},#{info.userId},#{info.plan},#{info.instrumentId},#{info.measurementUnit},#{info.endDate},#{info.result},#{info.createTime},#{info.updateTime})
+ </foreach>
+ </insert>
<select id="getListEquipmentPointInformation" resultType="map">
SELECT m.`id`, u.`name`, m.`measurement_unit`, DATE_FORMAT(m.`begin_date`, '%Y-%m-%d') beginDate, DATE_FORMAT(m.`end_date`, '%Y-%m-%d') endDate,
@@ -8,6 +15,7 @@
FROM metrical_information m, `user` u
WHERE m.`user_id` = u.`id`
AND m.`state` = 1
+ and result is not Null
AND m.`instrument_id` = #{InstrumentId}
</select>
</mapper>
--
Gitblit v1.9.3