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/TProjectProposalMapper.xml | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TProjectProposalMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TProjectProposalMapper.xml
index 7f8094f..2b3f64a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TProjectProposalMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TProjectProposalMapper.xml
@@ -5,6 +5,8 @@
<!-- 通用查询映射结果 -->
<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" />
<result column="project_code" property="projectCode" />
@@ -29,13 +31,13 @@
<!-- 通用查询结果列 -->
<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
+ 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.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.nickname as auditPersonName
+ su.nick_name as auditPersonName
from t_project_proposal tpp
left join sys_user su on su.user_id = tpp.audit_person_id
<where>
@@ -46,10 +48,10 @@
and tpp.project_code like concat('%',#{query.projectCode},'%')
</if>
<if test="query.auditPersonName != null and query.auditPersonName != ''">
- and su.nickname like concat('%',#{query.auditPersonName},'%')
+ and su.nick_name like concat('%',#{query.auditPersonName},'%')
</if>
<if test="query.createBy != null and query.createBy != ''">
- and tpp.createBy like concat('%',#{query.createBy},'%')
+ and tpp.create_by 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}
@@ -57,6 +59,15 @@
<if test="query.auditStatus != null">
AND tpp.audit_status = #{query.auditStatus}
</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>
AND tpp.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
ORDER BY tpp.create_time DESC
--
Gitblit v1.7.1