From f90b70b4448c8930c752111504b857b5fb76e8e3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 25 六月 2025 11:08:41 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/resources/mapper/system/TExperimentDispatchMapper.xml | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TExperimentDispatchMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TExperimentDispatchMapper.xml
index b9adb47..771584f 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TExperimentDispatchMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TExperimentDispatchMapper.xml
@@ -32,8 +32,8 @@
from t_experiment_dispatch ted
left join t_project_proposal tpp on ted.proposal_id = tpp.id
<where>
- <if test="query.proposalName != null and query.proposalName != ''">
- and tpp.proposal_name like concat('%',#{query.proposalName},'%')
+ <if test="query.projectName != null and query.projectName != ''">
+ and tpp.project_name like concat('%',#{query.projectName},'%')
</if>
<if test="query.experimentCode != null and query.experimentCode != ''">
and ted.experiment_code like concat('%',#{query.experimentCode},'%')
@@ -41,9 +41,18 @@
<if test="query.status !=null">
and ted.status = #{query.status}
</if>
+ <if test="query.dispatchIds != null and query.dispatchIds.size() > 0">
+ and ted.id in
+ <foreach item="item" collection="query.dispatchIds" separator="," close=")" index="index" open="(">
+ #{item}
+ </foreach>
+ </if>
<if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
AND ted.create_time BETWEEN #{query.startTime} AND #{query.endTime}
</if>
+ <if test="query.status == null">
+ and ted.status != -1
+ </if>
AND ted.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
ORDER BY ted.create_time DESC
--
Gitblit v1.7.1