From 02caafae2b79014638a5f95824bb3f3efe83c3a2 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期日, 02 三月 2025 22:20:50 +0800
Subject: [PATCH] 工程

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

diff --git a/business/src/main/resources/mapper/ProjectEngineeringMapper.xml b/business/src/main/resources/mapper/ProjectEngineeringMapper.xml
index 5b9b9b5..6faf01e 100644
--- a/business/src/main/resources/mapper/ProjectEngineeringMapper.xml
+++ b/business/src/main/resources/mapper/ProjectEngineeringMapper.xml
@@ -4,18 +4,33 @@
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="BaseResultMap" type="com.ycl.domain.vo.ProjectEngineeringVO">
+        <id column="id" property="id"/>
         <result column="project_info_id" property="projectInfoId" />
         <result column="projectInfoName" property="projectInfoName" />
         <result column="project_name" property="projectName" />
         <result column="project_type" property="projectType" />
         <result column="investment_amount" property="investmentAmount" />
         <result column="status" property="status" />
+        <result column="unit" property="unit" />
+        <result column="department" property="department" />
+        <result column="parent_id" property="parent" />
+        <result column="year" property="year" />
+        <result column="unit_name" property="unitName" />
+        <result column="department_name" property="departmentName" />
+        <collection property="children" ofType="com.ycl.domain.vo.ProjectEngineeringVO" select="getProjectEngineering" column="id"></collection>
+
     </resultMap>
 
 
 
-
-
+    <select id="getProjectEngineering" parameterType="String" resultMap="com.ycl.mapper.ProjectEngineeringMapper.BaseResultMap">
+        SELECT TPE.*,TPI.project_name as projectInfoName,
+            (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
+        WHERE TPE.parent_id = #{id} and TPE.deleted = 0 ORDER BY TPE.gmt_create
+    </select>
 
 
     <select id="getById" resultMap="BaseResultMap">
@@ -25,7 +40,11 @@
             TPE.project_type,
             TPE.investment_amount,
             TPE.status,
-            TPE.id
+            TPE.id,
+            TPE.unit,
+            TPE.department,
+            TPE.parent_id,
+            TPE.year
         FROM
             t_project_engineering TPE
         WHERE
@@ -41,12 +60,19 @@
             TPE.investment_amount,
             TPE.status,
             TPE.id,
-            TPI.project_name as projectInfoName
+            TPE.unit,
+            TPE.department,
+            TPE.parent_id,
+            TPE.year,
+            TPI.project_name as projectInfoName,
+            (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
+
         WHERE
-            TPE.deleted = 0
+            TPE.deleted = 0 AND TPE.parent_id = '0'
             <if test="query.projectName != null and query.projectName != ''">
                 AND TPE.project_name LIKE concat('%', #{query.projectName}, '%')
             </if>

--
Gitblit v1.8.0