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/TFeasibilityStudyReportMapper.xml | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TFeasibilityStudyReportMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TFeasibilityStudyReportMapper.xml
index f8b7e33..9d1b2d5 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TFeasibilityStudyReportMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TFeasibilityStudyReportMapper.xml
@@ -47,6 +47,9 @@
<if test="query.status != null">
and tfsr.status = #{query.status}
</if>
+ <if test="query.status == null">
+ and tfsr.status != -1
+ </if>
<if test="query.reportType != null">
and tfsr.report_type = #{query.reportType}
</if>
@@ -79,8 +82,11 @@
<if test="query.teamName != null and query.teamName != ''">
and tpt.team_name like concat('%', #{query.teamName})
</if>
- <if test="query.status != null">
+ <if test="query.status != null and query.status != -1">
and tfsr.status = #{query.status}
+ </if>
+ <if test="query.status == null">
+ and tfsr.status != -1
</if>
<if test="query.reportType != null">
and tfsr.report_type = #{query.reportType}
@@ -97,6 +103,7 @@
#{teamId}
</foreach>
</if>
+ and tfsr.status in (2,3)
AND tfsr.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
ORDER BY tfsr.create_time DESC
@@ -118,9 +125,12 @@
<if test="query.teamName != null and query.teamName != ''">
and tpt.team_name like concat('%', #{query.teamName})
</if>
- <if test="query.status != null">
+ <if test="query.status != null and query.status != -1">
and tfsr.status = #{query.status}
</if>
+ <if test="query.status == null">
+ and tfsr.status != -1
+ </if>
<if test="query.reportType != null">
and tfsr.report_type = #{query.reportType}
</if>
--
Gitblit v1.7.1