From 9f19d3a24f8474bf6f9eb9401888c44b34b381e6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 十一月 2024 14:29:50 +0800
Subject: [PATCH] 第一次改动(检验任务与样品关联,附件与样品关联,报告与样品关联)
---
inspect-server/src/main/resources/mapper/InsProductMapper.xml | 16 ++--------------
1 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsProductMapper.xml b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
index 4394f11..ec40d61 100644
--- a/inspect-server/src/main/resources/mapper/InsProductMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
@@ -6,7 +6,7 @@
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsProduct">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
- <result property="inspectionItemClassify" column="inspection_item_classify" jdbcType="VARCHAR"/>
+ <result property="inspectionItemClass" column="inspection_item_class" jdbcType="VARCHAR"/>
<result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
<result property="factory" column="factory" jdbcType="VARCHAR"/>
<result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
@@ -88,17 +88,6 @@
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
@@ -113,8 +102,7 @@
select COUNT(1)
from ins_product ip
left join ins_sample isa on ip.ins_sample_id = isa.id
- left join ins_order io on isa.ins_order_id = io.id
- where io.id = #{orderId}
+ where isa.id = #{sampleId}
and (ip.ins_result is null or ip.ins_result = 2)
and ip.state = 1
</select>
--
Gitblit v1.9.3