From 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 三月 2025 13:49:53 +0800
Subject: [PATCH] 一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动去出库不能自动出库,且出库之后也不需要在页面展示
---
inspect-server/src/main/resources/mapper/InsOrderFileMapper.xml | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderFileMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderFileMapper.xml
index 3dbe7bd..b9648dc 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderFileMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderFileMapper.xml
@@ -5,6 +5,7 @@
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsOrderFile">
<id column="id" property="id"/>
<result column="ins_order_id" property="insOrderId"/>
+ <result property="insSampleId" column="ins_sample_id" />
<result column="type" property="type"/>
<result column="file_url" property="fileUrl"/>
<result column="file_name" property="fileName"/>
@@ -12,13 +13,23 @@
<result column="create_time" property="createTime"/>
<result column="update_user" property="updateUser"/>
<result column="update_time" property="updateTime"/>
+ <result column="son_laboratory" property="sonLaboratory"/>
</resultMap>
<select id="getFileList" resultType="com.yuanchu.mom.pojo.InsOrderFile">
select A.*
from (select iof.*, name
- from ins_order_file iof
- left join user u on iof.create_user = u.id
- where ins_order_id=#{insOrderId}) A
+ from ins_order_file iof
+ left join user u on iof.create_user = u.id
+ where ins_order_id=#{insOrderId}
+ <if test="sonLaboratory!=null and sonLaboratory!=''">
+ and (son_laboratory=#{sonLaboratory}
+ or son_laboratory is null)
+ </if>
+ <if test="sampleId!=null and sampleId!=''">
+ and (ins_sample_id=#{sampleId}
+ or ins_sample_id is null)
+ </if>
+ ) A
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
--
Gitblit v1.9.3