From ad6a05f2535c1f29a764f352d8ca666cae1b97d1 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 22 二月 2025 17:06:28 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/project_management-java
---
business/src/main/resources/mapper/ProjectProcessMapper.xml | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectProcessMapper.xml b/business/src/main/resources/mapper/ProjectProcessMapper.xml
index 6aded0e..8321fa1 100644
--- a/business/src/main/resources/mapper/ProjectProcessMapper.xml
+++ b/business/src/main/resources/mapper/ProjectProcessMapper.xml
@@ -15,26 +15,21 @@
<result column="project_phase" property="projectPhase" />
<result column="tag" property="tag" />
<!-- <result column="competent_department" property="competentDepartment" />-->
- <result column="area_code" property="areaCode" />
<!-- <result column="management_centralization" property="managementCentralization" />-->
<result column="project_approval_type" property="projectApprovalType" />
<result column="importance_type" property="importanceType" />
- <result column="year" property="year" />
- <result column="year_invest_amount" property="yearInvestAmount" />
+<!-- <result column="year" property="year" />-->
+<!-- <result column="year_invest_amount" property="yearInvestAmount" />-->
<result column="create_project_time" property="createProjectTime" />
<result column="plan_start_time" property="planStartTime" />
<result column="plan_complete_time" property="planCompleteTime" />
- <result column="win_unit" property="winUnit" />
- <result column="win_amount" property="winAmount" />
- <result column="win_time" property="winTime" />
<result column="project_address" property="projectAddress" />
<result column="longitude" property="longitude" />
<result column="latitude" property="latitude" />
<result column="project_owner_unit" property="projectOwnerUnit" />
+ <result column="project_owner_unit_name" property="projectOwnerUnitName" />
<result column="project_contact_person" property="projectContactPerson" />
<result column="contact" property="contact" />
- <result column="gmt_create_time" property="gmtCreateTime" />
- <result column="gmt_update_time" property="gmtUpdateTime" />
<result column="update_by" property="updateBy" />
<result column="create_by" property="createBy" />
<result column="process_def_id" property="processDefId" />
@@ -61,7 +56,8 @@
SELECT
PI.*,
TPP.process_def_id,
- TPP.process_ins_id
+ TPP.process_ins_id,
+ d.dept_name as project_owner_unit_name
FROM
t_project_info PI
LEFT JOIN t_project_process TPP ON TPP.project_id = PI.id AND TPP.deleted = 0
--
Gitblit v1.8.0