流程重新发起

@@ -165,6 +165,8 @@ public class TblContractController extends BaseController {
                 TblBusinessWorkflowBo tblBusinessWorkflowBo = new TblBusinessWorkflowBo();
                 TblBusinessWorkflowBo tblBusinessWorkflowBo = new TblBusinessWorkflowBo();
                 tblBusinessWorkflowBo.setBusinessId(id);
                 tblBusinessWorkflowBo.setBusinessId(id);
                 tblBusinessWorkflowBo.setProcInsId(processInstance.getProcessInstanceId());
                 tblBusinessWorkflowBo.setProcInsId(processInstance.getProcessInstanceId());
+                tblBusinessWorkflowBo.setProcDefId(procDefId);
+                tblBusinessWorkflowBo.setDeployId(processInstance.getDeploymentId());
                 TableName table = TblContract.class.getAnnotation(TableName.class);
                 TableName table = TblContract.class.getAnnotation(TableName.class);
                 tblBusinessWorkflowBo.setTableName(table.value());
                 tblBusinessWorkflowBo.setTableName(table.value());
                 iTblBusinessWorkflowService.insertByBo(tblBusinessWorkflowBo);
                 iTblBusinessWorkflowService.insertByBo(tblBusinessWorkflowBo);

@@ -34,6 +34,14 @@ public class TblBusinessWorkflow extends BaseEntity {
      *
      *
      */
      */
     private String procInsId;
     private String procInsId;
+    /**
+     *
+     */
+    private String procDefId;
+    /**
+     *
+     */
+    private String deployId;
 
 
     /**
     /**
      *
      *

@@ -38,6 +38,18 @@ public class TblBusinessWorkflowBo extends BaseEntity {
      */
      */
     @NotBlank(message = "不能为空", groups = { EditGroup.class })
     @NotBlank(message = "不能为空", groups = { EditGroup.class })
     private String procInsId;
     private String procInsId;
+
+    /**
+     *
+     */
+    @NotBlank(message = "不能为空", groups = { EditGroup.class })
+    private String procDefId;
+
+    /**
+     *
+     */
+    @NotBlank(message = "不能为空", groups = { EditGroup.class })
+    private String deployId;
     /**
     /**
      *
      *
      */
      */

@@ -38,6 +38,18 @@ public class TblBusinessWorkflowVo {
      */
      */
     @ExcelProperty(value = "")
     @ExcelProperty(value = "")
     private String procInsId;
     private String procInsId;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private String procDefId;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private String deployId;
     /**
     /**
      *
      *
      */
      */

@@ -104,5 +104,7 @@ public class TblContractModel extends BaseEntity {
     private Long id;
     private Long id;
 
 
     private String procInsId;
     private String procInsId;
+    private String procDefId;
+    private String deployId;
 
 
 }
 }

@@ -8,6 +8,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="tableName" column="table_name"/>
         <result property="tableName" column="table_name"/>
         <result property="businessId" column="business_id"/>
         <result property="businessId" column="business_id"/>
         <result property="procInsId" column="proc_ins_id"/>
         <result property="procInsId" column="proc_ins_id"/>
+        <result property="deployId" column="deploy_id"/>
+        <result property="procDefId" column="proc_def_id"/>
         <result property="id" column="id"/>
         <result property="id" column="id"/>
         <result property="createBy" column="create_by"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="createTime" column="create_time"/>

@@ -28,6 +28,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy" column="update_by"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="procInsId" column="proc_ins_id"/>
         <result property="procInsId" column="proc_ins_id"/>
+        <result property="procDdfId" column="proc_def_id"/>
+        <result property="deployId" column="deploy_id"/>
     </resultMap>
     </resultMap>
     <resultMap type="com.ruoyi.compliancemanagement.model.TblContractModel" id="TblContractModelResult">
     <resultMap type="com.ruoyi.compliancemanagement.model.TblContractModel" id="TblContractModelResult">
         <result property="id" column="id"/>
         <result property="id" column="id"/>
@@ -53,6 +55,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy" column="update_by"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="procInsId" column="proc_ins_id"/>
         <result property="procInsId" column="proc_ins_id"/>
+        <result property="procDefId" column="proc_def_id"/>
+        <result property="deployId" column="deploy_id"/>
     </resultMap>
     </resultMap>
     <select id="selectList" resultMap="TblContractModelResult">
     <select id="selectList" resultMap="TblContractModelResult">
         SELECT
         SELECT
@@ -77,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.create_by,
             a.create_by,
             a.create_time,
             a.create_time,
             a.update_by,
             a.update_by,
-            a.update_time,b.proc_ins_id
+            a.update_time,b.proc_ins_id,b.proc_def_id,b.deploy_id
         FROM
         FROM
             tbl_contract a
             tbl_contract a
             LEFT JOIN tbl_business_workflow b ON a.id = b.business_id
             LEFT JOIN tbl_business_workflow b ON a.id = b.business_id