From aac0fb36d6b6762f8f28827be417b6dc97e7e34e Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 13 五月 2024 16:30:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index eaf47c5..b520a2e 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -93,13 +93,18 @@
SELECT
io.*,
ir.id report_id,
+ ir.url,
+ ir.url_s,
concat(ROUND((select count(*) from ins_sample isa2
where ins_state = 5 and isa2.ins_order_id = io.id) / (select count(*) from ins_sample isa2
- where isa2.ins_order_id = io.id) * 100, 2), '%') insProgress
+ where isa2.ins_order_id = io.id) * 100, 2), '%') insProgress,
+ group_concat(distinct isa.sample_code,' ') sample_code,
+ group_concat(distinct isa.sample,' ') sample_name,
+ group_concat(distinct isa.model,' ') sample_model
FROM
ins_order io
LEFT JOIN ins_sample isa ON io.id = isa.ins_order_id
- LEFT JOIN ( SELECT id, ins_order_id, is_ratify FROM ins_report WHERE is_ratify = 1 ) ir ON io.id =
+ LEFT JOIN ( SELECT id, ins_order_id, is_ratify, url,url_s FROM ins_report WHERE is_ratify = 1 ) ir ON io.id =
ir.ins_order_id
GROUP BY
io.id
@@ -116,8 +121,6 @@
<select id="selectSampleAndProductByOrderId" resultType="com.yuanchu.mom.dto.SampleProductDto2">
select *
from (
- select
- i.id,isa.sample_code,isa.sample,isa.model,ip.state,ip.unit,ip.inspection_item,ip.inspection_item_subclass,
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
from ins_sample isa
@@ -159,9 +162,9 @@
</if>
</select>
<select id="selectDeviceList" resultType="java.util.Map">
- select device_name,specification_model,factory_no,date_format(latest_traceability, '%Y-%m-%d')
- latest_traceability from device
- where device_name in
+ select device_name,specification_model,management_number,DATE_ADD(date_format(last_calibration_date, '%Y-%m-%d'),INTERVAL calibration_date month) latest_traceability
+ from device
+ where device.management_number in
<foreach collection="names" index="index" open="(" separator="," close=")" item="val">
#{val}
</foreach>
@@ -231,4 +234,8 @@
</if>
) temp
</select>
+ <select id="getEnumLabelByValue" resultType="java.lang.String">
+ select label from `center-lims`.enums
+ where value = #{value}
+ </select>
</mapper>
--
Gitblit v1.9.3