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/TQaTestItemMapper.xml | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TQaTestItemMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TQaTestItemMapper.xml
index 4b0f0fd..b074cb1 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TQaTestItemMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TQaTestItemMapper.xml
@@ -6,6 +6,7 @@
<resultMap id="BaseResultMap" type="com.ruoyi.system.model.TQaTestItem">
<id column="id" property="id" />
<result column="team_id" property="teamId" />
+ <result column="commit_person_id" property="commitPersonId" />
<result column="item_name" property="itemName" />
<result column="item_code" property="itemCode" />
<result column="remark" property="remark" />
@@ -22,10 +23,10 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, team_id, item_name, item_code, remark, status, evaluate_person_id, evaluate_time, evaluate_score, create_time, update_time, create_by, update_by, disabled
+ id, team_id,commit_person_id, item_name, item_code, remark, status, evaluate_person_id, evaluate_time, evaluate_score, create_time, update_time, create_by, update_by, disabled
</sql>
<select id="pageList" resultType="com.ruoyi.system.vo.TQaTestItemVO">
- select tqti.id, tqti.team_id, tqti.item_name, tqti.item_code, tqti.remark, tqti.status, tqti.evaluate_person_id,
+ select tqti.id, tqti.team_id,tqti.commit_person_id, tqti.item_name, tqti.item_code, tqti.remark, tqti.status, tqti.evaluate_person_id,
tqti.evaluate_time, tqti.evaluate_score, tqti.create_time, tqti.update_time, tqti.create_by, tqti.update_by, tqti.disabled,
tpt.team_name as teamName
from t_qa_test_item tqti
@@ -40,6 +41,39 @@
<if test="query.itemCode != null and query.itemCode != ''">
and tqti.item_code like concat('%', #{query.itemCode})
</if>
+ <if test="query.status != null and query.status != -1">
+ and tqti.status = #{query.status}
+ </if>
+ <if test="query.status == null">
+ and tqti.status != -1
+ </if>
+ <if test="query.teamIds != null and query.teamIds.size() > 0">
+ and tqti.team_id in
+ <foreach collection="query.teamIds" item="teamId" open="(" separator="," close=")">
+ #{teamId}
+ </foreach>
+ </if>
+ AND tqti.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY tqti.create_time DESC
+ </select>
+
+ <select id="evaluateList" resultType="com.ruoyi.system.vo.TQaTestItemVO">
+ select tqti.id, tqti.team_id,tqti.commit_person_id, tqti.item_name, tqti.item_code, tqti.remark, tqti.status, tqti.evaluate_person_id,
+ tqti.evaluate_time, tqti.evaluate_score, tqti.create_time, tqti.update_time, tqti.create_by, tqti.update_by, tqti.disabled,
+ tpt.team_name as teamName
+ from t_qa_test_item tqti
+ left join t_project_team tpt on tpt.id = tqti.team_id
+ <where>
+ <if test="query.teamName != null and query.teamName != ''">
+ and tpt.team_name like concat('%', #{query.teamName}, '%')
+ </if>
+ <if test="query.itemName != null and query.itemName != ''">
+ and tqti.item_name like concat('%', #{query.itemName}, '%')
+ </if>
+ <if test="query.itemCode != null and query.itemCode != ''">
+ and tqti.item_code like concat('%', #{query.itemCode})
+ </if>
<if test="query.status != null">
and tqti.status = #{query.status}
</if>
@@ -49,6 +83,7 @@
#{teamId}
</foreach>
</if>
+ AND tqti.status in (2,3)
AND tqti.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
ORDER BY tqti.create_time DESC
--
Gitblit v1.7.1