From ff40abd0341de5e6107240dad506aad8bb86de6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Thu, 7 Sep 2023 23:40:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml        |   2 +-
 .../service/impl/FlowTaskServiceImpl.java     |  20 +-
 .../task/myProcess/initTaskDrawer.vue         | 238 +++++++++++++++
 .../views/flowable/task/myProcess/myIndex.vue | 279 ------------------
 4 files changed, 250 insertions(+), 289 deletions(-)
 create mode 100644 ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue
 delete mode 100644 ruoyi-ui/src/views/flowable/task/myProcess/myIndex.vue

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 9b545012..6ba332ab 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -39,7 +39,7 @@ logging:
     com.ruoyi: debug
     com.yanzhu.jh: debug
     org.springframework: warn
-
+    org.flowable: debug
 # 用户配置
 user:
   password:
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 7debaee6..3513c493 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
@@ -560,15 +560,17 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 }
             } else {
                 List<HistoricTaskInstance> historicTaskInstance = historyService.createHistoricTaskInstanceQuery().processInstanceId(hisIns.getId()).orderByHistoricTaskInstanceEndTime().desc().list();
-                flowTask.setTaskId(historicTaskInstance.get(0).getId());
-                flowTask.setTaskName(historicTaskInstance.get(0).getName());
-                if (StringUtils.isNotBlank(historicTaskInstance.get(0).getAssignee())) {
-                    // 当前任务节点办理人信息
-                    SysUser sysUser = sysUserService.selectUserById(Long.parseLong(historicTaskInstance.get(0).getAssignee()));
-                    if (Objects.nonNull(sysUser)) {
-                        flowTask.setAssigneeId(sysUser.getUserId());
-                        flowTask.setAssigneeName(sysUser.getNickName());
-                        flowTask.setAssigneeDeptName(Objects.nonNull(sysUser.getDept()) ? sysUser.getDept().getDeptName() : "");
+                if(CollectionUtils.isNotEmpty(historicTaskInstance)){
+                    flowTask.setTaskId(historicTaskInstance.get(0).getId());
+                    flowTask.setTaskName(historicTaskInstance.get(0).getName());
+                    if (StringUtils.isNotBlank(historicTaskInstance.get(0).getAssignee())) {
+                        // 当前任务节点办理人信息
+                        SysUser sysUser = sysUserService.selectUserById(Long.parseLong(historicTaskInstance.get(0).getAssignee()));
+                        if (Objects.nonNull(sysUser)) {
+                            flowTask.setAssigneeId(sysUser.getUserId());
+                            flowTask.setAssigneeName(sysUser.getNickName());
+                            flowTask.setAssigneeDeptName(Objects.nonNull(sysUser.getDept()) ? sysUser.getDept().getDeptName() : "");
+                        }
                     }
                 }
             }
diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue b/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue
new file mode 100644
index 00000000..ffa99d17
--- /dev/null
+++ b/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue
@@ -0,0 +1,238 @@
+<template>
+  <div class="app-container">
+    <el-drawer
+      v-if="onOpen"
+      :visible.sync="onOpen"
+      ref="drawer"
+      direction="rtl"
+      size="60%"
+      @close="closeCallBack"
+      style="padding-left: 20px; padding-right: 20px"
+    >
+      <template slot="title">
+        <div>工程管理 【{{ title }}】</div>
+      </template>
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        v-loading="loading"
+        label-width="120px"
+        style="padding-right: 35px"
+      >
+        <div class="canvas" ref="flowCanvas"></div>
+        <div class="maskLayer" />
+        <el-form-item label="所属项目" prop="businessKey">
+          <el-select
+            v-model="form.businessKey"
+            placeholder="请选择所属项目"
+            style="width: 100%"
+            filterable
+            :disabled="disPro"
+            @change="projectChage"
+          >
+            <el-option
+              v-for="(item, index) in projectOptions"
+              :key="index"
+              :label="item.projectName"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="发起单位">
+          {{ deptName }}
+        </el-form-item>
+        <el-form-item label="发起人">
+          {{ nickName }}
+        </el-form-item>
+        <el-form-item label="审批事项">
+          {{ title }}
+        </el-form-item>
+        <el-form-item label="审批内容" prop="files">
+          <FileUpload
+            @input="fileInput"
+            :limit="9"
+            :fileType="['pdf', 'png', 'jpg', 'jpeg', 'doc', 'docx', 'xls', 'xlsx']"
+          />
+        </el-form-item>
+        <el-form-item label="申请说明" prop="remark">
+          <el-input
+            type="textarea"
+            v-model="form.remark"
+            placeholder="请输入申请说明"
+            rows="5"
+          />
+        </el-form-item>
+      </el-form>
+      <div style="text-align: center">
+        <el-button type="primary" @click="submitForm">提交流程</el-button>
+        <el-button @click="doCanel">取 消</el-button>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import store from "@/store";
+import { definitionStart, flowXmlAndNode } from "@/api/flowable/definition";
+import { CustomViewer as BpmnViewer } from "@/components/customBpmn";
+import { getNextFlowNodeByStart } from "@/api/flowable/todo";
+
+export default {
+  components: {},
+  props: {
+    closeCallBack: {
+      type: Function,
+    },
+  },
+  data() {
+    return {
+      // 抽屉层
+      onOpen: false,
+      // 遮罩层
+      loading: false,
+      // 标题
+      title: "",
+      // 表单参数
+      form: {
+        businessKey: "",
+        projectName: "",
+        files: "",
+        remark: "",
+      },
+      // 表单校验
+      rules: {
+        businessKey: [{ required: true, message: "请选择所属项目", trigger: "blur" }],
+        files: [{ required: true, message: "请上传申请内容", trigger: "blur" }],
+        remark: [
+          { required: false, message: "请输入申请说明", trigger: "blur" },
+          {
+            max: 500,
+            message: "申请说明最多输入500字",
+            trigger: "blur",
+          },
+        ],
+      },
+      projectOptions: null,
+      deptName: null,
+      nickName: null,
+      disPro: false,
+      bpmnViewer: null,
+      options: null,
+      taskTitle: null,
+      taskOpen: false,
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {},
+  beforeDestroy() {},
+  methods: {
+    // 查询和我相关的项目信息
+    initMyProject() {
+      // 获取项目列表的接口
+      this.$api.publics.getMyProjectList({}).then((response) => {
+        this.projectOptions = response.rows;
+        if (response.rows.length == 0) {
+          this.$message.error("未查询到和您关联项目，请联系子公司或管理员...");
+        } else if (response.rows.length == 1) {
+          // 这里只有一个项目，默认选中并只读
+          this.form.businessKey = response.rows[0].id;
+          this.form.projectName = response.rows[0].projectName;
+        }
+      });
+    },
+    // 项目选择
+    projectChage(val) {
+      let projectName = "";
+      this.projectOptions.forEach((item) => {
+        if ((item.id = val)) {
+          projectName = item.projectName;
+          return;
+        }
+      });
+      this.form.projectName = projectName;
+    },
+    doCanel() {
+      this.onOpen = false;
+    },
+    show(options) {
+      console.log(options);
+      this.options = options;
+      this.initMyProject();
+      this.title = options.name;
+      this.deptName = store.getters.dept.deptName;
+      this.nickName = store.getters.name;
+      const self = this;
+      this.onOpen = true;
+      flowXmlAndNode({ deployId: options.deploymentId }).then((res) => {
+        this.initFlowImage(res.data.xmlData);
+      });
+    },
+    async initFlowImage(data) {
+      try {
+        self.bpmnViewer = new BpmnViewer({
+          container: this.$refs.flowCanvas,
+          height: "150px",
+        });
+        await self.bpmnViewer.importXML(data);
+        // 自适应
+        self.bpmnViewer.get("canvas").zoom("fit-viewport", "auto");
+      } catch (err) {
+        console.error(err.message, err.warnings);
+      }
+    },
+    fileInput(files) {
+      let fileUrls = "";
+      if (files.length > 0) {
+        fileUrls = "";
+        files.forEach((item) => {
+          fileUrls += "," + item.url;
+        });
+        fileUrls = fileUrls.substring(1);
+      }
+      this.form.files = fileUrls;
+    },
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          this.loading = true;
+          // 根据当前任务或者流程设计配置的下一步节点 todo 暂时未涉及到考虑网关、表达式和多节点情况
+          // getNextFlowNodeByStart({
+          //   deploymentId: this.options.deploymentId,
+          //   variables: this.form,
+          // }).then((res) => {
+          //   const data = res.data;
+          //   if (data) {
+          //     console.log(data);
+          //     this.loading = false;
+          //   }
+          // });
+          // 启动流程并将表单数据加入流程变量
+
+          definitionStart(this.options.id, JSON.stringify(this.form)).then((res) => {
+            this.$modal.msgSuccess(res.msg);
+            this.loading = false;
+            //关闭并刷新列表
+            this.$refs.drawer.closeDrawer();
+          });
+        }
+      });
+    },
+  },
+};
+</script>
+<style>
+.bjs-powered-by {
+  display: none !important;
+}
+.maskLayer {
+  width: 100%;
+  height: 150px;
+  position: absolute;
+  z-index: 9999;
+  top: 66px;
+}
+</style>
diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/myIndex.vue b/ruoyi-ui/src/views/flowable/task/myProcess/myIndex.vue
deleted file mode 100644
index 6ee6d5a0..00000000
--- a/ruoyi-ui/src/views/flowable/task/myProcess/myIndex.vue
+++ /dev/null
@@ -1,279 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-card
-      class="box-card"
-      v-for="dict in dict.type.sys_process_category"
-      :key="dict.value"
-    >
-      <div slot="header" class="clearfix">
-        <span>{{ dict.label }}</span>
-      </div>
-      <div :key="o" class="text item">
-        {{ "列表内容 " + o }}
-      </div>
-    </el-card>
-  </div>
-</template>
-
-<script>
-import {
-  getDeployment,
-  delDeployment,
-  addDeployment,
-  updateDeployment,
-  exportDeployment,
-  flowRecord,
-} from "@/api/flowable/finished";
-import { myProcessList, stopProcess } from "@/api/flowable/process";
-import { listDefinition } from "@/api/flowable/definition";
-export default {
-  name: "Deploy",
-  dicts: ["sys_process_category"],
-  components: {},
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      processLoading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      processTotal: 0,
-      // 我发起的流程列表数据
-      myProcessList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      src: "",
-      definitionList: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        name: null,
-        category: null,
-        key: null,
-        tenantId: null,
-        deployTime: null,
-        derivedFrom: null,
-        derivedFromRoot: null,
-        parentDeploymentId: null,
-        engineVersion: null,
-      },
-      // 查询参数
-      queryProcessParams: {
-        pageNum: 1,
-        pageSize: 10,
-        name: null,
-        category: null,
-        key: null,
-        tenantId: null,
-        deployTime: null,
-        derivedFrom: null,
-        derivedFromRoot: null,
-        parentDeploymentId: null,
-        engineVersion: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {},
-      processCategoryList: [],
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询流程定义列表 */
-    getList() {
-      this.loading = true;
-      myProcessList(this.queryParams).then((response) => {
-        this.myProcessList = response.data.records;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        name: null,
-        category: null,
-        key: null,
-        tenantId: null,
-        deployTime: null,
-        derivedFrom: null,
-        derivedFromRoot: null,
-        parentDeploymentId: null,
-        engineVersion: null,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 搜索按钮操作 */
-    handleProcessQuery() {
-      this.queryProcessParams.pageNum = 1;
-      this.listDefinition();
-    },
-    /** 重置按钮操作 */
-    resetProcessQuery() {
-      this.resetForm("queryProcessForm");
-      this.handleProcessQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.procInsId);
-      this.single = selection.length !== 1;
-      this.multiple = !selection.length;
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.open = true;
-      this.title = "发起流程";
-      this.listDefinition();
-    },
-    listDefinition() {
-      listDefinition(this.queryProcessParams).then((response) => {
-        this.definitionList = response.data.records;
-        this.processTotal = response.data.total;
-        this.processLoading = false;
-      });
-    },
-    /**  发起流程申请 */
-    handleStartProcess(row) {
-      this.$router.push({
-        path: "/flowable/task/myProcess/send/index",
-        query: {
-          deployId: row.deploymentId,
-          procDefId: row.id,
-        },
-      });
-    },
-    /**  取消流程申请 */
-    handleStop(row) {
-      const params = {
-        instanceId: row.procInsId,
-      };
-      stopProcess(params).then((res) => {
-        this.$modal.msgSuccess(res.msg);
-        this.getList();
-      });
-    },
-    /** 流程流转记录 */
-    handleFlowRecord(row) {
-      this.$router.push({
-        path: "/flowable/task/myProcess/detail/index",
-        query: {
-          procInsId: row.procInsId,
-          deployId: row.deployId,
-          taskId: row.taskId,
-        },
-      });
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids;
-      getDeployment(id).then((response) => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改流程定义";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateDeployment(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addDeployment(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.procInsId || this.ids; // 暂不支持删除多个流程
-      this.$confirm('是否确认删除流程定义编号为"' + ids + '"的数据项?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          return delDeployment(ids);
-        })
-        .then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm("是否确认导出所有流程定义数据项?", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          return exportDeployment(queryParams);
-        })
-        .then((response) => {
-          this.download(response.msg);
-        });
-    },
-  },
-};
-</script>
-<style>
-.text {
-  font-size: 14px;
-}
-.item {
-  margin-bottom: 18px;
-}
-.clearfix:before,
-.clearfix:after {
-  display: table;
-  content: "";
-}
-.clearfix:after {
-  clear: both;
-}
-.box-card {
-  width: 28%;
-  margin-left: 3%;
-}
-</style>