From 1ebf951a1d9676647957e7a319ae281b4a52dd1f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 02 八月 2024 18:45:40 +0800
Subject: [PATCH] 数采公式优化+任务切换sql语法错误+检验下单页面展示的数量和里面的数量不一致
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index f16e99f..0e895b1 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -107,7 +107,7 @@
io.type,
io.appointed,
io.send_time,
- group_concat(distinct isa.sample,' ') sample,
+ group_concat(distinct isa.sample,' ') sampleType,
isu.user_id,
user.name userName,
ip.son_laboratory,
@@ -137,7 +137,6 @@
and (isu.user_id = #{userId} OR isu.user_id is NULL )
</if>
OR isu.user_id is NULL
-
GROUP BY
ip.son_laboratory,
io.id
@@ -151,16 +150,15 @@
OR user_id is NULL
) isu2 on
isu2.ins_sample_id = a.id
+ where ins_state is not null
+ <if test="laboratory != null and laboratory!=''">
+ and laboratory=#{laboratory}
+ </if>
ORDER BY
<!--a.user_id DESC,-->
a.type DESC,
a.id
) b
- where ins_state is not null
- <if test="laboratory!=null and laboratory!=''">
- and laboratory=#{laboratory}
- </if>
- )A
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
@@ -308,8 +306,8 @@
method,
man_day,
bsm,
- ask,
- tell ,
+ ask,
+ tell,
`last_value`,
ip.ins_result ip_ins_result,
state,
--
Gitblit v1.9.3