From c6c30ead51b2ac1f7ffd4fb7e4b193c5d11d7bdf Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 27 七月 2023 16:02:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml | 48 +++++++++++++++++++++++++++---------------------
1 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml b/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
index ed388bb..1eed103 100644
--- a/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
+++ b/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
@@ -1,19 +1,12 @@
<?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.InspectionProductListMapper">
- <insert id="addInspectionProductList">
- 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.inspectionMaterialListId},
- #{i.userId})
- </foreach>
- </insert>
- <select id="selectByMaterId" resultType="com.yuanchu.limslaboratory.pojo.InspectionProductList">
- select id,
- name,
+ <select id="selectByMaterId" resultType="com.yuanchu.limslaboratory.pojo.vo.InspectionProductListVo">
+ select inspection_material_list_id,
+ inspect_start_time inspectStartTime,
+ inspect_end_time inspectEndTime,
+ ipl.name,
method,
ask,
unit,
@@ -21,14 +14,27 @@
internal,
start_time,
end_time,
- state,
- create_time,
- update_time,
- version,
- inspection_material_list_id,
- user_id,
- instrument_id
- from lims_laboratory.inspection_product_list
- where inspection_material_list_id = #{id}
+ uname userName,
+ equipment_name instrumentName
+ from (select inspection_material_list_id,
+ pl.name name,
+ user.name uname,
+ method,
+ ask,
+ unit,
+ required,
+ internal,
+ start_time,
+ end_time,
+ equipment_name
+ from lims_laboratory.inspection_product_list pl
+ left join lims_laboratory.user on pl.user_id = user.id
+ left join lims_laboratory.instrument on pl.instrument_id = instrument.id) ipl
+ , lims_laboratory.inspection_material_list iml
+ , lims_laboratory.inspection i
+ where iml.id = ipl.inspection_material_list_id
+ and iml.id = ipl.inspection_material_list_id
+ and i.id = iml.inspection_id
+ and ipl.inspection_material_list_id = #{id}
</select>
</mapper>
--
Gitblit v1.9.3