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/TProjectProposalMapper.xml | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TProjectProposalMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TProjectProposalMapper.xml
index b86ceed..7f8094f 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TProjectProposalMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TProjectProposalMapper.xml
@@ -31,5 +31,35 @@
<sql id="Base_Column_List">
id, project_name, project_stage, project_code, experiment_objective, experiment_material, experiment_device, experiment_test_method, experiment_procedure, data_acquisition, result_evaluation, precautions, audit_status, audit_person_id, audit_time, audit_remark, create_time, update_time, create_by, update_by, disabled
</sql>
+ <select id="pageList" resultType="com.ruoyi.system.vo.TProjectProposalVO">
+ select tpp.id, tpp.project_name, tpp.project_stage, tpp.project_code, tpp.experiment_objective, tpp.experiment_material, tpp.experiment_device,
+ tpp.experiment_test_method, tpp.experiment_procedure, tpp.data_acquisition, tpp.result_evaluation, tpp.precautions, tpp.audit_status,
+ tpp.audit_person_id, tpp.audit_time, tpp.audit_remark, tpp.create_time, tpp.update_time, tpp.create_by, tpp.update_by, tpp.disabled,
+ su.nickname as auditPersonName
+ from t_project_proposal tpp
+ left join sys_user su on su.user_id = tpp.audit_person_id
+ <where>
+ <if test="query.projectName != null and query.projectName != ''">
+ and tpp.project_name like concat('%',#{query.projectName},'%')
+ </if>
+ <if test="query.projectCode != null and query.projectCode != ''">
+ and tpp.project_code like concat('%',#{query.projectCode},'%')
+ </if>
+ <if test="query.auditPersonName != null and query.auditPersonName != ''">
+ and su.nickname like concat('%',#{query.auditPersonName},'%')
+ </if>
+ <if test="query.createBy != null and query.createBy != ''">
+ and tpp.createBy like concat('%',#{query.createBy},'%')
+ </if>
+ <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
+ AND tpp.create_time BETWEEN #{query.startTime} AND #{query.endTime}
+ </if>
+ <if test="query.auditStatus != null">
+ AND tpp.audit_status = #{query.auditStatus}
+ </if>
+ AND tpp.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY tpp.create_time DESC
+ </select>
</mapper>
--
Gitblit v1.7.1