From 30a143f368dd2ff6e9c27b9d5dd17923ffed03ae Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 01 八月 2024 18:59:12 +0800
Subject: [PATCH] 检验单增加外部委托编号+报告批量下载批量上传
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 6f450e0..681ec55 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -6,6 +6,7 @@
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsOrder">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="entrustCode" column="entrust_code" jdbcType="VARCHAR"/>
+ <result property="outEntrustCode" column="out_entrust_code" jdbcType="VARCHAR"/>
<result property="custom" column="custom" jdbcType="VARCHAR"/>
<result property="company" column="company" jdbcType="VARCHAR"/>
<result property="code" column="code" jdbcType="VARCHAR"/>
@@ -133,7 +134,7 @@
from (
select
i.id,isa.sample_code,isa.sample,isa.model,isa.ins_state,ip.state,ip.unit,ip.inspection_item,ip.inspection_item_subclass,
- ip.son_laboratory,ip.inspection_item_type,ip.inspection_value_type,ip.ask,ip.`last_value`,ip.ins_result,ipr.equip_value
+ ip.son_laboratory,ip.inspection_item_type,ip.inspection_value_type,ip.tell,ip.`last_value`,ip.ins_result,ipr.equip_value
from ins_sample isa
left join ins_order i on isa.ins_order_id = i.id
left join ins_product ip on isa.id = ip.ins_sample_id
@@ -193,7 +194,7 @@
c.price,
c.cost,
c.inspection_item,
- cus.company,
+ i.company,
u.`name`,
i.create_user,
c.ins_sample_id
@@ -406,7 +407,7 @@
c.price,
c.cost,
c.inspection_item,
- cus.company,
+ i.company,
u.`name`,
i.create_user,
c.ins_sample_id,
@@ -458,10 +459,20 @@
</select>
<select id="getDeviceMessage" resultType="java.util.Map">
- select d.*
- from device d, structure_item_parameter sip
+ select d.device_name, d.management_number, d.file_type, d.collect_url
+ FROM
+ device d,
+ device_data_config ddc
+ <if test="sample != '' and sample != null">
+ inner join structure_item_parameter sip on sip.sample like concat('%', #{sample}, '%') and sip.id = ddc.structure_item_parameter_id
+ </if>
where d.ip = #{ip}
- and sip.inspection_item = #{inspectionItem}
+ and ddc.inspection_item = #{inspectionItem}
+ <if test="inspectionItemSubclass != '' and inspectionItemSubclass != null">
+ and ddc.inspection_item_subclass = #{inspectionItemSubclass}
+ </if>
+ and d.device_status = 0
+ and d.ins_product_ids is not null
limit 1
</select>
</mapper>
--
Gitblit v1.9.3