From 3452c0838a2a1672c2e56cfea81867addd499988 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 02 三月 2025 23:46:18 +0800
Subject: [PATCH] Merge branch 'dev'
---
business/src/main/resources/mapper/ProjectEngineeringMapper.xml | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectEngineeringMapper.xml b/business/src/main/resources/mapper/ProjectEngineeringMapper.xml
index 5b9b9b5..eeafba2 100644
--- a/business/src/main/resources/mapper/ProjectEngineeringMapper.xml
+++ b/business/src/main/resources/mapper/ProjectEngineeringMapper.xml
@@ -4,18 +4,42 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<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.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
+ 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 +49,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
@@ -36,17 +64,23 @@
<select id="getPage" resultMap="BaseResultMap">
SELECT
TPE.project_info_id,
- TPE.project_name,
+
TPE.project_type,
TPE.investment_amount,
TPE.status,
TPE.id,
- TPI.project_name as projectInfoName
+ TPE.unit,
+ TPE.department,
+ TPE.parent_id,
+ TPE.year,
+ 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
+ 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>
@@ -59,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