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/ProjectPlanExamineRecordMapper.xml |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml b/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml
index 930a9f2..379a5f0 100644
--- a/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml
+++ b/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml
@@ -143,6 +143,7 @@
     <select id="selectInfo" resultType="com.ycl.domain.vo.DepartmentApprovalResponseVO">
         SELECT
             ranked.id,
+            ppi.id AS project_plan_info_id,
             (SELECT title FROM t_project_plan_info WHERE id = ranked.project_plan_info_id) as title,
             ranked.department_examine,
             ranked.department_approval,
@@ -150,7 +151,8 @@
             ranked.manage_examine,
             ranked.manage_approval,
             ranked.manage_approval_reply,
-            ranked.gmt_create
+            ranked.gmt_create,
+            ppi.plan_status
         FROM (
                  SELECT
                      *,
@@ -158,6 +160,7 @@
                  FROM t_project_plan_examine_record AS pper
                  WHERE project_plan_record_id = #{projectPlanRecordId}
              ) AS ranked
+        LEFT JOIN t_project_plan_info ppi ON ranked.project_plan_info_id = ppi.id
         WHERE rn = 1 AND ranked.deleted = 0
         Order by gmt_create DESC
     </select>
@@ -176,6 +179,8 @@
         FROM t_project_plan_examine_record AS pper
         WHERE
             pper.project_plan_record_id = #{projectPlanRecordId}
+            AND pper.event_type = 0
+            AND pper.deleted = 0
         ORDER BY gmt_update DESC
     </select>
     <select id="todoList" resultMap="selectToDoResultMap">

--
Gitblit v1.8.0