From 1a2e22a27627b40689257442cc5a46598c634f8e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 23 五月 2025 14:16:28 +0800
Subject: [PATCH] 测评接口完成，添加数据权限
---
ruoyi-system/src/main/resources/mapper/system/TInspectionReportMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TInspectionReportMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TInspectionReportMapper.xml
index 85821f1..b2a12d9 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TInspectionReportMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TInspectionReportMapper.xml
@@ -21,7 +21,9 @@
id, dispatch_id, test_result, test_reason, status, create_time, update_time, create_by, update_by, disabled
</sql>
<select id="pageList" resultType="com.ruoyi.system.vo.TInspectionReportVO">
- select id, dispatch_id, test_result, test_reason, status, create_time, update_time, create_by, update_by, disabled
+ select tir.id, tir.dispatch_id, tir.test_result, tir.test_reason, tir.status, tir.create_time,
+ tir.update_time, tir.create_by, tir.update_by, tir.disabled, ted.experiment_name, ted.experiment_code,
+ tpp.project_name
from t_inspection_report tir
left join t_experiment_dispatch ted on ted.id = tir.dispatch_id
left join t_project_proposal tpp on ted.proposal_id = tpp.id
@@ -38,7 +40,7 @@
<if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
AND tir.create_time BETWEEN #{query.startTime} AND #{query.endTime}
</if>
- <if test="query.status != null and query.status != -1">
+ <if test="query.status != null">
and tir.status = #{query.status}
</if>
<if test="query.status == null">
--
Gitblit v1.7.1