From 23eb9c9a21afc8ed065706f0e6494ee998a217b5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:27 +0800
Subject: [PATCH] fix:1.班次页面：月度统计时间调整为上月26到本月25；班次支持右键添加批注 2.外购下单：KJNS域订单免检自动更新批次属性；外购下单-全部页新增【更新IFS批次属性】按钮，支持更新已提交订单的批次属性 3.资源要求-设备：设备核查计划：核查负责人回显问题修复；设备使用授权：检验项目导出数据错误问题修复
---
inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml | 32 +++++++++++++++++++++++---------
1 files changed, 23 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..402a50a 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml
@@ -5,15 +5,29 @@
<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,
+ sum(tempior.rates) + 200 total_price
+ from ins_order io
+ LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
+ left join (
+ select ior.id, ior.ins_order_id, ior.rates from
+ ins_order_rates ior
+ left join ins_product ip on ip.id = ior.ins_product_id
+ left join ins_order io2 on ior.ins_order_id = io2.id
+ GROUP BY CASE
+ WHEN ior.man_hour_group IS NOT NULL AND ior.man_hour_group != '' THEN ior.man_hour_group
+ ELSE ior.id END,
+ CASE WHEN ior.man_hour_group IS NOT NULL AND ior.man_hour_group != '' THEN ior.ins_sample_id ELSE ior.id END,
+ CASE WHEN ior.man_hour_group IS NOT NULL AND ior.man_hour_group != '' THEN ip.radius ELSE ior.id END,
+ CASE WHEN ior.man_hour_group IS NOT NULL AND ior.man_hour_group != '' THEN ip.cable_tag ELSE ior.id END,
+ CASE WHEN ior.man_hour_group IS NOT NULL AND ior.man_hour_group != '' THEN ior.ins_order_id ELSE ior.id END) tempior on tempior.ins_order_id = io.id
+ where tempior.id is not null
+ group by io.id) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
--
Gitblit v1.9.3