From fc6b946b1020ddff4fe2b01c9e439680cbda6b47 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期三, 04 十二月 2024 09:32:53 +0800
Subject: [PATCH] 分角色展示项目计划,实现不同角色的功能

---
 business/src/main/resources/mapper/ProjectProcessMapper.xml |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/business/src/main/resources/mapper/ProjectProcessMapper.xml b/business/src/main/resources/mapper/ProjectProcessMapper.xml
index 0b2fc68..7fe3996 100644
--- a/business/src/main/resources/mapper/ProjectProcessMapper.xml
+++ b/business/src/main/resources/mapper/ProjectProcessMapper.xml
@@ -14,11 +14,10 @@
         <result column="invest_type" property="investType" />
         <result column="project_phase" property="projectPhase" />
         <result column="tag" property="tag" />
-        <result column="competent_department" property="competentDepartment" />
+<!--        <result column="competent_department" property="competentDepartment" />-->
         <result column="area_code" property="areaCode" />
-        <result column="management_centralization" property="managementCentralization" />
+<!--        <result column="management_centralization" property="managementCentralization" />-->
         <result column="project_approval_type" property="projectApprovalType" />
-        <result column="investment_catalogue" property="investmentCatalogue" />
         <result column="importance_type" property="importanceType" />
         <result column="year" property="year" />
         <result column="year_invest_amount" property="yearInvestAmount" />
@@ -38,12 +37,10 @@
         <result column="gmt_update_time" property="gmtUpdateTime" />
         <result column="update_by" property="updateBy" />
         <result column="create_by" property="createBy" />
-        <result column="flowable_process_id" property="flowableProcessId" />
+        <result column="process_def_id" property="processDefId" />
+        <result column="process_ins_id" property="processInsId" />
 <!--        <association property="id" column=""-->
     </resultMap>
-
-
-
 
 
 
@@ -51,7 +48,7 @@
     <select id="getById" resultMap="BaseResultMap">
         SELECT
             TPP.project_id,
-            TPP.flowable_process_id,
+            TPP.process_def_id,
             TPP.id
         FROM
             t_project_process TPP
@@ -63,10 +60,11 @@
     <select id="getPage" resultMap="BaseResultMap">
         SELECT
             PI.*,
-            TPP.flowable_process_id
+            TPP.process_def_id,
+            TPP.process_ins_id
         FROM
-            t_project_process TPP
-                INNER JOIN t_project_info PI ON TPP.project_id = PI.id AND TPP.deleted = 0 AND PI.deleted = 0
+            t_project_info PI
+                LEFT JOIN t_project_process TPP ON TPP.project_id = PI.id AND TPP.deleted = 0 AND PI.deleted = 0
         <where>
             <if test="query.projectName != null and query.projectName != ''">
                 AND PI.project_name like concat('%', #{query.projectName}, '%')

--
Gitblit v1.8.0