From 95de53b0c3dde45d9f88ccf24e720fffdc20961a Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期日, 02 三月 2025 23:31:56 +0800
Subject: [PATCH] 工程

---
 business/src/main/resources/mapper/ProjectEngineeringMapper.xml |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/business/src/main/resources/mapper/ProjectEngineeringMapper.xml b/business/src/main/resources/mapper/ProjectEngineeringMapper.xml
index 6faf01e..6362fd5 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 != ''">

--
Gitblit v1.8.0