1通过表单id获取流程节点信息

2修改设备审批流程，取消申请确认

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowTaskController.java

@@ -238,6 +238,17 @@ public class FlowTaskController {
         return flowTaskService.flowXmlAndNode(procInsId, deployId);
     }
 
+    /**
+     * 通过表单id获取流程节点信息
+     *
+     * @param formId 表单id
+     * @return
+     */
+    @GetMapping("/flowXmlAndNodeByFormId")
+    public AjaxResult flowXmlAndNodeByFormId(String formId) {
+        return flowTaskService.flowXmlAndNodeByFormId(formId);
+    }
+
     /**
      * 流程节点表单
      *

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowTaskService.java

@@ -208,6 +208,13 @@ public interface IFlowTaskService {
      */
     AjaxResult flowXmlAndNode(String procInsId,String deployId);
 
+    /**
+     * 通过表单id获取流程节点信息
+     * @param formId
+     * @return
+     */
+    AjaxResult flowXmlAndNodeByFormId(String formId);
+
     /**
      * 流程节点表单
      * @param taskId 流程任务编号

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -27,7 +27,10 @@ import com.ruoyi.flowable.flow.FlowableUtils;
 import com.ruoyi.flowable.service.IFlowTaskService;
 import com.ruoyi.flowable.service.ISysDeployFormService;
 import com.ruoyi.flowable.service.ISysFormService;
+import com.ruoyi.system.domain.FlowVarInst;
 import com.ruoyi.system.domain.SysForm;
+import com.ruoyi.system.mapper.FlowDeployMapper;
+import com.ruoyi.system.mapper.FlowVarInstMapper;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
@@ -87,6 +90,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     private ISysDeployFormService sysInstanceFormService;
     @Resource
     private ISysFormService sysFormService;
+    @Resource
+    private FlowVarInstMapper flowVarInstMapper;
 
     /**
      * 完成任务
@@ -1377,6 +1382,22 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         }
     }
 
+    /**
+     * 通过表单id获取流程节点信息
+     *
+     * @param formId
+     * @return
+     */
+    @Override
+    public AjaxResult flowXmlAndNodeByFormId(String formId) {
+        FlowVarInst flowVarInst =  flowVarInstMapper.selectProcInstByVar(formId);
+        String procInsId = flowVarInst.getProcInstId();
+        String deployId = "";
+        AjaxResult ajaxResult = new AjaxResult();
+        ajaxResult = flowXmlAndNode(procInsId, deployId);
+        return ajaxResult;
+    }
+
     /**
      * 流程节点表单
      *

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/FlowVarinst.java

@@ -0,0 +1,66 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 流程变量对象 act_hi_varinst
+ *
+ * @author cmc
+ * @date 2024-07-26
+ */
+public class FlowVarInst extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 流程实例id */
+    @Excel(name = "流程实例id")
+    private String procInstId;
+
+    /** 变量名 */
+    @Excel(name = "变量名")
+    private String name;
+
+    /** 变量值 */
+    @Excel(name = "变量值")
+    private String text;
+
+    public void setProcInstId(String procInstId)
+    {
+        this.procInstId = procInstId;
+    }
+
+    public String getProcInstId()
+    {
+        return procInstId;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setText(String text)
+    {
+        this.text = text;
+    }
+
+    public String getText()
+    {
+        return text;
+    }
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("procInstId", getProcInstId())
+                .append("name", getName())
+                .append("text", getText())
+                .append("createTime", getCreateTime())
+                .toString();
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FlowVarInstMapper.java

@@ -0,0 +1,21 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.FlowVarInst;
+
+/**
+ * 流程变量Mapper接口
+ *
+ * @author cmc
+ * @date 2024-07-26
+ */
+public interface FlowVarInstMapper
+{
+    /**
+     * 通过变量值查询流程实例id
+     *
+     * @param formId 表单id
+     * @return 流程变量
+     */
+    public FlowVarInst selectProcInstByVar(String formId);
+
+}

oa-back/ruoyi-system/src/main/resources/mapper/flowable/FlowVarInstMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.FlowVarInstMapper">
+
+    <resultMap type="FlowVarInst" id="FlowVarInstResult">
+        <result property="procInstId"    column="PROC_INST_ID_"    />
+        <result property="name"    column="NAME_"    />
+        <result property="text"    column="TEXT_"    />
+    </resultMap>
+
+    <sql id="selectFlowVarInstVo">
+        select PROC_INST_ID_, NAME_, TEXT_ from act_hi_varinst
+    </sql>
+
+    <select id="selectProcInstByVar" parameterType="FlowVarInst" resultMap="FlowVarInstResult">
+        <include refid="selectFlowVarInstVo"/>
+        <where>
+            NAME_ = 'formId' and TEXT_ = #{param}
+        </where>
+    </select>
+
+</mapper>

oa-ui/src/views/flowable/form/oa/deviceForm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-07 13:44:39
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-25 14:05:49
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-07-26 13:54:55
 -->
 
 <template>
@@ -185,8 +185,7 @@
               <el-button type="primary" @click="submit">提交申请</el-button>
             </el-row>
             <el-row style="text-align: center;" v-else>
-              <el-button type="primary" @click="completeApply" v-if="taskName">{{ taskName == '申请确认' ? "确认" : "完成审批"
-                }}</el-button>
+              <el-button type="primary" @click="completeApply" v-if="taskName">完成审批</el-button>
             </el-row>
           </div>
         </el-card>
@@ -453,11 +452,6 @@ export default {
           });
         })
       } else if (this.taskName == '分管审核') {
-        complete(this.taskForm).then(response => {
-          this.$modal.msgSuccess(response.msg);
-          this.$emit('goBack')
-        });
-      } else if (this.taskName == '申请确认') {
         getUserByRole({ roleId: 4 }).then(result => {
           this.$set(this.taskForm.variables, "approval", result.data[0]);
           complete(this.taskForm).then(response => {
@@ -531,9 +525,9 @@ export default {
     showFormItem(name) {
       let isShow = false;
       if (name == '分管审核')
-        isShow = (this.taskName == '设备申请' || this.taskName == '安排设备' || this.taskName == '分管审核') || ((this.taskName == '申请确认' || this.taskName == '归还确认') && this.form.managerUserId != null);
+        isShow = (this.taskName == '设备申请' || this.taskName == '安排设备' || this.taskName == '分管审核') || (this.taskName == '归还确认' && this.form.managerUserId != null);
       else if (name == '分管审核签名')
-        isShow = this.taskName == '分管审核' || ((this.taskName == '安排设备' || this.taskName == '申请确认' || this.taskName == '归还确认') && this.form.managerUserId != null);
+        isShow = this.taskName == '分管审核' || ((this.taskName == '安排设备' || this.taskName == '归还确认') && this.form.managerUserId != null);
       return isShow;
     },
     confirmProject(val) {