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/TFeasibilityStudyReportMapper.xml | 13 ++++++++++++-
1 files changed, 12 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..d9fc4ce 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>
@@ -59,6 +62,7 @@
#{teamId}
</foreach>
</if>
+ AND tfsr.status in (1,2,3)
AND tfsr.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
ORDER BY tfsr.create_time DESC
@@ -82,6 +86,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 +104,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 +113,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 +129,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