From 7b54a258fe2dc334da94985f8252608d646d63f0 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 19 八月 2024 18:15:48 +0800
Subject: [PATCH] 检验下单调整4
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 87f66bb..9caad82 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -191,7 +191,7 @@
LEFT JOIN user ON isu.user_id = user.id
WHERE
io.state = 1
- # AND io.ins_state != 5
+-- # AND io.ins_state != 5
and send_time is not null
<if test="userId !=null and userId!=''">
and (isu.user_id = #{userId} OR isu.user_id is NULL )
@@ -212,7 +212,7 @@
isu2.ins_sample_id = a.id
where ins_state is not null
<if test="laboratory != null and laboratory != ''">
- and laboratory=#{laboratory}
+ and a.laboratory=#{laboratory}
</if>
ORDER BY
<!--a.user_id DESC,-->
@@ -272,8 +272,8 @@
left join ins_product_result ipr on ip.id = ipr.ins_product_id
where ins_order_id = #{id}
and state = 1
- and ins_fiber_id is null
- and ins_fibers_id is null
+-- and ins_fiber_id is null
+-- and ins_fibers_id is null
and <!--isa.sample_code NOT REGEXP '/'-->
isa.id in(select id1 from (select is2.id id1 ,ip.id from ins_sample is2 left join ins_product ip on is2.id = ip.ins_sample_id where ip.id is not null)s )
order by case when man_hour_group is NULL then 1
--
Gitblit v1.9.3