From bfcc77394746d480351ae08a58d656f3f9f9a5c4 Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 9 Mar 2026 13:50:18 +0800 Subject: [PATCH] commit --- .../opinion/controller/transact/OpinionMineController.java | 2 +- .../opinion/controller/transact/OpinionSummaryController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/democratic/opinion/controller/transact/OpinionMineController.java b/src/main/java/com/budwk/app/zhgh/democratic/opinion/controller/transact/OpinionMineController.java index 9a24206d..1c676fbb 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/opinion/controller/transact/OpinionMineController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/opinion/controller/transact/OpinionMineController.java @@ -91,7 +91,7 @@ public class OpinionMineController { t.finishTime, t.taskParentId, t.variable taskVariable, - IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName, + IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'待提交') curTaskName, IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke, (select MAX(id) from wf_process_task where processInstanceId = ins.id and taskName = 'startTask' AND taskState in (10,20)) AS startTaskId FROM diff --git a/src/main/java/com/budwk/app/zhgh/democratic/opinion/controller/transact/OpinionSummaryController.java b/src/main/java/com/budwk/app/zhgh/democratic/opinion/controller/transact/OpinionSummaryController.java index c7131e8e..30e2ca9e 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/opinion/controller/transact/OpinionSummaryController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/opinion/controller/transact/OpinionSummaryController.java @@ -74,7 +74,7 @@ public class OpinionSummaryController { LEFT JOIN wf_process_instance ins ON ins.businessNo = info.id LEFT JOIN ( SELECT - processInstanceId,tete + processInstanceId, displayName, createdAt, ROW_NUMBER() OVER (PARTITION BY processInstanceId ORDER BY createdAt DESC) AS rn