From 0d6aae2036feb77bb2796f6b484489d7ffcd99c2 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 10 五月 2024 22:19:25 +0800
Subject: [PATCH] 各bug修复
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 37aec35..9acd36b 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -16,7 +16,6 @@
<result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
<result property="sample" column="sample" jdbcType="VARCHAR"/>
<result property="model" column="model" jdbcType="VARCHAR"/>
- <result property="isLeave" column="is_leave" jdbcType="INTEGER"/>
<result property="insState" column="ins_state" jdbcType="INTEGER"/>
<result property="joinNum" column="join_num" jdbcType="INTEGER"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
@@ -152,13 +151,18 @@
ipr.com_value,
ipr.equip_value,
ipr.equip_name,
- ip.method_s
+ ip.method_s,
+ ip.tell
from ins_sample isa
left join ins_product ip on isa.id = ip.ins_sample_id
left join ins_product_result ipr on ip.id = ipr.ins_product_id
where ins_order_id = #{id}
and state = 1
and ip.son_laboratory = #{laboratory}
+ </select>
+ <select id="getSampleEn" resultType="java.lang.String">
+ select name_en from `center-lims`.product
+ where name = #{sample}
</select>
<resultMap id="sampleDto" type="com.yuanchu.mom.dto.SampleProductDto">
@@ -173,7 +177,6 @@
<result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
<result property="sample" column="sample" jdbcType="VARCHAR"/>
<result property="model" column="model" jdbcType="VARCHAR"/>
- <result property="isLeave" column="is_leave" jdbcType="INTEGER"/>
<result property="insState" column="ins_state" jdbcType="INTEGER"/>
<result property="joinNum" column="join_num" jdbcType="INTEGER"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
@@ -221,6 +224,7 @@
<result property="updateTime" column="ip_update_time" jdbcType="TIMESTAMP"/>
<result property="templateId" column="template_id" jdbcType="INTEGER"/>
<result property="methodS" column="method_s"/>
+ <result property="tell" column="tell"/>
<collection property="insProductResult" resultMap="insProductResult"/>
</resultMap>
--
Gitblit v1.9.3