From 87794ed4e7b7cf7b13f7deef5da3e3ff03255d81 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期日, 04 八月 2024 23:01:09 +0800
Subject: [PATCH] 检验任务负责人展示修改
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 62 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index ea09efc..f1b69e5 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -25,7 +25,7 @@
</resultMap>
<select id="findInsSampleAndOrder" resultType="com.yuanchu.mom.vo.InsOrderPlanVO">
- select * from(select * from(
+ <!--select * from(select * from(
SELECT
a.*,ios.ins_state,ios.verify_tell,isu2.order_user_id,verify_user
FROM
@@ -83,6 +83,66 @@
a.type DESC,
a.id
) b
+ where ins_state is not null-->
+
+ select * from(select * from(
+ SELECT
+ a.*,ios.ins_state,ios.verify_tell,verify_user
+ FROM
+ (
+ SELECT
+ io.id,
+ io.entrust_code,
+ io.type,
+ io.appointed,
+ io.send_time,
+ group_concat(distinct isa.sample,' ') sample,
+ userName,
+ checkName,
+ ip.son_laboratory,
+ io.ins_time,
+ io.laboratory
+ FROM
+ ins_order io
+ LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
+
+ LEFT JOIN (
+ SELECT ins_sample_id,GROUP_CONCAT( DISTINCT uu.name SEPARATOR ',') AS userName
+ FROM ins_sample_user u LEFT JOIN user uu ON u.user_id = uu.id
+ WHERE son_laboratory=#{sonLaboratory}
+ and u.state=0
+ GROUP BY ins_sample_id
+ ORDER BY ins_sample_id
+ ) isu ON isu.ins_sample_id = io.id
+ LEFT JOIN (
+ SELECT ins_sample_id,uu.name checkName
+ FROM ins_sample_user u LEFT JOIN user uu ON u.user_id = uu.id
+ WHERE son_laboratory=#{sonLaboratory}
+ and u.state=1
+ GROUP BY ins_sample_id
+ ORDER BY ins_sample_id
+ )isu2 ON isu2.ins_sample_id = io.id
+
+ LEFT JOIN ins_product ip ON ip.ins_sample_id = isa.id
+ WHERE io.state = 1 and send_time is not null
+ <if test="userName !=null and userName!=''">
+ and ( (userName like CONCAT ('%', #{userName},'%') )
+ or (checkName like CONCAT ('%', #{userName},'%') ) )
+ </if>
+ and ip.son_laboratory=#{sonLaboratory}
+ 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
+
+ ORDER BY
+ a.type DESC,
+ a.id
+ ) b
where ins_state is not null
<if test="laboratory!=null and laboratory!=''">
and laboratory=#{laboratory}
--
Gitblit v1.9.3