From ce0651907f18a57dae80065e01589e975530f53e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 20 五月 2025 18:52:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/TTesterOtherTaskMapper.xml | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TTesterOtherTaskMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TTesterOtherTaskMapper.xml
index 84c7199..82b1aef 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TTesterOtherTaskMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TTesterOtherTaskMapper.xml
@@ -6,6 +6,7 @@
<resultMap id="BaseResultMap" type="com.ruoyi.system.model.TTesterOtherTask">
<id column="id" property="id" />
<result column="team_id" property="teamId" />
+ <result column="tester_id" property="testerId" />
<result column="task_content" property="taskContent" />
<result column="task_time" property="taskTime" />
<result column="evaluate_score" property="evaluateScore" />
@@ -19,7 +20,29 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, team_id, task_content, task_time, evaluate_score, evaluate_time, create_time, update_time, create_by, update_by, disabled
+ id, team_id,tester_id, task_content, task_time, evaluate_score, evaluate_time, create_time, update_time, create_by, update_by, disabled
</sql>
+ <select id="pageList" resultType="com.ruoyi.system.vo.TTesterOtherTaskVO">
+ select ttot.id, ttot.team_id,ttot.tester_id, ttot.task_content, ttot.task_time, ttot.evaluate_score, ttot.evaluate_time,
+ ttot.create_time, ttot.update_time, ttot.create_by, ttot.update_by, ttot.disabled,tpt.team_name as teamName
+ from t_tester_other_task ttot
+ left join t_project_team tpt on ttot.team_id = tpt.id
+ <where>
+ <if test="query.teamName != null and query.teamName != ''">
+ and tpt.team_name like concat('%',#{query.teamName},'%')
+ </if>
+ <if test="query.taskContent != null and query.taskContent != ''">
+ and ttot.task_content like concat('%',#{query.taskContent},'%')
+ </if>
+ <if test="query.teamIds != null and query.teamIds.size() > 0">
+ and ttot.team_id in
+ <foreach item="teamId" collection="query.teamIds" index="index" open="(" close=")" separator=",">
+ #{teamId}
+ </foreach>
+ </if>
+ AND ttot.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY ttot.create_time DESC
+ </select>
</mapper>
--
Gitblit v1.7.1