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/TQaProduceReportMapper.xml | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TQaProduceReportMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TQaProduceReportMapper.xml
index 71614f4..b1f29c8 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TQaProduceReportMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TQaProduceReportMapper.xml
@@ -47,6 +47,39 @@
<if test="query.teamName != null and query.teamName != ''">
and tpt.team_name like concat('%', #{query.teamName}, '%')
</if>
+ <if test="query.status != null and query.status != -1">
+ and tqpr.status = #{query.status}
+ </if>
+ <if test="query.status == null">
+ and tqpr.status != -1
+ </if>
+ <if test="query.teamIds != null and query.teamIds.size() > 0">
+ and tqpr.team_id in
+ <foreach collection="query.teamIds" item="teamId" open="(" separator="," close=")">
+ #{teamId}
+ </foreach>
+ </if>
+ AND tqpr.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY tqpr.create_time DESC
+ </select>
+ <select id="evaluateList" resultType="com.ruoyi.system.vo.TQaProduceReportVO">
+ select tqpr.id, tqpr.team_id, tqpr.report_title, tqpr.report_code, tqpr.develop_person, tqpr.develop_date,
+ tqpr.report_text, tqpr.report_type, tqpr.audit_person_id, tqpr.audit_time, tqpr.audit_remark, tqpr.status,
+ tqpr.evaluate_person_id, tqpr.evaluate_time, tqpr.evaluate_score, tqpr.create_time, tqpr.update_time,
+ tqpr.create_by, tqpr.update_by, tqpr.disabled, tpt.team_name as teamName
+ from t_qa_produce_report tqpr
+ left join t_project_team tpt on tpt.id = tqpr.team_id
+ <where>
+ <if test="query.reportTitle != null and query.reportTitle != ''">
+ and tqpr.report_title like concat('%', #{query.reportTitle}, '%')
+ </if>
+ <if test="query.reportCode != null and query.reportCode != ''">
+ and tqpr.report_code like concat('%', #{query.reportCode}, '%')
+ </if>
+ <if test="query.teamName != null and query.teamName != ''">
+ and tpt.team_name like concat('%', #{query.teamName}, '%')
+ </if>
<if test="query.status != null">
and tqpr.status = #{query.status}
</if>
@@ -56,6 +89,7 @@
#{teamId}
</foreach>
</if>
+ AND tqpr.status in (2,3)
AND tqpr.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
ORDER BY tqpr.create_time DESC
--
Gitblit v1.7.1