From 10274861ca2383b0ff5ef8db59a6bce4b0649ec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Fri, 6 Sep 2024 13:52:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/SQL集合.txt | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/sql/SQL集合.txt b/sql/SQL集合.txt
index 38eb56ff..2766acc5 100644
--- a/sql/SQL集合.txt
+++ b/sql/SQL集合.txt
@@ -56,13 +56,23 @@ CREATE VIEW vw_flow_all AS (
 	ru.user_id AS startUserId,
 	ru.nick_name AS startUserName,
 	rd.dept_name AS startDeptName,
-	ht.*
+	RES.PROC_INST_ID_,
+	IFNULL(hr.ID_,ht.taskId) as taskId,
+	IFNULL(hr.NAME_,ht.taskName) as taskName,
+	IF(hr.ID_ IS NULL, ht.assigneeId, tu.user_id) as assigneeId,
+	IF(hr.ID_ IS NULL, ht.assigneeName, tu.nick_name) as assigneeName,
+	IF(hr.ID_ IS NULL, ht.assigneeDeptName, td.dept_name) as assigneeDeptName,
+	IF(hr.ID_ IS NULL, ht.taskComType, 0) as taskComType
 FROM
 	ACT_HI_PROCINST RES
 LEFT OUTER JOIN ACT_RE_PROCDEF DEF ON RES.PROC_DEF_ID_ = DEF.ID_
 LEFT OUTER JOIN sur_project sp ON RES.BUSINESS_KEY_ = sp.id
 LEFT JOIN sys_user ru ON ru.user_id = RES.START_USER_ID_
 LEFT JOIN sys_dept rd ON rd.dept_id = ru.dept_id
+LEFT JOIN act_ru_task hr ON hr.PROC_INST_ID_ = RES.PROC_INST_ID_
+LEFT JOIN act_ru_actinst ra ON ra.TASK_ID_ = hr.ID_ AND ra.PROC_INST_ID_ = RES.PROC_INST_ID_
+LEFT JOIN sys_user tu ON tu.user_id = ra.ASSIGNEE_
+LEFT JOIN sys_dept td ON td.dept_id = tu.dept_id
 LEFT JOIN (
 	SELECT
 		ht.ID_ AS taskId,
@@ -87,7 +97,6 @@ LEFT JOIN (
 				PROC_INST_ID_
 		)
 	GROUP BY ht.PROC_INST_ID_
-	
 ) ht ON ht.PROC_INST_ID_ = RES.PROC_INST_ID_
 )