From b5a21d35e93b93fdb1f190fd1851c945b2a3a207 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 03 三月 2025 00:52:30 +0800
Subject: [PATCH] 调整流程推进、日志的项目id类型
---
business/src/main/resources/mapper/ProjectEngineeringMapper.xml | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectEngineeringMapper.xml b/business/src/main/resources/mapper/ProjectEngineeringMapper.xml
index 6faf01e..eeafba2 100644
--- a/business/src/main/resources/mapper/ProjectEngineeringMapper.xml
+++ b/business/src/main/resources/mapper/ProjectEngineeringMapper.xml
@@ -24,7 +24,16 @@
<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,
(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
@@ -55,7 +64,7 @@
<select id="getPage" resultMap="BaseResultMap">
SELECT
TPE.project_info_id,
- TPE.project_name,
+
TPE.project_type,
TPE.investment_amount,
TPE.status,
@@ -64,13 +73,12 @@
TPE.department,
TPE.parent_id,
TPE.year,
- TPI.project_name as projectInfoName,
+ TPI.project_name,
(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 +93,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