From fd58eac9c45b19300135d84b1d22013466807a96 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期日, 20 九月 2026 13:52:51 +0800
Subject: [PATCH] feat(inspect): 完善检验报告功能与数据处理 - 添加重新生成报告的功能接口 - 优化管理员权限判断逻辑，允许管理员查看全部待复核任务 - 改进Excel数据解析逻辑，支持合并单元格的坐标计算 - 完善直绑模板订单的检验结果处理机制 - 优化报告下载接口，支持按报告类型选择 - 提升附件上传大小限制至200MB
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index d4aa9a2..e5af839 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -136,13 +136,13 @@
(SELECT ins_sample.ins_order_id, COUNT(*) AS total_count
FROM ins_product
JOIN ins_sample ON ins_product.ins_sample_id = ins_sample.id
- WHERE ins_product.state = 1
+ WHERE ins_product.state = 1 and is_binding !=1
GROUP BY ins_sample.ins_order_id) total_product_counts ON io.id = total_product_counts.ins_order_id
LEFT JOIN
(SELECT ins_sample.ins_order_id, COUNT(*) AS approved_count
FROM ins_product
JOIN ins_sample ON ins_product.ins_sample_id = ins_sample.id
- WHERE ins_product.state = 1 AND ins_product.ins_result IS NOT NULL
+ WHERE ins_product.state = 1 and is_binding !=1 AND ins_product.ins_result IS NOT NULL
GROUP BY ins_sample.ins_order_id) approved_product_counts ON io.id = approved_product_counts.ins_order_id
LEFT JOIN (SELECT ins_sample_id, GROUP_CONCAT(DISTINCT uu.name SEPARATOR ',') AS testing_name
FROM ins_sample_user u
@@ -181,6 +181,8 @@
type,
entrust_code,
company,
+ sample,
+ sample_view,
remark,
create_time,
state
@@ -400,7 +402,7 @@
) labelBarCode
from ins_order io2
LEFT JOIN ins_sample isa ON io2.id = isa.ins_order_id
- where type_source = 0
+ where type_source = -1
GROUP BY io2.id) a
where insOrderId in
<foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
--
Gitblit v1.9.3