From fd479eeb7dae6ec6b8b83d18e07aa163e8357eff Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 04 八月 2025 21:26:03 +0800
Subject: [PATCH] 改造保养规范流程与升版导入代码
---
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/mapper/xml/HisWorkTaskMapper.xml | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/mapper/xml/HisWorkTaskMapper.xml b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/mapper/xml/HisWorkTaskMapper.xml
index edb48a8..a824ccb 100644
--- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/mapper/xml/HisWorkTaskMapper.xml
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/mapper/xml/HisWorkTaskMapper.xml
@@ -28,8 +28,7 @@
SELECT
p.PROC_INST_ID_ AS procInstId,
p.BUSINESS_KEY_ AS businessKey,
- p.START_TIME_ AS procStartTime,
- p.END_TIME_ AS procEndTime,
+ a.EXECUTION_ID_ AS executionId,
a.ACT_ID_,
COALESCE ( a.ACT_NAME_, a.ACT_ID_ ) AS actName,
a.ACT_TYPE_ AS actType,
@@ -38,10 +37,12 @@
c.NAME_ AS taskName,
c.ASSIGNEE_ AS assignee,
c.DESCRIPTION_ AS description,
--- 浣跨敤 LEAD 鑾峰彇涓嬩竴涓椿鍔ㄤ俊鎭�
- LEAD ( COALESCE ( a.ACT_NAME_, a.ACT_ID_ ) ) OVER ( PARTITION BY p.PROC_INST_ID_ ORDER BY a.START_TIME_ ) AS nextActName,
- LEAD ( a.ACT_TYPE_ ) OVER ( PARTITION BY p.PROC_INST_ID_ ORDER BY a.START_TIME_ ) AS nextActType,
- LEAD ( a.START_TIME_ ) OVER ( PARTITION BY p.PROC_INST_ID_ ORDER BY a.START_TIME_ ) AS nextActStartTime
+ LEAD ( COALESCE ( a.ACT_NAME_, a.ACT_ID_ ) ) OVER ( PARTITION BY p.PROC_INST_ID_, a.EXECUTION_ID_
+ ORDER BY a.START_TIME_ ) AS nextActName,
+ LEAD ( a.ACT_TYPE_ ) OVER ( PARTITION BY p.PROC_INST_ID_, a.EXECUTION_ID_
+ ORDER BY a.START_TIME_ ) AS nextActType,
+ LEAD ( a.START_TIME_ ) OVER ( PARTITION BY p.PROC_INST_ID_, a.EXECUTION_ID_
+ ORDER BY a.START_TIME_ ) AS nextActStartTime
FROM
act_hi_procinst p
LEFT JOIN act_hi_actinst a ON p.PROC_INST_ID_ = a.PROC_INST_ID_
@@ -52,23 +53,19 @@
) SELECT
procInstId,
businessKey,
--- 褰撳墠娲诲姩锛坲serTask锛変俊鎭�
actName AS userTaskName,
taskName,
assignee,
actStartTime,
actEndTime,
description,
--- 涓嬩竴涓椿鍔紙sequenceFlow锛変俊鎭�
nextActName AS sequenceFlowName,
nextActStartTime AS sequenceFlowStartTime
FROM
ActivitySequence
WHERE
- actType = 'userTask' -- 绛涢�夊綋鍓嶆椿鍔ㄤ负 userTask
-
- AND nextActType = 'sequenceFlow' -- 涓斾笅涓�涓椿鍔ㄤ负 sequenceFlow
-
+ actType = 'userTask'
+ AND nextActType = 'sequenceFlow'
ORDER BY
actStartTime;
</select>
--
Gitblit v1.9.3