From 6ca23797c5221b37b18247c7a610da70a05913a9 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 23 四月 2024 01:35:28 +0800
Subject: [PATCH] 功能调整
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 5045af2..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,
@@ -104,7 +104,8 @@
template_id,
ipr.ins_value,
ipr.com_value,
- ipr.equip_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
@@ -148,7 +149,8 @@
template_id,
ipr.ins_value,
ipr.com_value,
- ipr.equip_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
@@ -216,6 +218,7 @@
<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>
--
Gitblit v1.9.3