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/TQaTestItemReportMapper.xml | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TQaTestItemReportMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TQaTestItemReportMapper.xml
index dee4bdc..a311bb6 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TQaTestItemReportMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TQaTestItemReportMapper.xml
@@ -7,6 +7,7 @@
<id column="id" property="id" />
<result column="item_id" property="itemId" />
<result column="report_content" property="reportContent" />
+ <result column="report_code" property="reportCode" />
<result column="develop_person" property="developPerson" />
<result column="develop_date" property="developDate" />
<result column="report_text" property="reportText" />
@@ -23,17 +24,18 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, item_id, report_content, develop_person, develop_date, report_text, audit_person_id, audit_time, audit_remark, status, create_time, update_time, create_by, update_by, disabled
+ id, item_id, report_content,report_code, develop_person, develop_date, report_text, audit_person_id, audit_time, audit_remark, status, create_time, update_time, create_by, update_by, disabled
</sql>
<select id="getList" resultType="com.ruoyi.system.vo.TQaTestItemReportVO">
select
<include refid="Base_Column_List" />
from t_qa_test_item_report
where item_id = #{itemId}
+ AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
order by create_time desc
</select>
<select id="pageList" resultType="com.ruoyi.system.vo.TQaTestItemReportVO">
- select tqtir.id, tqtir.item_id, tqtir.report_content, tqtir.develop_person, tqtir.develop_date, tqtir.report_text,
+ select tqtir.id, tqtir.item_id, tqtir.report_content,tqtir.report_code, tqtir.develop_person, tqtir.develop_date, tqtir.report_text,
tqtir.audit_person_id, tqtir.audit_time, tqtir.audit_remark, tqtir.status, tqtir.create_time, tqtir.update_time,
tqtir.create_by, tqtir.update_by, tqtir.disabled,tqti.item_name as itemName, tqti.item_code as itemCode,
tpt.team_name as teamName
@@ -53,12 +55,30 @@
<if test="query.reportContent != null and query.reportContent != ''">
and tqtir.report_content = #{query.reportContent}
</if>
+ <if test="query.teamIds != null and query.teamIds.size() > 0">
+ and tqti.team_id in
+ <foreach item="teamId" collection="query.teamIds" separator="," close=")" open="(" index="">
+ #{teamId}
+ </foreach>
+ </if>
<if test="query.status != null">
and tqtir.status = #{query.status}
+ </if>
+ <if test="query.status == null">
+ and tqtir.status != -1
</if>
AND tqtir.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
ORDER BY tqtir.create_time DESC
</select>
+ <select id="getListByItemId" resultType="com.ruoyi.system.vo.TQaTestItemReportVO">
+ select
+ <include refid="Base_Column_List" />
+ from t_qa_test_item_report
+ where item_id = #{itemId}
+ and status in (1,2,3)
+ and disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ order by create_time desc
+ </select>
</mapper>
--
Gitblit v1.7.1