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/TInspectionReportMapper.xml | 9 +++++++--
1 files changed, 7 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 36b90b8..cc080ee 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TInspectionReportMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TInspectionReportMapper.xml
@@ -9,6 +9,7 @@
<result column="test_result" property="testResult" />
<result column="test_reason" property="testReason" />
<result column="status" property="status" />
+ <result column="commit_user_id" property="commitUserId" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
<result column="create_by" property="createBy" />
@@ -18,11 +19,12 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, dispatch_id, test_result, test_reason, status, create_time, update_time, create_by, update_by, disabled
+ id, dispatch_id, test_result, test_reason, status,commit_user_id, create_time, update_time, create_by, update_by, disabled
</sql>
<select id="pageList" resultType="com.ruoyi.system.vo.TInspectionReportVO">
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,
+ tir.update_time, tir.create_by, tir.update_by, tir.disabled, tir.commit_user_id,
+ 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
@@ -43,6 +45,9 @@
<if test="query.status != null">
and tir.status = #{query.status}
</if>
+ <if test="query.roleType != null and query.roleType == 4 and query.userId != null">
+ AND tir.commit_user_id = #{query.userId}
+ </if>
<if test="query.dispatchIds != null and query.dispatchIds.size() > 0">
and tir.dispatch_id in
<foreach item="item" collection="query.dispatchIds" separator="," close=")" index="index" open="(">
--
Gitblit v1.7.1