From 36ccc814cb2499757a0cfd5525d5e8d0c2309b64 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 27 十一月 2024 16:02:42 +0800
Subject: [PATCH] 企业微信的消息提醒的信息改成单号样品名+检验下单的模版保存,如果存在同名的情况,将原有的情况覆盖掉,并添加提示框+首页展示添加样品名称
---
inspect-server/src/main/resources/mapper/InsOrderFileMapper.xml | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderFileMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderFileMapper.xml
index 2699fcf..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"/>
@@ -24,6 +25,10 @@
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}
--
Gitblit v1.9.3