From 8bf55e1ac0ac6eb6c97a025f0c03b78e208f668e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 26 八月 2024 17:26:58 +0800
Subject: [PATCH] 复核确认+插队+认领判断是否在库
---
inspect-server/src/main/resources/mapper/InsProductMapper.xml | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsProductMapper.xml b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
index e3b2e1e..dc00e69 100644
--- a/inspect-server/src/main/resources/mapper/InsProductMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
@@ -3,7 +3,6 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.InsProductMapper">
-
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsProduct">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
@@ -72,19 +71,41 @@
select ip.id,
ip.inspection_item,
ip.inspection_item_subclass,
- ip.laboratory,
+ ip.son_laboratory,
ip.unit,
- ipr.equip_value,
+ ipr.equip_name equipValue,
io.entrust_code,
ipr.update_time,
+ ip.`last_value`,
ip.ins_result,
- u.name updateUserName
+ u.name updateUserName
from ins_product ip
left join ins_product_result ipr on ip.id = ipr.ins_product_id
left join ins_sample isa on isa.id = ip.ins_sample_id
left join ins_order io on io.id = isa.ins_order_id
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>
+ <select id="selectNoProducts" resultType="com.yuanchu.mom.pojo.InsProduct">
+ select *
+ from (select ip.*, sample_code
+ from ins_product ip
+ left join ins_sample is2 on ip.ins_sample_id = is2.id
+ where ip.ins_result is null
+ and state = 1
+ and is2.ins_order_id = #{orderId}) A
</select>
</mapper>
--
Gitblit v1.9.3