From 1bf19a660b56bf5934b060d08cbef4408844c1fb Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 06 五月 2024 07:16:01 +0800
Subject: [PATCH] 调整todo的描述
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 5045af2..37aec35 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -29,7 +29,7 @@
<select id="findInsSampleAndOrder" resultType="com.yuanchu.mom.vo.InsOrderPlanVO">
select * from(
SELECT
- a.*,ios.ins_state,ios.verify_tell
+ a.*,ios.ins_state,ios.verify_tell,isu2.order_user_id
FROM
(
SELECT
@@ -49,14 +49,15 @@
LEFT JOIN ins_product ip ON ip.ins_sample_id = isa.id
WHERE
io.state = 1
- AND io.ins_state != 5
+# 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
+ left join (SELECT c.user_id order_user_id, c.ins_sample_id from (SELECT * FROM ins_sample_user ORDER BY id DESC) c GROUP BY ins_sample_id having order_user_id = #{userId}) isu2 on isu2.ins_sample_id = a.id
ORDER BY
a.user_id DESC,
a.type DESC,
@@ -104,7 +105,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 +150,9 @@
template_id,
ipr.ins_value,
ipr.com_value,
- ipr.equip_value
+ ipr.equip_value,
+ ipr.equip_name,
+ 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 +220,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>
@@ -223,5 +228,6 @@
<result property="insValue" column="ins_value" jdbcType="VARCHAR"/>
<result property="comValue" column="com_value" jdbcType="VARCHAR"/>
<result property="equipValue" column="equip_value" jdbcType="VARCHAR"/>
+ <result property="equipName" column="equip_name" jdbcType="VARBINARY"/>
</resultMap>
</mapper>
--
Gitblit v1.9.3