From aa084fcf2f099ebcf1e2d7ae46a03a5f77f76949 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 03 三月 2025 03:00:34 +0800
Subject: [PATCH] 工程库调整
---
business/src/main/resources/mapper/ProjectProcessMapper.xml | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectProcessMapper.xml b/business/src/main/resources/mapper/ProjectProcessMapper.xml
index 70b2fd1..0b9ec31 100644
--- a/business/src/main/resources/mapper/ProjectProcessMapper.xml
+++ b/business/src/main/resources/mapper/ProjectProcessMapper.xml
@@ -56,16 +56,68 @@
<result column="project_owner_unit" property="projectOwnerUnit" />
<result column="project_owner_unit_name" property="projectOwnerUnitName" />
<result column="project_contact_person" property="projectContactPerson" />
+ <result column="competent_department" property="competentDepartment" />
+ <result column="competent_department_name" property="competentDepartmentName" />
<result column="contact" property="contact" />
<result column="update_by" property="updateBy" />
<result column="create_by" property="createBy" />
<result column="process_def_id" property="processDefId" />
<result column="process_ins_id" property="processInsId" />
- <collection property="children" ofType="com.ycl.domain.vo.ProjectEngineeringVO" select="getProjectEngineering" column="id"></collection>
+<!-- <collection property="children" ofType="com.ycl.domain.vo.ProjectEngineeringVO" select="getProjectEngineering" column="id"></collection>-->
</resultMap>
- <select id="getProjectEngineering" parameterType="long" resultMap="com.ycl.mapper.ProjectEngineeringMapper.BaseResultMap">
- SELECT * FROM t_project_engineering WHERE project_info_id = #{id} and deleted = 0 AND parent_id = '0' ORDER BY gmt_create
+ <resultMap id="EngineeringMap" type="com.ycl.domain.vo.ProjectEngineeringVO">
+ <id column="id" property="id"/>
+ <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="projectOwnerUnit" />
+ <result column="department" property="competentDepartment" />
+ <result column="year" property="year" />
+ <result column="parent_id" property="parent" />
+ <result column="project_owner_unit_name" property="projectOwnerUnitName" />
+ <result column="competent_department_name" property="competentDepartmentName" />
+<!-- <collection property="children" ofType="com.ycl.domain.vo.ProjectEngineeringVO" select="getProjectEngineeringList" column="id"></collection>-->
+ </resultMap>
+
+ <select id="getProjectEngineeringList" parameterType="string" resultMap="EngineeringMap">
+ 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="getEngineeringList" parameterType="long" resultMap="EngineeringMap">
+ WITH RECURSIVE temp_table AS (
+ SELECT
+ id, project_info_id, project_name, project_type, investment_amount, status, unit, department, parent_id, year, gmt_create FROM t_project_engineering WHERE project_info_id = #{projectId} AND parent_id = '0' AND deleted = 0
+ UNION ALL
+ SELECT
+ TPE.id, TPE.project_info_id, TPE.project_name, TPE.project_type, TPE.investment_amount, TPE.status, TPE.unit, TPE.department, TPE.parent_id, TPE.year, TPE.gmt_create FROM t_project_engineering TPE INNER JOIN temp_table tb ON TPE.parent_id = tb.id AND TPE.deleted = 0
+ )
+ SELECT
+ TT.id, TT.project_info_id, TT.project_name, TT.project_type, TT.investment_amount, TT.status, TT.unit, TT.department, TT.parent_id, TT.year, TT.gmt_create,
+ (SELECT SD.dept_name FROM sys_dept SD WHERE SD.dept_id = TT.unit) AS project_owner_unit_name,
+ (SELECT SD.dept_name FROM sys_dept SD WHERE SD.dept_id = TT.department) AS competent_department_name
+ FROM
+ temp_table TT
+ ORDER BY
+ TT.gmt_create DESC
</select>
@@ -87,6 +139,8 @@
TPP.process_def_id,
TPP.process_ins_id,
TPIF.total_investment as investmentAmount,
+ (SELECT SD.dept_name FROM sys_dept SD WHERE SD.dept_id = PI.project_owner_unit) AS project_owner_unit_name,
+ (SELECT SD.dept_name FROM sys_dept SD WHERE SD.dept_id = PI.competent_department) AS competent_department_name,
d.dept_name as project_owner_unit_name
FROM
t_project_info PI
--
Gitblit v1.8.0