From 82ce59218139d9fefeae7b9e5fbc88b499ff023f Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 08 十月 2026 13:35:06 +0800
Subject: [PATCH] feat(inspect): 新增新聚检验订单编辑功能并优化报告生成流程 - 新增 updateNewJuInsOrder 接口支持新聚检验订单修改 - 增加文件上传大小限制至200MB，请求大小限制至400MB - 在设备信息中新增出厂编号字段显示 - 优化温湿度处理逻辑，报告中仅显示温度信息 - 新增印章管理功能，支持MA标志章、报告章和骑缝章配置 - 完善检验报告生成流程，增加多种报告类型常量定义 - 优化附件上传功能，增加空值检查和返回值处理 - 调整委托编号生成逻辑，完善新聚订单可编辑性判断 - 更新CNAS流程中报告编号使用正式报告编号替代委托编号
---
inspect-server/src/main/resources/mapper/InsReportMapper.xml | 21 +++++++++++++++++++++
1 files changed, 21 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..3b9e27b 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,12 +66,32 @@
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 '鎶芥'
+ when order_type = 'Commissioned testing' then '濮旀墭妫�娴�'
+ when order_type = 'Inter-laboratory comparison' then '瀹為獙瀹ら棿姣斿'
+ when order_type = 'Proficiency testing' then '鑳藉姏楠岃瘉'
when order_type = 'Customer-ordered test' then '濮旀墭妫�楠�'
when order_type = '杩涘巶妫�楠�' then '杩涘巶妫�楠�'
when order_type = 'Quarterly inspection' then '瀛ｅ害妫�楠�'
--
Gitblit v1.9.3