From 8dcefe8d8faa04997e75aa0f8c62b6e715d81b98 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 30 七月 2024 20:08:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/InsProductMapper.xml | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsProductMapper.xml b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
index e3b2e1e..d1e6308 100644
--- a/inspect-server/src/main/resources/mapper/InsProductMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
@@ -74,7 +74,7 @@
ip.inspection_item_subclass,
ip.laboratory,
ip.unit,
- ipr.equip_value,
+ ipr.equip_name equipValue,
io.entrust_code,
ipr.update_time,
ip.ins_result,
@@ -86,5 +86,17 @@
left join user u on u.id = ipr.update_user
where ip.ins_sample_id = #{sampleId}
and ip.ins_result is not null
+ and template_id is not null
+ </select>
+ <select id="selectFiberInsProduct" resultType="com.yuanchu.mom.pojo.InsProduct">
+ select * from ins_product
+ where state = 1
+ and (ins_fibers_id is not null or ins_fiber_id is not null)
+ and ins_result is null
+ and son_laboratory = #{laboratory}
+ and ins_sample_id in
+ <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
</select>
</mapper>
--
Gitblit v1.9.3