From f90b70b4448c8930c752111504b857b5fb76e8e3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 25 六月 2025 11:08:41 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/resources/mapper/system/TFeasibilityStudyReportMapper.xml | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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..2fa9181 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>
@@ -82,6 +85,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>
@@ -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
@@ -105,7 +112,7 @@
select
COUNT(tfsr.id) as totalCount,
SUM(CASE WHEN tfsr.status = 2 THEN 1 ELSE 0 END) AS toEvaluatedCount,
- SUM(CASE WHEN tfsr.status = 3 THEN 1 ELSE 0 END) AS evaluatedCount,
+ SUM(CASE WHEN tfsr.status = 3 THEN 1 ELSE 0 END) AS evaluatedCount
from t_feasibility_study_report tfsr
left join t_project_team tpt on tpt.id = tfsr.team_id
<where>
@@ -121,6 +128,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>
--
Gitblit v1.7.1