From ce10da906c58596fce43bffa6a6d177268ca177b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 30 四月 2024 00:54:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index eaf47c5..26a04a3 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -116,8 +116,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 +157,9 @@
</if>
</select>
<select id="selectDeviceList" resultType="java.util.Map">
- select device_name,specification_model,factory_no,date_format(latest_traceability, '%Y-%m-%d')
+ select device_name,specification_model,factory_no,date_format(next_calibration_date, '%Y-%m-%d')
latest_traceability from device
- where device_name in
+ where factory_no in
<foreach collection="names" index="index" open="(" separator="," close=")" item="val">
#{val}
</foreach>
--
Gitblit v1.9.3