From 3bd27d6f6892e60658ca39763d9200743932ee36 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 03 四月 2024 17:03:53 +0800
Subject: [PATCH] 检验报告
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index b5effec..bede559 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -29,7 +29,7 @@
<select id="findInsSampleAndOrder" resultType="com.yuanchu.mom.vo.InsOrderPlanVO">
select * from(
SELECT
- *
+ a.*,ios.ins_state,ios.verify_tell
FROM
(
SELECT
@@ -41,7 +41,6 @@
io.sample_type,
isu.user_id,
ip.son_laboratory,
- io.ins_state,
io.ins_result
FROM
ins_order io
@@ -56,6 +55,7 @@
ip.son_laboratory,
io.id
) a
+ LEFT JOIN ins_order_state ios ON ios.ins_order_id = a.id AND ios.laboratory = a.son_laboratory
where a.user_id = #{userId} OR a.user_id is NULL
ORDER BY
a.user_id DESC,
@@ -107,6 +107,47 @@
where ins_order_id = #{id}
and state = 1
</select>
+ <select id="getInsOrderAndSample" resultMap="sampleDto">
+ select isa.*,
+ ip.id ip_id,
+ inspection_item,
+ inspection_item_classify,
+ inspection_item_subclass,
+ ip.factory ip_factory,
+ ip.laboratory ip_laboratory,
+ ip.sample_type ip_sample_type,
+ ip.sample ip_sample,
+ ip.model ip_model,
+ son_laboratory,
+ ip.unit ip_unit,
+ price,
+ man_hour,
+ man_hour_group,
+ inspection_item_type,
+ inspection_value_type,
+ device_group,
+ checkout_number,
+ section,
+ value_type,
+ method,
+ man_day,
+ bsm,
+ ask,
+ `last_value`,
+ ip.ins_result ip_ins_result,
+ state,
+ ins_sample_id,
+ ip.create_user ip_create_user,
+ ip.update_user ip_update_user,
+ ip.create_time ip_create_time,
+ ip.update_time ip_update_time,
+ template_id
+ from ins_sample isa
+ left join ins_product ip on isa.id = ip.ins_sample_id
+ where ins_order_id = #{id}
+ and state = 1
+ and ip.son_laboratory = #{laboratory}
+ </select>
<resultMap id="sampleDto" type="com.yuanchu.mom.dto.SampleProductDto">
<id property="id" column="id" jdbcType="INTEGER"/>
--
Gitblit v1.9.3