From f04c1a5a967679b9984926af72be8a3d3f26c2bb Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 25 七月 2023 15:44:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml b/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
index f66e7a0..d323a95 100644
--- a/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
+++ b/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
@@ -2,10 +2,18 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.InspectionProductListMapper">
<insert id="addInspectionProductList">
- INSERT INTO inspection_product_list (name, method, ask, unit, required, internal, create_time, update_time, inspection_id, user_id) VALUES
+ INSERT INTO inspection_product_list (name, method, ask, unit, required, internal, create_time,
+ update_time,inspection_material_list_id, user_id) VALUES
<foreach collection="list" separator="," item="i">
- (#{i.name}, #{i.method}, #{i.ask}, #{i.unit}, #{i.required}, #{i.internal}, #{i.createTime}, #{i.updateTime}, #{i.inspectionId},
+ (#{i.name}, #{i.method}, #{i.ask}, #{i.unit}, #{i.required}, #{i.internal}, #{i.createTime},
+ #{i.updateTime}, #{i.inspectionMaterialListId},
#{i.userId})
</foreach>
</insert>
+
+ <select id="selectByMaterId" resultType="com.yuanchu.limslaboratory.pojo.InspectionProductList">
+ select name,method,ask,unit,required,internal, start_time, end_time, user_id, instrument_id
+ from lims_laboratory.inspection_product_list
+ where inspection_material_list_id = #{id}
+ </select>
</mapper>
--
Gitblit v1.9.3