From e05875fa75605595b192fca04e598598cb2f2931 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 13 九月 2024 17:45:07 +0800
Subject: [PATCH] 代码优化+检验下单新增字段下发至对象
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 138 +++++++--------------------------------------
1 files changed, 22 insertions(+), 116 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 3a94afe..780e279 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -27,7 +27,8 @@
<select id="findInsSampleAndOrder" resultType="com.yuanchu.mom.vo.InsOrderPlanVO">
select * from(select * from(
SELECT
- a.*,ios.ins_state,ios.verify_tell,verify_user,ios.id orderStateId,ios.create_time,ios.sort,sort_time,version,ios.num num1
+ 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
@@ -161,21 +162,20 @@
<select id="selectSampleProductListByOrderId" resultMap="sampleDto">
select isa.*,
- ios.num num1,
- ip.id ip_id,
+ 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,
@@ -191,112 +191,19 @@
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
- left join ins_product_result_2 ipr2 on ip.id = ipr2.ins_product_id
where isa.ins_order_id = #{id}
and state = 1
- and ios.laboratory = #{laboratory}
- and (ipr2.num = ios.num or ipr2.num is null)
- and (ipr.num = ios.num or ipr.num is null)
- 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="selectSampleProductListByOrder2Id" 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,
- 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 state = 1
- and ios.laboratory = #{laboratory}
and isa.id in (select id1
from (select is2.id id1, ip.id
from ins_sample is2
@@ -687,8 +594,6 @@
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 ip.standard_method_list_id is not null
and ios.laboratory = #{laboratory}
and (ipr2.num = ios.num or ipr2.num is null)
@@ -755,8 +660,6 @@
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 ip.standard_method_list_id is not null
and ios.laboratory = #{laboratory}
order by ipr.id, ipr2.id
@@ -821,12 +724,9 @@
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 ip.standard_method_list_id is not null
and ios.laboratory = #{laboratory}
- and ipr2.num = #{num}
- and ipr.num = #{num}
+ and (ipr2.num = #{num} or ipr.num = #{num})
order by ipr.id, ipr2.id
</select>
@@ -891,7 +791,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"/>
@@ -995,4 +894,11 @@
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>
</mapper>
--
Gitblit v1.9.3