From f9869e213ee452fe6dd370a7d85c9e0c5ffd5099 Mon Sep 17 00:00:00 2001
From: bawei <95887577@qq.com>
Date: Fri, 21 Apr 2023 08:51:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E5=8A=9E=E4=BA=8B=E5=AE=9C=E5=8A=A0?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/workflow/engine/FlowTaskMapper.xml    | 2 +-
 .../main/java/jnpf/engine/model/flowtask/FlowTaskListModel.java | 1 +
 SC-web/src/views/workFlow/flowDone/index.vue                    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/SC-boot/linkage-admin/src/main/resources/mapper/workflow/engine/FlowTaskMapper.xml b/SC-boot/linkage-admin/src/main/resources/mapper/workflow/engine/FlowTaskMapper.xml
index cae1eebd..d65a4b5c 100644
--- a/SC-boot/linkage-admin/src/main/resources/mapper/workflow/engine/FlowTaskMapper.xml
+++ b/SC-boot/linkage-admin/src/main/resources/mapper/workflow/engine/FlowTaskMapper.xml
@@ -50,7 +50,7 @@
     <select id="getTrialList" parameterType="map" resultMap="FlowTask">
         SELECT  r.F_Id AS F_Id, t.F_ProcessId, t.F_EnCode,t.F_StartTime, t.F_FullName, t.F_FlowUrgent, t.F_FlowId , t.F_FlowCode , t.F_FlowName,
         t.F_FlowCategory, t.F_EndTime, r.F_NodeName AS F_ThisStep, r.F_TaskNodeId AS F_ThisStepId, r.F_HandleStatus AS F_Status,
-        t.F_Completion, t.F_CreatorUserId, r.F_HandleTime AS F_CreatorTime, t.F_LastModifyUserId, t.F_LastModifyTime FROM flow_task t left join
+        t.F_Completion, t.F_CreatorUserId, r.F_HandleTime AS F_CreatorTime, t.F_LastModifyUserId,t.F_Description paymentDescription, t.F_LastModifyTime  FROM flow_task t left join
         flow_taskoperatorrecord r on r.F_TaskId = t.F_Id WHERE 1=1 AND r.F_Status &lt;2  AND (r.F_HandleStatus = 0 OR r.F_HandleStatus = 1) AND r.F_TaskOperatorId is not null
         AND r.F_HandleId = #{map.handleId} ${map.sql}
     </select>
diff --git a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/model/flowtask/FlowTaskListModel.java b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/model/flowtask/FlowTaskListModel.java
index 96d50d0b..4b387ee1 100644
--- a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/model/flowtask/FlowTaskListModel.java
+++ b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/model/flowtask/FlowTaskListModel.java
@@ -43,4 +43,5 @@ public class FlowTaskListModel {
     private String flowVersion;
     private Integer taskStatus;
     private String paymentDescription;
+
 }
diff --git a/SC-web/src/views/workFlow/flowDone/index.vue b/SC-web/src/views/workFlow/flowDone/index.vue
index 2525ca08..37b56313 100644
--- a/SC-web/src/views/workFlow/flowDone/index.vue
+++ b/SC-web/src/views/workFlow/flowDone/index.vue
@@ -71,6 +71,7 @@
         </div>
         <JNPF-table v-loading="listLoading" :data="list">
           <el-table-column prop="fullName" label="流程标题" show-overflow-tooltip min-width="150" />
+          <el-table-column prop="paymentDescription" label="流程描述" min-width="200" />
           <el-table-column prop="flowName" label="所属流程" width="130" />
           <el-table-column prop="startTime" label="发起时间" width="130"
             :formatter="jnpf.tableDateFormat" />