From bd953391a74b86db829df43992c7cf3c5207634b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 27 六月 2025 18:07:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/TExperimentDispatchMapper.xml | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 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 771584f..7aa9ba6 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TExperimentDispatchMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TExperimentDispatchMapper.xml
@@ -41,6 +41,48 @@
<if test="query.status !=null">
and ted.status = #{query.status}
</if>
+ <if test="query.otherStatus !=null">
+ and ted.status = #{query.otherStatus}
+ </if>
+ <if test="query.roleType != null and (query.roleType == 3 or query.roleType == 4 or query.roleType == 5)">
+ AND ted.status != 3
+ </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
+ </select>
+ <select id="chemistSignList" resultType="com.ruoyi.system.model.TExperimentDispatch">
+ 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.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},'%')
+ </if>
+ <if test="query.experimentName != null and query.experimentName != ''">
+ and ted.experiment_name like concat('%',#{query.experimentName},'%')
+ </if>
+ <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="(">
--
Gitblit v1.7.1