From 7a79d42944f2535814966e10368b8ef8dce3e0fb Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 24 三月 2025 11:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/resources/mapper/ProjectEngineeringMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectEngineeringMapper.xml b/business/src/main/resources/mapper/ProjectEngineeringMapper.xml
index a5cf56d..798b67a 100644
--- a/business/src/main/resources/mapper/ProjectEngineeringMapper.xml
+++ b/business/src/main/resources/mapper/ProjectEngineeringMapper.xml
@@ -17,6 +17,7 @@
<result column="year" property="year" />
<result column="unit_name" property="unitName" />
<result column="department_name" property="departmentName" />
+ <result column="build_content" property="buildContent"/>
<collection property="children" ofType="com.ycl.domain.vo.ProjectEngineeringVO" select="getProjectEngineering" column="id"></collection>
</resultMap>
@@ -34,6 +35,7 @@
TPE.department,
TPE.parent_id,
TPE.year,
+ TPE.build_content,
(SELECT SD.dept_name FROM sys_dept SD WHERE SD.dept_id = TPE.unit) AS unit_name,
(SELECT SD.dept_name FROM sys_dept SD WHERE SD.dept_id = TPE.department) AS department_name
FROM t_project_engineering TPE
@@ -53,7 +55,8 @@
TPE.unit,
TPE.department,
TPE.parent_id,
- TPE.year
+ TPE.year,
+ TPE.build_content
FROM
t_project_engineering TPE
WHERE
@@ -73,6 +76,7 @@
TPE.parent_id,
TPE.year,
TPI.project_name,
+ TPE.build_content,
(SELECT SD.dept_name FROM sys_dept SD WHERE SD.dept_id = TPE.unit) AS unit_name,
(SELECT SD.dept_name FROM sys_dept SD WHERE SD.dept_id = TPE.department) AS department_name
FROM
--
Gitblit v1.8.0