From 4feecc75d0bb75a587523852bd99e71c2046af56 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 23 五月 2024 17:32:37 +0800
Subject: [PATCH] 彻底解决标准库的bug
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 9acd36b..141741a 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -28,7 +28,7 @@
<select id="findInsSampleAndOrder" resultType="com.yuanchu.mom.vo.InsOrderPlanVO">
select * from(
SELECT
- a.*,ios.ins_state,ios.verify_tell,isu2.order_user_id
+ a.*,ios.ins_state,ios.verify_tell,isu2.order_user_id,(ios.verify_user = #{userId}) verify_user
FROM
(
SELECT
@@ -40,7 +40,7 @@
io.sample_type,
isu.user_id,
ip.son_laboratory,
- io.ins_result
+ io.ins_time
FROM
ins_order io
LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
@@ -56,7 +56,7 @@
io.id
) a
LEFT JOIN ins_order_state ios ON ios.ins_order_id = a.id AND ios.laboratory = a.son_laboratory
- 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
+ left join (SELECT td.user_id order_user_id, td.ins_sample_id FROM ins_sample_user td,(SELECT max(id) id FROM ins_sample_user GROUP BY ins_sample_id) md where td.id = md.id and user_id = #{userId}) isu2 on isu2.ins_sample_id = a.id
ORDER BY
a.user_id DESC,
a.type DESC,
@@ -152,7 +152,8 @@
ipr.equip_value,
ipr.equip_name,
ip.method_s,
- ip.tell
+ ip.tell,
+ ip.dic
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
@@ -225,6 +226,7 @@
<result property="templateId" column="template_id" jdbcType="INTEGER"/>
<result property="methodS" column="method_s"/>
<result property="tell" column="tell"/>
+ <result property="dic" column="dic"/>
<collection property="insProductResult" resultMap="insProductResult"/>
</resultMap>
--
Gitblit v1.9.3