From ba170d901087045a8e051a6b4c6a47abf7585251 Mon Sep 17 00:00:00 2001
From: "DESKTOP-J8LE24C\\cqjx" <846249920@qq.com>
Date: Thu, 29 Apr 2021 23:37:02 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=81=E7=A8=8B=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=81=E7=A8=8B=E5=9B=BE=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FlowTaskServiceImpl.java     |  8 +++----
 ruoyi-ui/src/components/Process/index.vue     |  3 ++-
 .../src/views/flowable/definition/index.vue   | 21 +++++++++++++------
 .../src/views/flowable/task/record/index.vue  |  4 ++--
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
index b0ab1c2..3af8712 100644
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
@@ -491,8 +491,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
      */
     @Override
     public AjaxResult stopProcess(FlowTaskVo flowTaskVo) {
-        Task task = taskService.createTaskQuery().processInstanceId(flowTaskVo.getInstanceId()).singleResult();
-        if (task == null) {
+        List<Task> task = taskService.createTaskQuery().processInstanceId(flowTaskVo.getInstanceId()).list();
+        if (CollectionUtils.isEmpty(task)) {
             throw new CustomException("流程未启动或已执行完成，取消申请失败");
         }
 
@@ -505,8 +505,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             List<EndEvent> endNodes = process.findFlowElementsOfType(EndEvent.class, false);
             if (CollectionUtils.isNotEmpty(endNodes)) {
                 Authentication.setAuthenticatedUserId(loginUser.getUserId().toString());
-                taskService.addComment(task.getId(), processInstance.getProcessInstanceId(), FlowComment.STOP.getType(),
-                        StringUtils.isBlank(flowTaskVo.getComment()) ? "取消申请" : flowTaskVo.getComment());
+//                taskService.addComment(task.getId(), processInstance.getProcessInstanceId(), FlowComment.STOP.getType(),
+//                        StringUtils.isBlank(flowTaskVo.getComment()) ? "取消申请" : flowTaskVo.getComment());
                 String endId = endNodes.get(0).getId();
                 List<Execution> executions =
                         runtimeService.createExecutionQuery().parentId(processInstance.getProcessInstanceId()).list();
diff --git a/ruoyi-ui/src/components/Process/index.vue b/ruoyi-ui/src/components/Process/index.vue
index 918cb4b..fca6963 100644
--- a/ruoyi-ui/src/components/Process/index.vue
+++ b/ruoyi-ui/src/components/Process/index.vue
@@ -159,7 +159,8 @@ export default {
         await this.modeler.importXML(data)
         this.adjustPalette()
         this.fitViewport()
-        if (this.taskList) {
+        if (this.taskList !==undefined && this.taskList.length > 0 ) {
+          debugger
           this.fillColor()
         }
       } catch (err) {
diff --git a/ruoyi-ui/src/views/flowable/definition/index.vue b/ruoyi-ui/src/views/flowable/definition/index.vue
index 1b3747f..97d8ca0 100644
--- a/ruoyi-ui/src/views/flowable/definition/index.vue
+++ b/ruoyi-ui/src/views/flowable/definition/index.vue
@@ -72,7 +72,7 @@
       <el-table-column label="流程编号" width="300" align="center" prop="deploymentId" />
       <el-table-column label="流程标识" align="center" prop="key" />
       <el-table-column label="流程分类" align="center" prop="category" />
-      <el-table-column label="流程名称" align="center">
+      <el-table-column label="流程名称(流程图)" align="center">
         <template slot-scope="scope">
           <el-button type="text" @click="handleReadImage(scope.row.deploymentId)">
             <span>{{ scope.row.name }}</span>
@@ -213,8 +213,9 @@
     </el-dialog>
 
     <!-- 流程图 -->
-    <el-dialog :title="readImage.title" :visible.sync="readImage.open" append-to-body>
-      <el-image :src="readImage.src"></el-image>
+    <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%" append-to-body>
+      <!-- <el-image :src="readImage.src"></el-image> -->
+       <flow :xmlData="xmlData"/>
     </el-dialog>
 
     <!--表单配置详情-->
@@ -235,15 +236,17 @@
 </template>
 
 <script>
-import { listDefinition, updateState, delDeployment, addDeployment, updateDeployment, exportDeployment, definitionStart } from "@/api/flowable/definition";
+import { listDefinition, updateState, delDeployment, addDeployment, updateDeployment, exportDeployment, definitionStart, readXml} from "@/api/flowable/definition";
 import { getToken } from "@/utils/auth";
 import { getForm, addDeployForm ,listForm } from "@/api/flowable/form";
 import Parser from '@/components/parser/Parser'
+import flow from '@/views/flowable/task/record/flow'
 
 export default {
   name: "Definition",
   components: {
-    Parser
+    Parser,
+    flow
   },
   data() {
     return {
@@ -309,6 +312,8 @@ export default {
         deployId: null
 
       },
+      // xml
+      xmlData:"",
       // 表单参数
       form: {},
       // 表单校验
@@ -380,7 +385,11 @@ export default {
     handleReadImage(deploymentId){
       this.readImage.title = "流程图";
       this.readImage.open = true;
-      this.readImage.src = process.env.VUE_APP_BASE_API + "/flowable/definition/readImage/" + deploymentId;
+      // this.readImage.src = process.env.VUE_APP_BASE_API + "/flowable/definition/readImage/" + deploymentId;
+       // 发送请求，获取xml
+      readXml(deploymentId).then(res =>{
+        this.xmlData = res.data
+      })
     },
     /** 表单查看 */
     handleForm(formId){
diff --git a/ruoyi-ui/src/views/flowable/task/record/index.vue b/ruoyi-ui/src/views/flowable/task/record/index.vue
index 6ffdc9b..960f42d 100644
--- a/ruoyi-ui/src/views/flowable/task/record/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/record/index.vue
@@ -87,8 +87,8 @@
                     <label v-if="item.assigneeName" style="font-weight: normal;margin-right: 30px;">实际办理： {{item.assigneeName}} <el-tag type="info" size="mini">{{item.deptName}}</el-tag></label>
                     <label v-if="item.candidate" style="font-weight: normal;margin-right: 30px;">候选办理： {{item.candidate}}</label>
                     <label style="font-weight: normal">接收时间： </label><label style="color:#8a909c;font-weight: normal">{{item.createTime}}</label>
-                    <label style="margin-left: 30px;font-weight: normal">办结时间： </label><label style="color:#8a909c;font-weight: normal">{{item.finishTime}}</label>
-                    <label style="margin-left: 30px;font-weight: normal">耗时： </label><label style="color:#8a909c;font-weight: normal">{{item.duration}}</label>
+                    <label v-if="item.finishTime" style="margin-left: 30px;font-weight: normal">办结时间： </label><label style="color:#8a909c;font-weight: normal">{{item.finishTime}}</label>
+                    <label v-if="item.duration" style="margin-left: 30px;font-weight: normal">耗时： </label><label style="color:#8a909c;font-weight: normal">{{item.duration}}</label>
 
                     <p  v-if="item.comment">
                       <el-tag type="success" v-if="item.comment.type === '1'">  {{item.comment.comment}}</el-tag>