From 08be30bda841df3af65428547186513a3d7b1f42 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 27 十月 2026 17:47:56 +0800
Subject: [PATCH] feat(report): 完善报告退回流程及新增 PDF 预览功能 - 新增退回到报告审核环节，支持退回至检验任务或报告审核两种目标
---
inspect-server/src/main/resources/mapper/InsReportMapper.xml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsReportMapper.xml b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
index 3b9e27b..ffd96ba 100644
--- a/inspect-server/src/main/resources/mapper/InsReportMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
@@ -49,6 +49,10 @@
<if test='queryStatus == 2'>
and ir.state = 1 and ir.is_examine = 1 and (ir.is_ratify != 1 or ir.is_ratify is null)
</if>
+ <!-- 宸查��鍥� -->
+ <if test='queryStatus == 3'>
+ and (ir.is_examine = 2 or ir.is_ratify = 2)
+ </if>
</if>
group by ir.id
) a
@@ -102,11 +106,11 @@
case when state = 0 then '寰呮彁浜�' when state = 1 then '宸叉彁浜�' else '' end state,
examine_user,
DATE_FORMAT(examine_time, '%Y-%m-%d %H:%i:%s') examine_time,
- case when is_examine = 0 then '涓嶉�氳繃' when is_examine = 1 then '閫氳繃' else '' end is_examine,
+ case when is_examine = 0 then '涓嶉�氳繃' when is_examine = 1 then '閫氳繃' when is_examine = 2 then '宸查��鍥�' else '' end is_examine,
examine_tell,
ratify_user,
DATE_FORMAT(ratify_time, '%Y-%m-%d %H:%i:%s') ratify_time,
- case when is_ratify = 0 then '涓嶆壒鍑�' when is_ratify = 1 then '鎵瑰噯' else '' end is_ratify,
+ case when is_ratify = 0 then '涓嶆壒鍑�' when is_ratify = 1 then '鎵瑰噯' when is_ratify = 2 then '宸查��鍥�' else '' end is_ratify,
ratify_tell
from (
select
@@ -147,6 +151,10 @@
<if test='queryStatus == 2'>
and ir.state = 1 and ir.is_examine = 1 and (ir.is_ratify != 1 or ir.is_ratify is null)
</if>
+ <!-- 宸查��鍥� -->
+ <if test='queryStatus == 3'>
+ and (ir.is_examine = 2 or ir.is_ratify = 2)
+ </if>
</if>
group by ir.id
) a
--
Gitblit v1.9.3