From 4eab53b44135f6381a7f2011ac17066412297f43 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 11 十月 2024 11:15:35 +0800
Subject: [PATCH] 电路试验的站点报告1.0
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 573 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 354 insertions(+), 219 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 87f66bb..f817aad 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -25,75 +25,10 @@
</resultMap>
<select id="findInsSampleAndOrder" resultType="com.yuanchu.mom.vo.InsOrderPlanVO">
- <!--SELECT *
- FROM (
- SELECT *
- FROM (
- SELECT
- io.id,
- io.entrust_code,
- io.type,
- io.appointed,
- io.send_time,
- GROUP_CONCAT(DISTINCT isa.sample SEPARATOR ' ') AS sample,
- isu.userName,
- isu2.checkName,
- ip.son_laboratory,
- io.ins_time,
- io.laboratory,
- ios.ins_state,
- ios.verify_tell,
- ios.verify_user
- FROM
- ins_order io
- LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
- LEFT JOIN (
- SELECT
- ins_sample_id,
- GROUP_CONCAT(DISTINCT uu.name SEPARATOR ',') AS userName
- FROM
- ins_sample_user u
- LEFT JOIN user uu ON u.user_id = uu.id
- WHERE
- son_laboratory = #{sonLaboratory} AND u.state = 0
- GROUP BY
- ins_sample_id
- ) isu ON isu.ins_sample_id = io.id
- LEFT JOIN (
- SELECT
- ins_sample_id,
- uu.name AS checkName
- FROM
- ins_sample_user u
- LEFT JOIN user uu ON u.user_id = uu.id
- WHERE
- son_laboratory = #{sonLaboratory} AND u.state = 1
- GROUP BY
- ins_sample_id
- ) isu2 ON isu2.ins_sample_id = io.id
- LEFT JOIN ins_product ip ON ip.ins_sample_id = isa.id
- LEFT JOIN ins_order_state ios ON ios.ins_order_id = io.id AND ios.laboratory = ip.son_laboratory
- WHERE
- io.state = 1
- AND io.send_time IS NOT NULL
- AND (ip.son_laboratory = #{sonLaboratory} OR isu.userName IS NULL OR isu2.checkName IS NULL)
- <if test="userName != null and userName != ''">
- AND (isu.userName LIKE CONCAT('%', #{userName}, '%') OR isu2.checkName LIKE CONCAT('%', #{userName}, '%'))
- </if>
- GROUP BY
- io.id, ip.son_laboratory
- ORDER BY
- io.type DESC, io.id
- ) a
- WHERE
- a.ins_state IS NOT NULL
- <if test="laboratory != null and laboratory != ''">
- AND a.laboratory = #{laboratory}
- </if>
- ) b-->
select * from(select * from(
SELECT
- a.*,ios.ins_state,ios.verify_tell,verify_user
+ a.*,ios.ins_state,ios.verify_tell,verify_user,ios.id
+ orderStateId,ios.create_time,ios.sort,sort_time,version,ios.num-1 num1
FROM
(
SELECT
@@ -119,7 +54,6 @@
GROUP BY ins_sample_id
ORDER BY ins_sample_id
) isu ON isu.ins_sample_id = io.id
-
LEFT JOIN (
SELECT ins_sample_id,uu.name checkName
FROM ins_sample_user u LEFT JOIN user uu ON u.user_id = uu.id
@@ -141,8 +75,10 @@
) a
LEFT JOIN ins_order_state ios ON ios.ins_order_id = a.id AND ios.laboratory = a.son_laboratory
ORDER BY
+ ios.sort,
+ sort_time desc,
a.type DESC,
- a.id
+ ios.create_time
) b
where ins_state is not null
and son_laboratory=#{sonLaboratory}
@@ -191,7 +127,7 @@
LEFT JOIN user ON isu.user_id = user.id
WHERE
io.state = 1
- # AND io.ins_state != 5
+ -- # AND io.ins_state != 5
and send_time is not null
<if test="userId !=null and userId!=''">
and (isu.user_id = #{userId} OR isu.user_id is NULL )
@@ -212,7 +148,7 @@
isu2.ins_sample_id = a.id
where ins_state is not null
<if test="laboratory != null and laboratory != ''">
- and laboratory=#{laboratory}
+ and a.laboratory=#{laboratory}
</if>
ORDER BY
<!--a.user_id DESC,-->
@@ -263,42 +199,44 @@
ip.create_time ip_create_time,
ip.update_time ip_update_time,
template_id,
- ipr.ins_value,
- ipr.com_value,
- ipr.equip_value,
ip.method_s
from ins_sample isa
left join ins_product ip on isa.id = ip.ins_sample_id
- left join ins_product_result ipr on ip.id = ipr.ins_product_id
- where ins_order_id = #{id}
+ where isa.ins_order_id = #{id}
and state = 1
- and ins_fiber_id is null
- and ins_fibers_id is null
- and <!--isa.sample_code NOT REGEXP '/'-->
- isa.id in(select id1 from (select is2.id id1 ,ip.id from ins_sample is2 left join ins_product ip on is2.id = ip.ins_sample_id where ip.id is not null)s )
- order by case when man_hour_group is NULL then 1
- when man_hour_group ='' then 1 else 0 end,
- CASE
- WHEN man_hour_group REGEXP '^[0-9]' THEN CAST(man_hour_group AS UNSIGNED) -- 濡傛灉浠ユ暟瀛楀紑澶达紝鍒欐寜鐓ф暟瀛楀ぇ灏忔帓搴�
- WHEN man_hour_group REGEXP '[0-9]+' THEN CAST(SUBSTRING(man_hour_group, 2)AS UNSIGNED) END -- 鎻愬彇瀛楁瘝鍚庨潰鐨勬暟瀛楅儴鍒�
- ,id asc
+ and isa.id in (select id1
+ from (select is2.id id1, ip.id
+ from ins_sample is2
+ left join ins_product ip on is2.id =
+ ip.ins_sample_id
+ where ip.id is not null) s)
+ order by case
+ when man_hour_group is NULL then 1
+ when man_hour_group = '' then 1
+ else 0 end,
+ CASE
+ WHEN man_hour_group REGEXP '^[0-9]' THEN CAST(man_hour_group AS UNSIGNED) -- 濡傛灉浠ユ暟瀛楀紑澶达紝鍒欐寜鐓ф暟瀛楀ぇ灏忔帓搴�
+ WHEN man_hour_group REGEXP '[0-9]+'
+ THEN CAST(SUBSTRING(man_hour_group, 2) AS UNSIGNED) END -- 鎻愬彇瀛楁瘝鍚庨潰鐨勬暟瀛楅儴鍒�
+ , id asc
</select>
<select id="getInsOrderAndSample" resultMap="sampleDto">
select isa.*,
- ip.id ip_id,
+ ios.num num1,
+ ip.id ip_id,
inspection_item,
inspection_item_en,
inspection_item_class,
inspection_item_class_en,
inspection_item_subclass,
inspection_item_subclass_en,
- ip.factory ip_factory,
- ip.laboratory ip_laboratory,
- ip.sample_type ip_sample_type,
- ip.sample ip_sample,
- ip.model ip_model,
+ 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,
+ ip.unit ip_unit,
price,
man_hour,
man_hour_group,
@@ -313,29 +251,108 @@
bsm,
ask,
`last_value`,
- ip.ins_result ip_ins_result,
+ 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,
+ 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,
ipr.ins_value,
ipr.com_value,
ipr.equip_value,
ipr.equip_name,
+ ipr2.frequency,
+ ipr2.often,
+ ipr2.port,
+ ipr2.angle,
+ ipr2.value,
+ ipr2.result,
+ ipr2.equip_value equipValue2,
+ ipr2.equip_name equipName2,
ip.method_s,
ip.tell,
ip.dic,
ip.temperature,
ip.humidity
from ins_sample isa
+ left join ins_order_state ios on isa.ins_order_id = ios.ins_order_id
left join ins_product ip on isa.id = ip.ins_sample_id
left join ins_product_result ipr on ip.id = ipr.ins_product_id
- where ins_order_id = #{id}
+ left join ins_product_result_2 ipr2 on ip.id = ipr2.ins_product_id
+ where isa.ins_order_id = #{id}
and state = 1
and ip.son_laboratory = #{laboratory}
+ and ios.laboratory = #{laboratory}
+ and (ipr2.num = ios.num or ipr2.num is null)
+ and (ipr.num = ios.num or ipr.num is null)
+ </select>
+ <select id="getInsOrderAndSample2" resultMap="sampleDto">
+ select isa.*,
+ ios.num num1,
+ ip.id ip_id,
+ inspection_item,
+ inspection_item_en,
+ inspection_item_class,
+ inspection_item_class_en,
+ inspection_item_subclass,
+ inspection_item_subclass_en,
+ 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,
+ ipr.ins_value,
+ ipr.com_value,
+ ipr.equip_value,
+ ipr.equip_name,
+ ipr2.frequency,
+ ipr2.often,
+ ipr2.port,
+ ipr2.angle,
+ ipr2.value,
+ ipr2.result,
+ ipr2.equip_value equipValue2,
+ ipr2.equip_name equipName2,
+ ip.method_s,
+ ip.tell,
+ ip.dic,
+ ip.temperature,
+ ip.humidity
+ from ins_sample isa
+ left join ins_order_state ios on isa.ins_order_id = ios.ins_order_id
+ left join ins_product ip on isa.id = ip.ins_sample_id
+ left join ins_product_result ipr on ip.id = ipr.ins_product_id
+ left join ins_product_result_2 ipr2 on ip.id = ipr2.ins_product_id
+ where isa.ins_order_id = #{id}
+ and state = 1
+ and ip.son_laboratory = #{laboratory}
+ and ios.laboratory = #{laboratory}
</select>
<select id="getSampleEn" resultType="java.lang.String">
select name_en
@@ -345,20 +362,21 @@
</select>
<select id="selectSampleProductListByOrderId2" resultMap="sampleDto">
select isa.*,
- ip.id ip_id,
+ ios.num num1,
+ ip.id ip_id,
inspection_item,
inspection_item_en,
inspection_item_subclass,
inspection_item_subclass_en,
inspection_item_class,
inspection_item_class_en,
- ip.factory ip_factory,
- ip.laboratory ip_laboratory,
- ip.sample_type ip_sample_type,
- ip.sample ip_sample,
- ip.model ip_model,
+ 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,
+ ip.unit ip_unit,
price,
man_hour,
man_hour_group,
@@ -374,35 +392,120 @@
ask,
tell,
`last_value`,
- ip.ins_result ip_ins_result,
+ 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,
+ 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,
ipr.ins_value,
ipr.com_value,
ipr.equip_value,
+ ipr2.frequency,
+ ipr2.often,
+ ipr2.port,
+ ipr2.angle,
+ ipr2.value,
+ ipr2.result,
+ ipr2.equip_value equipValue2,
+ ipr2.equip_name equipName2,
ip.method_s
from ins_sample isa
+ left join ins_order_state ios on isa.ins_order_id = ios.ins_order_id
left join ins_product ip on isa.id = ip.ins_sample_id
left join ins_product_result ipr on ip.id = ipr.ins_product_id
- where ins_order_id = #{id}
+ left join ins_product_result_2 ipr2 on ip.id = ipr2.ins_product_id
+ where isa.ins_order_id = #{id}
and ip.standard_method_list_id is not null
and state = 1
- order by case when man_hour_group is NULL then 1
- when man_hour_group ='' then 1 else 0 end,
+ and (ipr2.num = ios.num or ipr2.num is null)
+ and (ipr.num = ios.num or ipr.num is null)
+ order by case
+ when man_hour_group is NULL then 1
+ when man_hour_group = '' then 1
+ else 0 end,
CASE
WHEN man_hour_group REGEXP '^[0-9]' THEN CAST(man_hour_group AS UNSIGNED) -- 濡傛灉浠ユ暟瀛楀紑澶达紝鍒欐寜鐓ф暟瀛楀ぇ灏忔帓搴�
- WHEN man_hour_group REGEXP '[0-9]+' THEN CAST(SUBSTRING(man_hour_group, 2)AS UNSIGNED) END -- 鎻愬彇瀛楁瘝鍚庨潰鐨勬暟瀛楅儴鍒�
- ,id asc
+ WHEN man_hour_group REGEXP '[0-9]+'
+ THEN CAST(SUBSTRING(man_hour_group, 2) AS UNSIGNED) END -- 鎻愬彇瀛楁瘝鍚庨潰鐨勬暟瀛楅儴鍒�
+ , id asc
</select>
-
+ <select id="selectSampleProductListByOrder2Id2" resultMap="sampleDto">
+ select isa.*,
+ ios.num num1,
+ ip.id ip_id,
+ inspection_item,
+ inspection_item_en,
+ inspection_item_subclass,
+ inspection_item_subclass_en,
+ inspection_item_class,
+ inspection_item_class_en,
+ 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,
+ tell,
+ `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,
+ ipr.ins_value,
+ ipr.com_value,
+ ipr.equip_value,
+ ipr2.frequency,
+ ipr2.often,
+ ipr2.port,
+ ipr2.angle,
+ ipr2.value,
+ ipr2.result,
+ ipr2.equip_value equipValue2,
+ ipr2.equip_name equipName2,
+ ip.method_s
+ from ins_sample isa
+ left join ins_order_state ios on isa.ins_order_id = ios.ins_order_id
+ left join ins_product ip on isa.id = ip.ins_sample_id
+ left join ins_product_result ipr on ip.id = ipr.ins_product_id
+ left join ins_product_result_2 ipr2 on ip.id = ipr2.ins_product_id
+ where isa.ins_order_id = #{id}
+ and ip.standard_method_list_id is not null
+ and state = 1
+ order by case
+ when man_hour_group is NULL then 1
+ when man_hour_group = '' then 1
+ else 0 end,
+ CASE
+ WHEN man_hour_group REGEXP '^[0-9]' THEN CAST(man_hour_group AS UNSIGNED) -- 濡傛灉浠ユ暟瀛楀紑澶达紝鍒欐寜鐓ф暟瀛楀ぇ灏忔帓搴�
+ WHEN man_hour_group REGEXP '[0-9]+'
+ THEN CAST(SUBSTRING(man_hour_group, 2) AS UNSIGNED) END -- 鎻愬彇瀛楁瘝鍚庨潰鐨勬暟瀛楅儴鍒�
+ , id asc
+ </select>
<select id="selectSampleProductListByOrderId3" resultMap="sampleDto3">
select isa.id,
sample_code,
+ motor_number,
isa.sample,
entrust_code,
is_leave,
@@ -418,7 +521,6 @@
ins_sample_id
from ins_sample isa
left join ins_product ip on isa.id = ip.ins_sample_id
- left join ins_product_result ipr on ip.id = ipr.ins_product_id
left join ins_order io on io.id = ins_order_id
where ip.state = 1
and ins_order_id in
@@ -426,7 +528,7 @@
#{id}
</foreach>
order by case when man_hour_group is NULL then 1
- when man_hour_group ='' then 1 else 0 end,
+ when man_hour_group ='' then 1 else 0 end,
CASE
WHEN man_hour_group REGEXP '^[0-9]' THEN CAST(man_hour_group AS UNSIGNED) -- 濡傛灉浠ユ暟瀛楀紑澶达紝鍒欐寜鐓ф暟瀛楀ぇ灏忔帓搴�
WHEN man_hour_group REGEXP '[0-9]+' THEN CAST(SUBSTRING(man_hour_group, 2)AS UNSIGNED) END -- 鎻愬彇瀛楁瘝鍚庨潰鐨勬暟瀛楅儴鍒�
@@ -434,20 +536,20 @@
</select>
<select id="getInsProduct1" resultMap="product">
- select ip.id ip_id,
+ select ip.id ip_id,
inspection_item,
inspection_item_en,
inspection_item_class,
inspection_item_class_en,
inspection_item_subclass,
inspection_item_subclass_en,
- ip.factory ip_factory,
- ip.laboratory ip_laboratory,
- ip.sample_type ip_sample_type,
- ip.sample ip_sample,
- ip.model ip_model,
+ 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,
+ ip.unit ip_unit,
price,
man_hour,
man_hour_group,
@@ -462,45 +564,58 @@
bsm,
ask,
`last_value`,
- ip.ins_result ip_ins_result,
+ 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,
+ 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,
ipr.ins_value,
ipr.com_value,
ipr.equip_value,
ipr.equip_name,
+ ipr2.frequency,
+ ipr2.often,
+ ipr2.port,
+ ipr2.angle,
+ ipr2.value,
+ ipr2.result,
+ ipr2.equip_value equipValue2,
+ ipr2.equip_name equipName2,
ip.method_s,
ip.tell,
ip.dic
from ins_product ip
+ left join ins_sample isa on ip.ins_sample_id = isa.id
+ left join ins_order_state ios on ios.ins_order_id = isa.ins_order_id
left join ins_product_result ipr on ip.id = ipr.ins_product_id
+ left join ins_product_result_2 ipr2 on ip.id = ipr2.ins_product_id
where ins_sample_id = #{id}
and state = 1
and ip.son_laboratory = #{laboratory}
- and ins_fiber_id is null
- and ins_fibers_id is null
- and standard_method_list_id is not null
+ and ip.standard_method_list_id is not null
+ and ios.laboratory = #{laboratory}
+ and (ipr2.num = ios.num or ipr2.num is null)
+ and (ipr.num = ios.num or ipr.num is null)
+ order by ipr.id, ipr2.id
</select>
- <select id="getInsProduct2" resultMap="product">
- select ip.id ip_id,
+ <select id="getIns2Product1" resultMap="product">
+ select ip.id ip_id,
inspection_item,
inspection_item_en,
inspection_item_class,
inspection_item_class_en,
inspection_item_subclass,
inspection_item_subclass_en,
- ip.factory ip_factory,
- ip.laboratory ip_laboratory,
- ip.sample_type ip_sample_type,
- ip.sample ip_sample,
- ip.model ip_model,
+ 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,
+ ip.unit ip_unit,
price,
man_hour,
man_hour_group,
@@ -515,43 +630,56 @@
bsm,
ask,
`last_value`,
- ip.ins_result ip_ins_result,
+ 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,
+ 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,
ipr.ins_value,
ipr.com_value,
ipr.equip_value,
ipr.equip_name,
+ ipr2.frequency,
+ ipr2.often,
+ ipr2.port,
+ ipr2.angle,
+ ipr2.value,
+ ipr2.result,
+ ipr2.equip_value equipValue2,
+ ipr2.equip_name equipName2,
ip.method_s,
ip.tell,
ip.dic
from ins_product ip
+ left join ins_sample isa on ip.ins_sample_id = isa.id
+ left join ins_order_state ios on ios.ins_order_id = isa.ins_order_id
left join ins_product_result ipr on ip.id = ipr.ins_product_id
- where ins_fibers_id = #{id}
+ left join ins_product_result_2 ipr2 on ip.id = ipr2.ins_product_id
+ where ins_sample_id = #{id}
and state = 1
- and ins_fiber_id is null
- and standard_method_list_id is not null
+ and ip.son_laboratory = #{laboratory}
+ and ip.standard_method_list_id is not null
+ and ios.laboratory = #{laboratory}
+ order by ipr.id, ipr2.id
</select>
- <select id="getInsProduct3" resultMap="product">
- select ip.id ip_id,
+ <select id="get2InsProduct1" resultMap="product">
+ select ip.id ip_id,
inspection_item,
inspection_item_en,
inspection_item_class,
inspection_item_class_en,
inspection_item_subclass,
inspection_item_subclass_en,
- ip.factory ip_factory,
- ip.laboratory ip_laboratory,
- ip.sample_type ip_sample_type,
- ip.sample ip_sample,
- ip.model ip_model,
+ 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,
+ ip.unit ip_unit,
price,
man_hour,
man_hour_group,
@@ -566,81 +694,43 @@
bsm,
ask,
`last_value`,
- ip.ins_result ip_ins_result,
+ 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,
+ 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,
ipr.ins_value,
ipr.com_value,
ipr.equip_value,
ipr.equip_name,
+ ipr2.frequency,
+ ipr2.often,
+ ipr2.port,
+ ipr2.angle,
+ ipr2.value,
+ ipr2.result,
+ ipr2.equip_value equipValue2,
+ ipr2.equip_name equipName2,
ip.method_s,
ip.tell,
ip.dic
from ins_product ip
+ left join ins_sample isa on ip.ins_sample_id = isa.id
+ left join ins_order_state ios on ios.ins_order_id = isa.ins_order_id
left join ins_product_result ipr on ip.id = ipr.ins_product_id
- where ins_fiber_id = #{id}
+ left join ins_product_result_2 ipr2 on ip.id = ipr2.ins_product_id
+ where ins_sample_id = #{id}
and state = 1
- and ins_fibers_id is null
- and standard_method_list_id is not null
+ and ip.son_laboratory = #{laboratory}
+ and ip.standard_method_list_id is not null
+ and ios.laboratory = #{laboratory}
+ and (ipr2.num = #{num} or ipr.num = #{num})
+ order by ipr.id, ipr2.id
</select>
- <select id="getInsProduct4" resultMap="product">
- select ip.id ip_id,
- inspection_item,
- inspection_item_en,
- inspection_item_class,
- inspection_item_class_en,
- inspection_item_subclass,
- inspection_item_subclass_en,
- ip.factory ip_factory,
- ip.laboratory ip_laboratory,
- ip.sample_type ip_sample_type,
- ip.sample ip_sample,
- ip.model ip_model,
- ip.ins_bush_id,
- 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,
- ipr.ins_value,
- ipr.com_value,
- ipr.equip_value,
- ipr.equip_name,
- ip.method_s,
- ip.tell,
- ip.dic
- from ins_product ip
- left join ins_product_result ipr on ip.id = ipr.ins_product_id
- where ins_bush_id = #{id}
- and state = 1
- and ins_fibers_id is null
- and standard_method_list_id is not null
- </select>
<select id="getReportModel" resultType="java.util.Map">
</select>
@@ -651,6 +741,8 @@
<result property="joinModel" column="join_model" jdbcType="VARCHAR"/>
<result property="joinName" column="join_name" jdbcType="VARCHAR"/>
<result property="sampleCode" column="sample_code" jdbcType="VARCHAR"/>
+ <result property="motorNumber" column="motor_number" jdbcType="VARCHAR"/>
+ <result property="testRequirements" column="test_requirements" jdbcType="VARCHAR"/>
<result property="factory" column="factory" jdbcType="VARCHAR"/>
<result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
<result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
@@ -665,6 +757,7 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="standardMethodListId" column="standard_method_list_id"/>
<result property="unit" column="unit"/>
+ <result property="num1" column="num1"/>
<collection property="insProduct" resultMap="product"/>
</resultMap>
@@ -700,7 +793,6 @@
<result property="lastValue" column="last_value" jdbcType="VARCHAR"/>
<result property="insResult" column="ip_ins_result" jdbcType="INTEGER"/>
<result property="state" column="state" jdbcType="INTEGER"/>
- <result property="insBushId" column="ins_bush_id" jdbcType="INTEGER"/>
<result property="insSampleId" column="ins_sample_id" jdbcType="INTEGER"/>
<result property="createUser" column="ip_create_user" jdbcType="INTEGER"/>
<result property="updateUser" column="ip_update_user" jdbcType="INTEGER"/>
@@ -713,6 +805,7 @@
<result property="temperature" column="temperature"/>
<result property="humidity" column="humidity"/>
<collection property="insProductResult" resultMap="insProductResult"/>
+ <collection property="insProductResult2" resultMap="insProductResult2"/>
</resultMap>
<resultMap id="sampleDto3" type="com.yuanchu.mom.dto.SampleProductDto3">
@@ -725,6 +818,7 @@
<result property="code" column="entrust_code" jdbcType="VARCHAR"/>
<result property="isLeave" column="is_leave" jdbcType="VARCHAR"/>
<result property="sampleCode" column="sample_code" jdbcType="VARCHAR"/>
+ <result property="motorNumber" column="motor_number" jdbcType="VARCHAR"/>
<result property="factory" column="factory" jdbcType="VARCHAR"/>
<result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
<result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
@@ -747,6 +841,16 @@
<result property="comValue" column="com_value" jdbcType="VARCHAR"/>
<result property="equipValue" column="equip_value" jdbcType="VARCHAR"/>
<result property="equipName" column="equip_name" jdbcType="VARBINARY"/>
+ </resultMap>
+ <resultMap id="insProductResult2" type="com.yuanchu.mom.pojo.InsProductResult2">
+ <result column="frequency" property="frequency" jdbcType="VARCHAR"/>
+ <result column="often" property="often" jdbcType="VARCHAR"/>
+ <result column="port" property="port" jdbcType="VARCHAR"/>
+ <result column="angle" property="angle" jdbcType="VARCHAR"/>
+ <result column="value" property="value" jdbcType="VARCHAR"/>
+ <result column="result" property="result" jdbcType="INTEGER"/>
+ <result property="equipValue" column="equipValue2" jdbcType="VARCHAR"/>
+ <result property="equipName" column="equipName2" jdbcType="VARBINARY"/>
</resultMap>
<resultMap id="sampleVo" type="com.yuanchu.mom.vo.SampleVo">
@@ -786,4 +890,35 @@
from standard_method
where id = (select standard_method_list_id from ins_sample where id = #{sampleId})
</select>
+ <select id="selectSampleList" resultType="java.util.Map">
+ select DISTINCT sample_code
+ from ins_sample
+ left join ins_product ip on ins_sample.id = ip.ins_sample_id
+ where ins_order_id = #{orderId}
+ and ip.id is not null
+ </select>
+ <select id="selectSampleListByOrderId" resultType="com.yuanchu.mom.pojo.InsSample">
+ select DISTINCT ins_sample.*
+ from ins_sample
+ left join ins_product ip on ins_sample.id = ip.ins_sample_id
+ where ins_order_id = #{orderId}
+ and ip.id is not null
+ </select>
+ <select id="selectInsSample" resultType="com.yuanchu.mom.pojo.InsSample">
+ select isa.*,entrust_code
+ from ins_sample isa
+ left join ins_order io on isa.ins_order_id = io.id
+ where ins_order_id in
+ <foreach collection="ids" open="(" close=")" item="id" separator=",">
+ #{id}
+ </foreach>
+ </select>
+ <select id="selectSample" resultType="com.yuanchu.mom.pojo.InsSample">
+ select distinct isa.*
+ from ins_sample isa
+ left join ins_product ip on isa.id = ip.ins_sample_id
+ where son_laboratory = '鐢佃矾璇曢獙'
+ and state=1
+ and ins_order_id=#{insOrderId}
+ </select>
</mapper>
--
Gitblit v1.9.3