From e2dba648a958d3f9181b0556c941f14d07477a64 Mon Sep 17 00:00:00 2001
From: JYW <2013732181@qq.com>
Date: 星期五, 10 五月 2024 17:34:49 +0800
Subject: [PATCH] 辅助工时单位字段修改和不合格品bug修改
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 26a04a3..33b4992 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -95,7 +95,10 @@
ir.id report_id,
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
@@ -157,9 +160,9 @@
</if>
</select>
<select id="selectDeviceList" resultType="java.util.Map">
- select device_name,specification_model,factory_no,date_format(next_calibration_date, '%Y-%m-%d')
- latest_traceability from device
- where factory_no 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>
@@ -229,4 +232,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