From ff4d45d57c3d1a1c8d4218dd83023cb7e4c34d7e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 26 七月 2024 12:45:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 1c16c0b..70c2bbf 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -206,7 +206,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
@@ -390,6 +390,8 @@
A.inspection_item,
A.company,
A.`name`,
+ production,
+ engineering,
COUNT(1) num,
SUM(A.price) price,
SUM(A.cost) cost
@@ -407,7 +409,9 @@
cus.company,
u.`name`,
i.create_user,
- c.ins_sample_id
+ c.ins_sample_id,
+ production,
+ engineering
FROM
ins_order i
LEFT JOIN ins_sample isa ON isa.ins_order_id = i.id
@@ -417,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
@@ -428,7 +432,9 @@
A.model,
A.inspection_item,
A.company,
- A.`name`
+ A.`name`,
+ production,
+ engineering
ORDER BY
A.id,
A.entrust_code,
@@ -437,7 +443,9 @@
A.model,
A.inspection_item,
A.company,
- A.`name`) B
+ A.`name`,
+ production,
+ engineering) B
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
@@ -448,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