From a86d2feff2af246bdf09c32e6591eb590cefa672 Mon Sep 17 00:00:00 2001
From: JYW <2013732181@qq.com>
Date: 星期二, 23 四月 2024 09:00:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index bede559..1e5bee5 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -51,12 +51,12 @@
io.state = 1
AND io.ins_state != 5
and send_time is not null
+ and (isu.user_id = #{userId} OR isu.user_id is NULL)
GROUP BY
ip.son_laboratory,
io.id
) a
LEFT JOIN ins_order_state ios ON ios.ins_order_id = a.id AND ios.laboratory = a.son_laboratory
- where a.user_id = #{userId} OR a.user_id is NULL
ORDER BY
a.user_id DESC,
a.type DESC,
@@ -101,9 +101,14 @@
ip.update_user ip_update_user,
ip.create_time ip_create_time,
ip.update_time ip_update_time,
- template_id
+ template_id,
+ ipr.ins_value,
+ ipr.com_value,
+ ipr.equip_value,
+ ip.method_s
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
</select>
@@ -141,9 +146,14 @@
ip.update_user ip_update_user,
ip.create_time ip_create_time,
ip.update_time ip_update_time,
- template_id
+ template_id,
+ ipr.ins_value,
+ ipr.com_value,
+ ipr.equip_value,
+ ip.method_s
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}
@@ -208,5 +218,13 @@
<result property="createTime" column="ip_create_time" jdbcType="TIMESTAMP"/>
<result property="updateTime" column="ip_update_time" jdbcType="TIMESTAMP"/>
<result property="templateId" column="template_id" jdbcType="INTEGER"/>
+ <result property="methodS" column="method_s"/>
+ <collection property="insProductResult" resultMap="insProductResult"/>
+ </resultMap>
+
+ <resultMap id="insProductResult" type="com.yuanchu.mom.pojo.InsProductResult">
+ <result property="insValue" column="ins_value" jdbcType="VARCHAR"/>
+ <result property="comValue" column="com_value" jdbcType="VARCHAR"/>
+ <result property="equipValue" column="equip_value" jdbcType="VARCHAR"/>
</resultMap>
</mapper>
--
Gitblit v1.9.3