From e3026dae68fc425df7ca46c1b416aae32e036098 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 25 三月 2025 23:50:05 +0800
Subject: [PATCH] 修改cnas部分导出
---
inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml
index 82ede85..f025537 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml
@@ -5,15 +5,17 @@
<select id="selectInsOrderRates" resultType="com.ruoyi.inspect.dto.SampleOrderDto">
select *
from (select io.*,
- case
- when
- io.type_source = 0
- then io.sample_view
- else io.sample end sample,
- GROUP_CONCAT(DISTINCT isa.model SEPARATOR ' ') AS sample_model
- from ins_order io
- LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
- group by io.id) a
+ case
+ when
+ io.type_source = 0
+ then io.sample_view
+ else io.sample end sampleStr,
+ GROUP_CONCAT(DISTINCT isa.model SEPARATOR ' ') AS sample_model
+ from ins_order io
+ LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
+ left join ins_order_rates ior on ior.ins_order_id = io.id
+ where ior.id is not null
+ group by io.id) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
--
Gitblit v1.9.3