From 5d2d6fdff67f8f9a7e65abdbb4b87dba07dcb32b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 02 九月 2025 10:23:02 +0800
Subject: [PATCH] 上传修改
---
ruoyi-system/src/main/resources/mapper/system/TInspectionReportMapper.xml | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TInspectionReportMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TInspectionReportMapper.xml
index 43d1c8c..36b90b8 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TInspectionReportMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TInspectionReportMapper.xml
@@ -21,10 +21,12 @@
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 tpp.id = ted.project_id
+ left join t_project_proposal tpp on ted.proposal_id = tpp.id
<where>
<if test="query.projectName != null and query.projectName != ''">
and tpp.project_name like concat('%', #{query.projectName}, '%')
@@ -41,8 +43,20 @@
<if test="query.status != null">
and tir.status = #{query.status}
</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="(">
+ #{item}
+ </foreach>
+ </if>
+ <if test="query.roleType != null and query.roleType == 4">
+ and tir.status in (-1, 1)
+ </if>
+ <if test="query.status == null">
+ and tir.status != -1
+ </if>
<if test="query.createBy != null and query.createBy != ''">
- and tir.create_by = #{query.createBy}
+ and tir.create_by like concat('%',#{query.createBy},'%')
</if>
and tir.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
--
Gitblit v1.7.1