From fbd4ecb70baf2e671876ca809a81f6e6fe7342ee Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期日, 20 九月 2026 19:52:50 +0800
Subject: [PATCH] feat(inspect): 新增检测标准方法报告文本功能并优化报告生成 - 委托编号生成逻辑调整为下单时生成并校验唯一性，避免审核时重复 - 新增标准模板价格字段及对应的数据模型和数据库映射 - 订单费用详情查询逻辑重构为基于模板价格计算方式 - 新增标准模板与设备绑定关系的数据结构和管理功能 - 委托编号唯一性校验逻辑增强
---
inspect-server/src/main/resources/mapper/InsReportMapper.xml | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsReportMapper.xml b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
index fa58164..07d0518 100644
--- a/inspect-server/src/main/resources/mapper/InsReportMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
@@ -18,6 +18,7 @@
io.laboratory,
io.ifs_inventory_id,
iiq.is_copper,
+ iiq.material_prop,
ip.son_laboratory
from ins_report ir
left join ins_order io on io.id = ir.ins_order_id
@@ -65,9 +66,26 @@
limit 1
</select>
+ <select id="selectDownloadableReport" resultType="com.ruoyi.inspect.pojo.InsReport">
+ select ir.*
+ from ins_report ir
+ where ir.id = #{id}
+ and ir.is_pass = 1
+ <if test="createOrderUser != null">
+ and (ir.write_user_id = #{createOrderUser}
+ or ir.examine_user_id = #{createOrderUser}
+ or ir.ratify_user_id = #{createOrderUser})
+ </if>
+ limit 1
+ </select>
+
<!-- 鎶ュ憡鎶ヨ〃瀵煎嚭 -->
<select id="reportAllExport" resultType="com.ruoyi.inspect.dto.InsReportExport">
select code,
+ case
+ when inspection_url is not null and inspection_url != '' then '妫�娴嬫姤鍛娿�佹楠屾姤鍛�'
+ when report_type = 0 then '妫�娴嬫姤鍛�'
+ else '妫�楠屾姤鍛�' end report_type_name,
case when type_source = 0 then '鎴愬搧涓嬪崟' else '鍘熸潗鏂欎笅鍗�' end type_source,
case
when order_type = '鎶芥' then '鎶芥'
--
Gitblit v1.9.3