From 57bedfb6044139141b8d6a9790b9c0d3990b1d1e Mon Sep 17 00:00:00 2001
From: xusd <xu13181496959@163.com>
Date: Mon, 9 Sep 2024 10:34:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/definition/BpmProcessDefinitionController.java  | 7 ++++++-
 imt-ui/src/views/bpm/model/index.vue                      | 8 ++------
 imt-ui/src/views/bpm/processInstance/create/index.vue     | 6 +-----
 imt-ui/src/views/bpm/processInstance/index.vue            | 8 ++------
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/imt-server/imt-module-bpm/imt-module-bpm-biz/src/main/java/com/inspur/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java b/imt-server/imt-module-bpm/imt-module-bpm-biz/src/main/java/com/inspur/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java
index 059fe97..c09cb94 100644
--- a/imt-server/imt-module-bpm/imt-module-bpm-biz/src/main/java/com/inspur/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java
+++ b/imt-server/imt-module-bpm/imt-module-bpm-biz/src/main/java/com/inspur/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java
@@ -19,6 +19,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import org.flowable.bpmn.model.BpmnModel;
 import org.flowable.bpmn.model.UserTask;
 import org.flowable.engine.repository.Deployment;
+import org.flowable.engine.repository.Model;
 import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -84,11 +85,15 @@ public class BpmProcessDefinitionController {
             return success(Collections.emptyList());
         }
 
+        // 获得 Category Map
+        Map<String, BpmCategoryDO> categoryMap = categoryService.getCategoryMap(
+                convertSet(list, ProcessDefinition::getCategory));
+
         // 获得 BpmProcessDefinitionInfoDO Map
         Map<String, BpmProcessDefinitionInfoDO> processDefinitionMap = processDefinitionService.getProcessDefinitionInfoMap(
                 convertSet(list, ProcessDefinition::getId));
         return success(BpmProcessDefinitionConvert.INSTANCE.buildProcessDefinitionList(
-                list, null, processDefinitionMap, null, null));
+                list, null, processDefinitionMap, null, categoryMap));
     }
 
     @GetMapping ("/get")
diff --git a/imt-ui/src/views/bpm/model/index.vue b/imt-ui/src/views/bpm/model/index.vue
index 28dde72..77afb44 100644
--- a/imt-ui/src/views/bpm/model/index.vue
+++ b/imt-ui/src/views/bpm/model/index.vue
@@ -44,11 +44,7 @@
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="流程分类" align="center" prop="category" width="100">
-        <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.category" />
-        </template>
-      </el-table-column>
+      <el-table-column label="流程分类" align="center" prop="categoryName" />
       <el-table-column label="表单信息" align="center" prop="formType" width="200">
         <template v-slot="scope">
           <el-button v-if="scope.row.formId" type="text" @click="handleFormDetail(scope.row)">
@@ -132,7 +128,7 @@
         </el-form-item>
         <el-form-item v-if="form.id" label="流程分类" prop="category">
           <el-select v-model="form.category" placeholder="请选择流程分类" clearable style="width: 100%">
-            <el-option v-for="item in categorySelect" :key="item.id" :label="item.name" :value="item.id"/>
+            <el-option v-for="item in categorySelect" :key="item.code" :label="item.name" :value="item.code"/>
           </el-select>
         </el-form-item>
         <el-form-item label="流程描述" prop="description">
diff --git a/imt-ui/src/views/bpm/processInstance/create/index.vue b/imt-ui/src/views/bpm/processInstance/create/index.vue
index df7ad1f..b321d4d 100644
--- a/imt-ui/src/views/bpm/processInstance/create/index.vue
+++ b/imt-ui/src/views/bpm/processInstance/create/index.vue
@@ -12,11 +12,7 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column label="流程分类" align="center" prop="category" width="100">
-          <template v-slot="scope">
-            <dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.category" />
-          </template>
-        </el-table-column>
+        <el-table-column label="流程分类" align="center" prop="categoryName" />
         <el-table-column label="流程版本" align="center" prop="processDefinition.version" width="80">
           <template v-slot="scope">
             <el-tag size="medium" v-if="scope.row">v{{ scope.row.version }}</el-tag>
diff --git a/imt-ui/src/views/bpm/processInstance/index.vue b/imt-ui/src/views/bpm/processInstance/index.vue
index e3b8206..c8856ea 100644
--- a/imt-ui/src/views/bpm/processInstance/index.vue
+++ b/imt-ui/src/views/bpm/processInstance/index.vue
@@ -51,14 +51,10 @@
     <el-table v-loading="loading" :data="list">
       <el-table-column label="编号" align="center" prop="id" width="320" />
       <el-table-column label="流程名" align="center" prop="name" />
-      <el-table-column label="流程分类" align="center" prop="category">
-        <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.category" />
-        </template>
-      </el-table-column>
+      <el-table-column label="流程分类" align="center" prop="categoryName"/>
       <el-table-column label="当前审批任务" align="center" prop="tasks">
         <template v-slot="scope">
-          <el-button v-for="task in scope.row.tasks" :key="task.id" type="text"">
+          <el-button v-for="task in scope.row.tasks" :key="task.id" type="text">
             <span>{{ task.name }}</span>
           </el-button>
         </template>