From a5c6e406747e31e016f323205cf066aec9f050a1 Mon Sep 17 00:00:00 2001
From: 17602169347 <h17602169347@163.com>
Date: Mon, 17 Apr 2023 09:44:33 +0800
Subject: [PATCH] =?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 +-
 .../java/jnpf/engine/model/flowbefore/FlowBeforeListVO.java     | 2 ++
 .../main/java/jnpf/engine/model/flowtask/FlowTaskListModel.java | 1 +
 .../java/jnpf/engine/service/impl/FlowTaskNewServiceImpl.java   | 1 +
 .../main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java | 2 +-
 SC-web/src/views/workFlow/flowTodo/index.vue                    | 1 +
 6 files changed, 7 insertions(+), 2 deletions(-)

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 df798bd3..cae1eebd 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
@@ -64,7 +64,7 @@
     <select id="getWaitList" parameterType="String" resultMap="WaitList">
         SELECT o.F_Id AS F_Id, t.F_ProcessId, t.F_EnCode, t.F_FullName, t.F_FlowUrgent, t.F_FlowId , t.F_FlowCode ,t.F_FlowName, t.F_FlowCategory,
         t.F_StartTime, t.F_EndTime, t.F_ThisStep, n.F_Id as F_ThisStepId, t.F_Status, t.F_Completion, t.F_CreatorUserId, o.F_CreatorTime, o.F_HandleId, t.F_LastModifyUserId,
-        t.F_LastModifyTime, n.F_NodePropertyJson,o.F_Description,o.F_NodeName,t.F_FlowVersion FROM flow_taskoperator o left join flow_task t on o.F_TaskId = t.F_Id left join flow_tasknode n on o.F_TaskNodeId = n.F_Id
+        t.F_LastModifyTime, n.F_NodePropertyJson,o.F_Description,t.F_Description paymentDescription,o.F_NodeName,t.F_FlowVersion FROM flow_taskoperator o left join flow_task t on o.F_TaskId = t.F_Id left join flow_tasknode n on o.F_TaskNodeId = n.F_Id
         WHERE 1=1 AND o.F_Completion = 0 AND t.F_Status = 1 AND o.F_State = '0'  ${sql}
     </select>
 
diff --git a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/model/flowbefore/FlowBeforeListVO.java b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/model/flowbefore/FlowBeforeListVO.java
index fc85aa99..8dcdcdc3 100644
--- a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/model/flowbefore/FlowBeforeListVO.java
+++ b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/model/flowbefore/FlowBeforeListVO.java
@@ -55,4 +55,6 @@ public class FlowBeforeListVO {
     @ApiModelProperty(value = "版本")
     private String flowVersion;
 
+    @ApiModelProperty(value = "付款申请描述")
+    private String paymentDescription;
 }
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 f5950972..96d50d0b 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
@@ -42,4 +42,5 @@ public class FlowTaskListModel {
     private String description;
     private String flowVersion;
     private Integer taskStatus;
+    private String paymentDescription;
 }
diff --git a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskNewServiceImpl.java b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskNewServiceImpl.java
index ab444887..b8358a6e 100644
--- a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskNewServiceImpl.java
+++ b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskNewServiceImpl.java
@@ -1382,6 +1382,7 @@ public class FlowTaskNewServiceImpl implements FlowTaskNewService {
         taskEntity.setFlowType(engine.getType());
         taskEntity.setFlowCategory(engine.getCategory());
         taskEntity.setFlowForm(engine.getFormData());
+        taskEntity.setDescription(flowModel.getFormData().get("documentNo") + "-" + flowModel.getFormData().get("num") + "-" + flowModel.getFormData().get("ramount").toString());
         taskEntity.setFlowTemplateJson(engine.getFlowTemplateJson());
         taskEntity.setFlowVersion(engine.getVersion());
         taskEntity.setStatus(FlowStatusEnum.save.getMessage().equals(flowModel.getStatus()) ? FlowTaskStatusEnum.Draft.getCode() : FlowTaskStatusEnum.Handle.getCode());
diff --git a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java
index dcfe7097..05c00f9c 100644
--- a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java
+++ b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java
@@ -222,7 +222,7 @@ public class FlowTaskServiceImpl extends ServiceImpl<FlowTaskMapper, FlowTaskEnt
         //关键字（流程名称、流程编码）
         String keyWord = paginationFlowTask.getKeyword() != null ? paginationFlowTask.getKeyword() : null;
         if (!StringUtils.isEmpty(keyWord)) {
-            dbSql.append(" AND (t.F_EnCode like '%" + keyWord + "%' or t.F_FullName like '%" + keyWord + "%') ");
+            dbSql.append(" AND (t.F_EnCode like '%" + keyWord + "%' or t.F_FullName like '%" + keyWord + "%' or t.F_Description like '%" + keyWord + "%') ");
         }
         //日期范围（近7天、近1月、近3月、自定义）
         String startTime = paginationFlowTask.getStartTime() != null ? paginationFlowTask.getStartTime() : null;
diff --git a/SC-web/src/views/workFlow/flowTodo/index.vue b/SC-web/src/views/workFlow/flowTodo/index.vue
index 24195232..59f48fff 100644
--- a/SC-web/src/views/workFlow/flowTodo/index.vue
+++ b/SC-web/src/views/workFlow/flowTodo/index.vue
@@ -73,6 +73,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" />