From 9f480a6addb804f667041224b5d527584a690c9b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 09 十二月 2025 15:44:36 +0800
Subject: [PATCH] 1.0版本验收时，遗留的新增项，实验结果汇报增加原始检验记录
---
ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml
index c090ee2..66b7445 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml
@@ -44,8 +44,8 @@
<if test="query.auditStatus != null">
and tmcs.audit_status = #{query.auditStatus}
</if>
- <if test="query.roleType != null and (query.roleType == 3 or query.roleType == 4 or query.roleType == 5)">
- AND tmcs.audit_status != 5
+ <if test="query.roleType != null and query.roleType == 4 and query.userId != null">
+ AND tmcs.commit_user_id = #{query.userId}
</if>
<if test="query.dispatchIds != null and query.dispatchIds.size() > 0">
and tmcs.dispatch_id in
@@ -56,6 +56,9 @@
<if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
AND tmcs.create_time BETWEEN #{query.startTime} AND #{query.endTime}
</if>
+ <if test="query.roleType != null and (query.roleType == 3 or query.roleType == 4 or query.roleType == 5)">
+ AND tmcs.audit_status != 5
+ </if>
<if test="query.auditStatus == null">
and tmcs.audit_status != -1
</if>
--
Gitblit v1.7.1