From 044801589937ad983c4def33ecb0f6e4b6672a2b Mon Sep 17 00:00:00 2001
From: zhouhefeng <zhouhefeng915@163.com>
Date: Fri, 13 Mar 2026 08:57:09 +0800
Subject: [PATCH] commit

---
 .../flow/controller/FlowCommonController.java   | 12 ++++++++----
 .../views/platform/flow/define/preview.html     | 17 +++++++++++++----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/budwk/app/flow/controller/FlowCommonController.java b/src/main/java/com/budwk/app/flow/controller/FlowCommonController.java
index a81d466..7cbd8d7 100644
--- a/src/main/java/com/budwk/app/flow/controller/FlowCommonController.java
+++ b/src/main/java/com/budwk/app/flow/controller/FlowCommonController.java
@@ -4,6 +4,8 @@ import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.base.vo.LabelValueVO;
 import com.budwk.app.flow.constant.FlowConst;
@@ -12,10 +14,7 @@ import com.budwk.app.flow.engine.event.ProcessEvent;
 import com.budwk.app.flow.engine.event.ProcessPublisher;
 import com.budwk.app.flow.engine.model.ProcessModel;
 import com.budwk.app.flow.engine.model.TaskModel;
-import com.budwk.app.flow.entity.Candidate;
-import com.budwk.app.flow.entity.ProcessDefine;
-import com.budwk.app.flow.entity.ProcessInstance;
-import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.entity.*;
 import com.budwk.app.flow.enums.ProcessEventTypeEnum;
 import com.budwk.app.flow.enums.ProcessInstanceStateEnum;
 import com.budwk.app.flow.enums.ProcessTaskPerformTypeEnum;
@@ -158,6 +157,11 @@ public class FlowCommonController {
             if (vo.getTaskState().equals(ProcessTaskStateEnum.FINISHED.getCode()) && StrUtil.isNotBlank(vo.getOperator())) {
 
             }
+            if(vo.getTaskState().equals(ProcessTaskStateEnum.DOING.getCode())) {
+                List<ProcessTaskActor> taskActorList = dao.query(ProcessTaskActor.class, Cnd.where(ProcessTaskActor::getProcessTaskId, "=", processTask.getId()));
+                List<JSONObject> list = JSONUtil.toList(JSONUtil.toJsonStr(taskActorList), JSONObject.class);
+                vo.setTaskActorList(list);
+            }
 
             res.add(vo);
         });
diff --git a/src/main/resources/views/platform/flow/define/preview.html b/src/main/resources/views/platform/flow/define/preview.html
index b5bdbf7..41d1734 100644
--- a/src/main/resources/views/platform/flow/define/preview.html
+++ b/src/main/resources/views/platform/flow/define/preview.html
@@ -187,6 +187,9 @@
                     <span class="info-value" v-if="currentNode.id === 'startTask'">
                                 {{approvalInfo.ext?.initiatorName}}({{approvalInfo.ext?.initiatorAccount}})
                             </span>
+                    <span class="info-value" v-else-if="approvalInfo.taskState === 10">
+                        {{ approvalInfo.taskActorList.map(u => u.actorName + '(' + u.actorAccount + ')').join('、') }}
+                    </span>
                     <span class="info-value"
                           v-else>{{approvalInfo.taskFormData.userName}}({{approvalInfo.taskFormData?.loginName}})</span>
                 </div>
@@ -196,16 +199,22 @@
                 </div>
                 <div class="info-row">
                     <span class="info-label">提交结果：</span>
-                    <span class="info-value">{{getSubmitTypeText(approvalInfo.ext.submitType)}}</span>
+                    <span class="info-value" v-if="approvalInfo.taskState !== 10">
+                        {{getSubmitTypeText(approvalInfo.ext.submitType)}}
+                    </span>
+                    <span class="info-value" v-else>
+                        暂未处理
+                    </span>
                 </div>
                 <div class="info-row">
                     <span class="info-label">提交意见：</span>
-                    <span class="info-value">{{approvalInfo.taskFormData.opinion}}</span>
+                    <span class="info-value" v-if="approvalInfo.taskState !== 10">{{approvalInfo.taskFormData.opinion}}</span>
+                    <span class="info-value" v-else>暂未处理</span>
                 </div>
                 <!--                    <div class="divider"></div>-->
                 <div class="info-row">
                     <span class="info-label">提交时间：</span>
-                    <span class="info-value">{{approvalInfo.finishTime}}</span>
+                    <span class="info-value">{{approvalInfo.finishTime || '暂未处理'}}</span>
                 </div>
             </div>
         </div>
@@ -290,7 +299,7 @@
 
                         if (data.type !== "snaker:task") return
 
-                        const approvalInfos = this.hisApproval.filter((item) => item.taskName === data.id && item.taskState === 20)
+                        const approvalInfos = this.hisApproval.filter((item) => item.taskName === data.id && [10, 20].includes(item.taskState))
 
                         if (approvalInfos && approvalInfos.length > 0) {
                             this.approvalInfos = approvalInfos