From 77a409bdbaa1ed9f8ac7829f6ffbb7521e61f854 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 12 四月 2025 16:21:42 +0800
Subject: [PATCH] 课题方案,实验调度管理

---
 ruoyi-system/src/main/resources/mapper/system/TExperimentDispatchMapper.xml |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/TExperimentDispatchMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TExperimentDispatchMapper.xml
index bf0b484..b9adb47 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TExperimentDispatchMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TExperimentDispatchMapper.xml
@@ -24,5 +24,29 @@
     <sql id="Base_Column_List">
         id, proposal_id, experiment_date, experiment_name, experiment_code, experiment_start_time, experiment_end_time, key_nodes, status, create_time, update_time, create_by, update_by, disabled
     </sql>
+    <select id="pageList" resultType="com.ruoyi.system.vo.TExperimentDispatchVO">
+        SELECT
+        ted.id, ted.proposal_id, ted.experiment_date, ted.experiment_name, ted.experiment_code, ted.experiment_start_time,
+        ted.experiment_end_time, ted.key_nodes, ted.status, ted.create_time, ted.update_time, ted.create_by, ted.update_by,
+        ted.disabled,tpp.project_name as projectName
+        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>
+            <if test="query.experimentCode != null and query.experimentCode != ''">
+                and ted.experiment_code like concat('%',#{query.experimentCode},'%')
+            </if>
+            <if test="query.status !=null">
+                and ted.status = #{query.status}
+            </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>
+            AND ted.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+        </where>
+        ORDER BY ted.create_time DESC
+    </select>
 
 </mapper>

--
Gitblit v1.7.1