From 062b1245a57d4e8a1e04a62efbc7d872e36eb073 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期二, 10 十二月 2024 18:11:37 +0800
Subject: [PATCH] bug
---
business/src/main/resources/mapper/PlanMapper.xml | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/business/src/main/resources/mapper/PlanMapper.xml b/business/src/main/resources/mapper/PlanMapper.xml
index b69243e..85d57c7 100644
--- a/business/src/main/resources/mapper/PlanMapper.xml
+++ b/business/src/main/resources/mapper/PlanMapper.xml
@@ -29,11 +29,6 @@
</resultMap>
-
-
-
-
-
<select id="getById" resultMap="BaseResultMap">
SELECT
TP.project_info_id,
@@ -59,19 +54,34 @@
pi.project_code,
pi.project_type,
pi.project_phase,
- IFNULL((select report_status from t_project_plan_record
- WHERE plan_time_flag = 0 AND project_info_id = pi.id ORDER BY create_time DESC LIMIT 1),1) as month_status,
- IFNULL((select report_status from t_project_plan_record
- WHERE plan_time_flag = 1 AND project_info_id = pi.id ORDER BY create_time DESC LIMIT 1),1) as season_status,
- IFNULL((select report_status from t_project_plan_record
- WHERE plan_time_flag = 2 AND project_info_id = pi.id ORDER BY create_time DESC LIMIT 1),1) as year_status,
+ p.month_status,
+ p.season_status,
+ p.year_status,
pi.project_status,
pi.invest_type
- FROM t_plan AS p
- INNER JOIN t_project_info AS pi ON p.project_info_id = pi.id
- INNER JOIN t_project_plan_record AS ppr ON p.id = ppr.plan_id
- WHERE
- p.deleted = 0
+ FROM t_project_info AS pi
+ LEFT JOIN t_plan AS p ON p.project_info_id = pi.id
+ <where>
+ pi.deleted = 0
+ <if test="query.projectName!= null and query.projectName!= ''">
+ AND pi.project_name LIKE CONCAT('%', #{query.projectName}, '%')
+ </if>
+ <if test="query.projectCode!= null and query.projectCode!= ''">
+ AND pi.project_code LIKE CONCAT('%', #{query.projectCode}, '%')
+ </if>
+ <if test="query.reportStatus!= null">
+ AND p.report_status = #{query.reportStatus}
+ </if>
+ <if test="query.monthStatus!= null">
+ AND p.month_status = #{query.monthStatus}
+ </if>
+ <if test="query.seasonStatus!= null">
+ AND p.season_status = #{query.seasonStatus}
+ </if>
+ <if test="query.yearStatus!= null">
+ AND p.year_status = #{query.yearStatus}
+ </if>
+ </where>
</select>
</mapper>
--
Gitblit v1.8.0