From ea7654c0cdb21ec7e8f854df6d0a7367b5e5d6ac Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 04 六月 2024 11:58:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/InsBushingMapper.xml | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsBushingMapper.xml b/inspect-server/src/main/resources/mapper/InsBushingMapper.xml
index 2d89835..a6f823a 100644
--- a/inspect-server/src/main/resources/mapper/InsBushingMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsBushingMapper.xml
@@ -17,18 +17,32 @@
<select id="selectFibersByBushingId" resultMap="FibersDto">
select
fs.id, fs.code, fs.model, fs.standard, fs.num, fs.ins_bushing_id,
- p.id pid, p.inspection_item, p.inspection_item_classify, p.inspection_item_subclass, p.factory, p.laboratory, p.sample_type, p.sample, p.model pmodel, p.son_laboratory, p.unit, p.price, p.man_hour, p.man_hour_group, p.inspection_item_type, p.inspection_value_type, p.device_group, p.checkout_number, p.section, p.value_type, p.method, p.man_day, p.bsm, p.ask, p.tell, p.`last_value`, p.ins_result, p.state, p.ins_sample_id, p.template_id, p.dic, p.method_s
+ p.id pid, p.inspection_item, p.inspection_item_classify, p.inspection_item_subclass, p.factory, p.laboratory, p.sample_type, p.sample, p.model pmodel, p.son_laboratory, p.unit, p.price, p.man_hour, p.man_hour_group, p.inspection_item_type, p.inspection_value_type, p.device_group, p.checkout_number, p.section, p.value_type, p.method, p.man_day, p.bsm, p.ask, p.tell, p.`last_value`, p.ins_result, p.state, p.ins_sample_id, p.template_id, p.dic, p.method_s,
+ ipr.ins_value,ipr.com_value,ipr.equip_value,ipr.equip_name
from ins_fibers fs
left join ins_product p on p.ins_fibers_id = fs.id
+ left join ins_product_result ipr on p.id = ipr.ins_product_id
where fs.ins_bushing_id = #{bushingId}
</select>
<select id="selectFiberByBushingId" resultMap="FiberDto">
select f.id, f.bush_color, f.color, f.model, f.standard, f.ins_bushing_id,
- p.id pid, p.inspection_item, p.inspection_item_classify, p.inspection_item_subclass, p.factory, p.laboratory, p.sample_type, p.sample, p.model pmodel, p.son_laboratory, p.unit, p.price, p.man_hour, p.man_hour_group, p.inspection_item_type, p.inspection_value_type, p.device_group, p.checkout_number, p.section, p.value_type, p.method, p.man_day, p.bsm, p.ask, p.tell, p.`last_value`, p.ins_result, p.state, p.ins_sample_id, p.template_id, p.dic, p.method_s
+ p.id pid, p.inspection_item, p.inspection_item_classify, p.inspection_item_subclass, p.factory, p.laboratory, p.sample_type, p.sample, p.model pmodel, p.son_laboratory, p.unit, p.price, p.man_hour, p.man_hour_group, p.inspection_item_type, p.inspection_value_type, p.device_group, p.checkout_number, p.section, p.value_type, p.method, p.man_day, p.bsm, p.ask, p.tell, p.`last_value`, p.ins_result, p.state, p.ins_sample_id, p.template_id, p.dic, p.method_s,
+ ipr.ins_value,ipr.com_value,ipr.equip_value,ipr.equip_name
from ins_fiber f
left join ins_product p on p.ins_fiber_id = f.id
+ left join ins_product_result ipr on p.id = ipr.ins_product_id
where f.ins_bushing_id = #{bushingId}
+ </select>
+
+ <select id="selectFiberByFibersId" resultMap="FiberDto">
+ select f.id, f.bush_color, f.color, f.model, f.standard, f.ins_bushing_id,
+ p.id pid, p.inspection_item, p.inspection_item_classify, p.inspection_item_subclass, p.factory, p.laboratory, p.sample_type, p.sample, p.model pmodel, p.son_laboratory, p.unit, p.price, p.man_hour, p.man_hour_group, p.inspection_item_type, p.inspection_value_type, p.device_group, p.checkout_number, p.section, p.value_type, p.method, p.man_day, p.bsm, p.ask, p.tell, p.`last_value`, p.ins_result, p.state, p.ins_sample_id, p.template_id, p.dic, p.method_s,
+ ipr.ins_value,ipr.com_value,ipr.equip_value,ipr.equip_name
+ from ins_fiber f
+ left join ins_product p on p.ins_fiber_id = f.id
+ left join ins_product_result ipr on p.id = ipr.ins_product_id
+ where f.ins_fibers_id = #{fibersId}
</select>
<resultMap id="FibersDto" type="com.yuanchu.mom.dto.FibersDto">
@@ -59,7 +73,6 @@
<result property="factory" column="factory" jdbcType="VARCHAR"/>
<result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
<result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
- <result property="sample" column="sample" jdbcType="VARCHAR"/>
<result property="model" column="pmodel" jdbcType="VARCHAR"/>
<result property="sonLaboratory" column="son_laboratory" jdbcType="VARCHAR"/>
<result property="unit" column="unit" jdbcType="VARCHAR"/>
@@ -80,11 +93,18 @@
<result property="insResult" column="ins_result" jdbcType="INTEGER"/>
<result property="state" column="state" jdbcType="INTEGER"/>
<result property="insSampleId" column="ins_sample_id" jdbcType="INTEGER"/>
- <result property="createUser" column="create_user" jdbcType="INTEGER"/>
- <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="templateId" column="template_id" jdbcType="INTEGER"/>
+ <result property="methodS" column="method_s"/>
+ <result property="tell" column="tell"/>
+ <result property="dic" column="dic"/>
+ <collection property="insProductResult" resultMap="insProductResult"/>
+ </resultMap>
+
+ <resultMap id="insProductResult" type="com.yuanchu.mom.pojo.InsProductResult">
+ <result property="insValue" column="ins_value" jdbcType="VARCHAR"/>
+ <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>
</mapper>
--
Gitblit v1.9.3