From d86a37f36ec375f8aa3d3eaee18ea1ad323eba0b Mon Sep 17 00:00:00 2001 From: Crunchy <3114200645@qq.com> Date: 星期五, 26 四月 2024 09:13:04 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- inspect-server/src/main/resources/mapper/InsProductMapper.xml | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/inspect-server/src/main/resources/mapper/InsProductMapper.xml b/inspect-server/src/main/resources/mapper/InsProductMapper.xml index 608bf85..8c59858 100644 --- a/inspect-server/src/main/resources/mapper/InsProductMapper.xml +++ b/inspect-server/src/main/resources/mapper/InsProductMapper.xml @@ -49,4 +49,14 @@ <select id="selectUserById" resultType="java.util.Map"> select name,company,phone,address from user where id = #{userId} </select> + <select id="getProductAndResult" resultType="com.yuanchu.mom.dto.ProductResultDto2"> + select ip.id,ip.inspection_item,ip.inspection_item_subclass,ip.laboratory,ip.unit,ipr.equip_value,io.entrust_code,ipr.update_time,ip.ins_result,u.name updateUserName + from ins_product ip + left join ins_product_result ipr on ip.id = ipr.ins_product_id + left join ins_sample isa on isa.id = ip.ins_sample_id + left join ins_order io on io.id = isa.ins_order_id + left join user u on u.id = ipr.update_user + where ip.ins_sample_id = #{sampleId} + and ip.ins_result is not null + </select> </mapper> -- Gitblit v1.9.3