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/TProjectProposalMapper.xml | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TProjectProposalMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TProjectProposalMapper.xml
index 7de2ad3..751a8a3 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TProjectProposalMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TProjectProposalMapper.xml
@@ -5,6 +5,7 @@
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.ruoyi.system.model.TProjectProposal">
<id column="id" property="id" />
+ <result column="team_id" property="teamId" />
<result column="commit_user_id" property="commitUserId" />
<result column="project_name" property="projectName" />
<result column="project_stage" property="projectStage" />
@@ -30,10 +31,10 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id,commit_user_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
+ id,team_id,commit_user_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.commit_user_id, tpp.project_name, tpp.project_stage, tpp.project_code, tpp.experiment_objective, tpp.experiment_material, tpp.experiment_device,
+ select tpp.id,tpp.team_id,tpp.commit_user_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.nick_name as auditPersonName
@@ -55,9 +56,18 @@
<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 query.auditStatus != -1">
+ <if test="query.auditStatus != null">
AND tpp.audit_status = #{query.auditStatus}
</if>
+ <if test="query.roleType != null and (query.roleType == 3 or query.roleType == 4 or query.roleType == 5)">
+ AND tpp.audit_status != 5
+ </if>
+ <if test="query.teamIds != null and query.teamIds.size() > 0">
+ AND tpp.team_id IN
+ <foreach item="teamId" collection="query.teamIds" separator="," open="(" close=")" index="">
+ #{teamId}
+ </foreach>
+ </if>
<if test="query.auditStatus == null">
AND tpp.audit_status != -1
</if>
--
Gitblit v1.7.1