From 37325b5b629a296230e87d41187742f843c7494c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 15 七月 2025 18:08:23 +0800
Subject: [PATCH] 文件ip迁移兼容
---
business/src/main/resources/mapper/ProjectEngineeringMapper.xml | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectEngineeringMapper.xml b/business/src/main/resources/mapper/ProjectEngineeringMapper.xml
index 6faf01e..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>
@@ -24,7 +25,17 @@
<select id="getProjectEngineering" parameterType="String" resultMap="com.ycl.mapper.ProjectEngineeringMapper.BaseResultMap">
- SELECT TPE.*,TPI.project_name as projectInfoName,
+ SELECT TPE.project_info_id,
+ TPE.project_name,
+ TPE.project_type,
+ TPE.investment_amount,
+ TPE.status,
+ TPE.id,
+ TPE.unit,
+ 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
@@ -44,7 +55,8 @@
TPE.unit,
TPE.department,
TPE.parent_id,
- TPE.year
+ TPE.year,
+ TPE.build_content
FROM
t_project_engineering TPE
WHERE
@@ -55,7 +67,6 @@
<select id="getPage" resultMap="BaseResultMap">
SELECT
TPE.project_info_id,
- TPE.project_name,
TPE.project_type,
TPE.investment_amount,
TPE.status,
@@ -64,13 +75,13 @@
TPE.department,
TPE.parent_id,
TPE.year,
- TPI.project_name as projectInfoName,
+ 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
t_project_engineering TPE
- INNER JOIN t_project_info TPI ON TPI.id = TPE.project_info_id AND TPI.deleted = 0
-
+ Left JOIN t_project_info TPI ON TPI.id = TPE.project_info_id AND TPI.deleted = 0
WHERE
TPE.deleted = 0 AND TPE.parent_id = '0'
<if test="query.projectName != null and query.projectName != ''">
@@ -85,6 +96,8 @@
<if test="query.projectType != null and query.projectType != ''">
AND TPE.project_type = #{query.projectType}
</if>
+ ORDER BY TPE.gmt_create DESC
+
</select>
</mapper>
--
Gitblit v1.8.0