From 9e28453dba6ecf93c6c2234ba38def7c41cf12f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 20 一月 2025 18:25:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/resources/mapper/PlanMapper.xml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/business/src/main/resources/mapper/PlanMapper.xml b/business/src/main/resources/mapper/PlanMapper.xml
index 85d57c7..139c557 100644
--- a/business/src/main/resources/mapper/PlanMapper.xml
+++ b/business/src/main/resources/mapper/PlanMapper.xml
@@ -26,6 +26,7 @@
<result property="yearStatus" column="year_status" />
<result property="projectStatus" column="project_status" />
<result property="investType" column="invest_type" />
+ <result property="exception" column="exception" />
</resultMap>
@@ -57,10 +58,12 @@
p.month_status,
p.season_status,
p.year_status,
+ p.exception,
pi.project_status,
pi.invest_type
FROM t_project_info AS pi
LEFT JOIN t_plan AS p ON p.project_info_id = pi.id
+ LEFT JOIN sys_dept d ON d.dept_id = PI.project_owner_unit
<where>
pi.deleted = 0
<if test="query.projectName!= null and query.projectName!= ''">
@@ -81,6 +84,7 @@
<if test="query.yearStatus!= null">
AND p.year_status = #{query.yearStatus}
</if>
+ ${query.params.dataScope}
</where>
</select>
--
Gitblit v1.8.0