From 80ea05da0c43c2ae14e2d8cf8d284d96d9a8f1f5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 06 八月 2024 19:08:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 22 ++--------------------
1 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 3e9e312..5efe060 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -70,7 +70,7 @@
ir.url_s,
sample_counts.sample_num,
CONCAT(ROUND(approved_product_counts.approved_count / total_product_counts.total_count * 100, 2), '%') AS insProgress,
- GROUP_CONCAT(DISTINCT isa.sample_code SEPARATOR ' ') AS sample_code,
+ GROUP_CONCAT(DISTINCT isa.sample_code SEPARATOR '锛�') AS sample_code,
GROUP_CONCAT(DISTINCT isa.sample SEPARATOR ' ') AS sample_name,
GROUP_CONCAT(DISTINCT isa.model SEPARATOR ' ') AS sample_model,
u.name
@@ -153,7 +153,7 @@
select *
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,
+ i.id,isa.sample_code,isa.sample,isa.model,isa.ins_state,ip.id insProductId,ip.state,ip.unit,ip.inspection_item,ip.inspection_item_subclass,
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
@@ -476,23 +476,5 @@
select name
from department_lims
where id = #{depLimsId}
- </select>
-
- <select id="getDeviceMessage" resultType="java.util.Map">
- 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 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