From 9895be644e5f4d8b03170fcdfedb9fc57d90f2d8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 31 七月 2024 18:04:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspect-server/src/main/resources/mapper/InsOrderMapper.xml |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 8c0fbce..9aa7a27 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -133,7 +133,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 +193,7 @@
         c.price,
         c.cost,
         c.inspection_item,
-        cus.company,
+        i.company,
         u.`name`,
         i.create_user,
         c.ins_sample_id
@@ -406,7 +406,7 @@
         c.price,
         c.cost,
         c.inspection_item,
-        cus.company,
+        i.company,
         u.`name`,
         i.create_user,
         c.ins_sample_id,
@@ -421,7 +421,7 @@
         GROUP_CONCAT(b.inspection_item2
         SEPARATOR ',')
         inspection_item from (select * ,
-        GROUP_CONCAT(CONCAT(inspection_item,'',inspection_item_subclass) SEPARATOR ',')inspection_item2 from ins_product where state = 1 and template_id IS NOT NULL GROUP BY ins_sample_id,man_hour_group) b GROUP
+        GROUP_CONCAT(CONCAT(inspection_item,'@',inspection_item_subclass) SEPARATOR ',')inspection_item2 from ins_product where state = 1 and template_id IS NOT NULL GROUP BY ins_sample_id,man_hour_group) b GROUP
         BY b.ins_sample_id) c ON c.ins_sample_id = isa.id
         where (i.state = 1 or i.state = 3 or i.state = 4) and c.ins_sample_id IS not  NULL)A
         GROUP BY
@@ -456,4 +456,22 @@
         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