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/TExperimentSchemeMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml
index b0b5564..974bd14 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml
@@ -50,7 +50,7 @@
and tpp.project_name like concat('%', #{query.projectName}, '%')
</if>
<if test="query.experimentCode != null and query.experimentCode != ''">
- and tes.experiment_code like concat('%', #{query.experimentCode}, '%')
+ and ted.experiment_code like concat('%', #{query.experimentCode}, '%')
</if>
<if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
AND tes.create_time BETWEEN #{query.startTime} AND #{query.endTime}
@@ -60,6 +60,12 @@
<foreach item="item" collection="query.dispatchIds" separator="," close=")" index="index" open="(">
#{item}
</foreach>
+ </if>
+ <if test="query.roleType != null and (query.roleType == 3 or query.roleType == 4 or query.roleType == 5)">
+ AND tes.status != 5
+ </if>
+ <if test="query.roleType != null and query.roleType == 5">
+ AND tes.status != 6
</if>
<if test="query.status == null">
and tes.status != -1
@@ -85,7 +91,7 @@
and tpp.project_name like concat('%', #{query.projectName}, '%')
</if>
<if test="query.experimentCode != null and query.experimentCode != ''">
- and tes.experiment_code like concat('%', #{query.experimentCode}, '%')
+ and ted.experiment_code like concat('%', #{query.experimentCode}, '%')
</if>
<if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
AND tes.create_time BETWEEN #{query.startTime} AND #{query.endTime}
--
Gitblit v1.7.1