fix(流程关联表单): 修复部署流程-表单关联表字段与数据不对应问题，导致写入数据报错。

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/WfDeployForm.java

@@ -17,19 +17,14 @@ public class WfDeployForm {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 表单主键
+     * 流程部署主键
-     */
-    private String formKey;
-
-    /**
-     * 流程定义主键
      */
     private String deployId;
 
     /**
-     * 表单主键
+     * 表单Key
      */
-    private Long formId;
+    private String formKey;
 
     /**
      * 节点Key

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfDeployFormVo.java

@@ -0,0 +1,46 @@
+package com.ruoyi.workflow.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author KonBAI
+ * @createTime 2022/7/17 18:29
+ */
+@Data
+@ApiModel("部署实例和表单关联视图对象")
+public class WfDeployFormVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 流程部署主键
+     */
+    @ApiModelProperty("流程部署主键")
+    private String deployId;
+
+    /**
+     * 表单Key
+     */
+    @ApiModelProperty("表单Key")
+    private String formKey;
+
+    /**
+     * 节点Key
+     */
+    @ApiModelProperty("节点Key")
+    private String nodeKey;
+
+    /**
+     * 节点名称
+     */
+    @ApiModelProperty("节点名称")
+    private String nodeName;
+
+    /**
+     * 表单内容
+     */
+    @ApiModelProperty("表单内容")
+    private String content;
+}

ruoyi-system/src/main/java/com/ruoyi/workflow/mapper/WfDeployFormMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.workflow.mapper;
 
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 import com.ruoyi.workflow.domain.WfDeployForm;
+import com.ruoyi.workflow.domain.vo.WfDeployFormVo;
 
 /**
  * 流程实例关联表单Mapper接口
@@ -9,6 +10,6 @@ import com.ruoyi.workflow.domain.WfDeployForm;
  * @author KonBAI
  * @createTime 2022/3/7 22:07
  */
-public interface WfDeployFormMapper extends BaseMapperPlus<WfDeployFormMapper, WfDeployForm, WfDeployForm> {
+public interface WfDeployFormMapper extends BaseMapperPlus<WfDeployFormMapper, WfDeployForm, WfDeployFormVo> {
 
 }

ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java

@@ -23,6 +23,7 @@ import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.workflow.domain.WfDeployForm;
 import com.ruoyi.workflow.domain.bo.WfProcessBo;
 import com.ruoyi.workflow.domain.vo.WfDefinitionVo;
+import com.ruoyi.workflow.domain.vo.WfDeployFormVo;
 import com.ruoyi.workflow.domain.vo.WfTaskVo;
 import com.ruoyi.workflow.mapper.WfDeployFormMapper;
 import com.ruoyi.workflow.service.IWfProcessService;
@@ -115,10 +116,10 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
         }
         BpmnModel bpmnModel = ModelUtils.getBpmnModel(bpmnString);
         StartEvent startEvent = ModelUtils.getStartEvent(bpmnModel);
-        WfDeployForm deployForm = deployFormMapper.selectVoOne(new LambdaQueryWrapper<WfDeployForm>()
+        WfDeployFormVo deployFormVo = deployFormMapper.selectVoOne(new LambdaQueryWrapper<WfDeployForm>()
             .eq(WfDeployForm::getDeployId, deployId)
             .eq(WfDeployForm::getFormKey, startEvent.getFormKey()));
-        return deployForm.getContent();
+        return deployFormVo.getContent();
     }
 
     /**

ruoyi-system/src/main/resources/mapper/workflow/WfDeployFormMapper.xml

@@ -5,8 +5,11 @@
 <mapper namespace="com.ruoyi.workflow.mapper.WfDeployFormMapper">
 
     <resultMap type="com.ruoyi.workflow.domain.WfDeployForm" id="WfDeployFormResult">
-        <result property="formId" column="form_id"/>
         <result property="deployId" column="deploy_id"/>
+        <result property="formKey" column="form_key"/>
+        <result property="nodeKey" column="node_key"/>
+        <result property="nodeName" column="node_name"/>
+        <result property="content" column="content"/>
     </resultMap>
 
 </mapper>