瀏覽代碼

add 添加流程版本

gssong 1 年之前
父節點
當前提交
cbc1030043

+ 1 - 1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java

@@ -41,7 +41,7 @@ public class ProcessInstanceVo implements Serializable {
     /**
      * 流程定义版本
      */
-    private String processDefinitionVersion;
+    private Integer processDefinitionVersion;
 
     /**
      * 部署id

+ 5 - 0
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java

@@ -141,6 +141,11 @@ public class TaskVo implements Serializable {
      */
     private String processDefinitionKey;
 
+    /**
+     * 流程定义版本
+     */
+    private Integer processDefinitionVersion;
+
     /**
      * 参与者
      */

+ 1 - 0
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java

@@ -339,6 +339,7 @@ public class ActTaskServiceImpl implements IActTaskService {
                         taskVo.setBusinessStatusName(BusinessStatusEnum.findByStatus(taskVo.getBusinessStatus()));
                         taskVo.setProcessDefinitionKey(e.getProcessDefinitionKey());
                         taskVo.setProcessDefinitionName(e.getProcessDefinitionName());
+                        taskVo.setProcessDefinitionVersion(e.getProcessDefinitionVersion());
                         taskVo.setBusinessKey(e.getBusinessKey());
                     });
                 }

+ 6 - 3
ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml

@@ -36,7 +36,8 @@
                      AHP.BUSINESS_STATUS_,
                      AHP.BUSINESS_KEY_,
                      ARP.NAME_ AS processDefinitionName,
-                     ARP.KEY_  AS processDefinitionKey
+                     ARP.KEY_  AS processDefinitionKey,
+                     ARP.VERSION_  AS processDefinitionVersion
               FROM ACT_RU_TASK RES
                        INNER JOIN ACT_HI_PROCINST AHP ON RES.PROC_INST_ID_ = AHP.PROC_INST_ID_
                        INNER JOIN ACT_RE_PROCDEF ARP ON ARP.ID_ = RES.PROC_DEF_ID_
@@ -50,7 +51,8 @@
                      AHP.BUSINESS_STATUS_,
                      AHP.BUSINESS_KEY_,
                      ARP.NAME_ AS processDefinitionName,
-                     ARP.KEY_  AS processDefinitionKey
+                     ARP.KEY_  AS processDefinitionKey,
+                     ARP.VERSION_  AS processDefinitionVersion
               FROM ACT_HI_TASKINST HTI
                        INNER JOIN ACT_HI_PROCINST AHP ON HTI.PROC_INST_ID_ = AHP.PROC_INST_ID_
                        INNER JOIN ACT_RE_PROCDEF ARP ON ARP.ID_ = HTI.PROC_DEF_ID_
@@ -64,7 +66,8 @@
                      AHP.BUSINESS_STATUS_,
                      AHP.BUSINESS_KEY_,
                      ARP.NAME_ as processDefinitionName,
-                     ARP.KEY_  as processDefinitionKey
+                     ARP.KEY_  as processDefinitionKey,
+                     ARP.VERSION_  AS processDefinitionVersion
               FROM ACT_HI_TASKINST AHT
                        INNER JOIN ACT_HI_PROCINST AHP ON AHT.PROC_INST_ID_ = AHP.PROC_INST_ID_
                        INNER JOIN ACT_RE_PROCDEF ARP ON ARP.ID_ = AHT.PROC_DEF_ID_