From d93a3f77baecaf761058db01a6699fb2ec0cb7c4 Mon Sep 17 00:00:00 2001 From: konbai <1527468660@qq.com> Date: Fri, 22 Jul 2022 22:00:50 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=81=E7=A8=8B=E5=85=B3=E8=81=94?= =?UTF-8?q?=E8=A1=A8=E5=8D=95):=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E6=B5=81=E7=A8=8B-=E8=A1=A8=E5=8D=95=E5=85=B3=E8=81=94?= =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5=E4=B8=8E=E6=95=B0=E6=8D=AE=E4=B8=8D?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E9=97=AE=E9=A2=98=EF=BC=8C=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E5=86=99=E5=85=A5=E6=95=B0=E6=8D=AE=E6=8A=A5=E9=94=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/workflow/domain/WfDeployForm.java | 11 ++--- .../workflow/domain/vo/WfDeployFormVo.java | 46 +++++++++++++++++++ .../workflow/mapper/WfDeployFormMapper.java | 3 +- .../service/impl/WfProcessServiceImpl.java | 5 +- .../mapper/workflow/WfDeployFormMapper.xml | 5 +- 5 files changed, 58 insertions(+), 12 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfDeployFormVo.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/WfDeployForm.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/WfDeployForm.java index e61396f0..cacaec9f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/WfDeployForm.java +++ b/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 diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfDeployFormVo.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfDeployFormVo.java new file mode 100644 index 00000000..014dd0ec --- /dev/null +++ b/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; +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/mapper/WfDeployFormMapper.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/mapper/WfDeployFormMapper.java index e2e5e0f6..abdcafda 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/mapper/WfDeployFormMapper.java +++ b/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 { +public interface WfDeployFormMapper extends BaseMapperPlus { } diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java index d63c43ca..01cfea3b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java +++ b/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() + WfDeployFormVo deployFormVo = deployFormMapper.selectVoOne(new LambdaQueryWrapper() .eq(WfDeployForm::getDeployId, deployId) .eq(WfDeployForm::getFormKey, startEvent.getFormKey())); - return deployForm.getContent(); + return deployFormVo.getContent(); } /** diff --git a/ruoyi-system/src/main/resources/mapper/workflow/WfDeployFormMapper.xml b/ruoyi-system/src/main/resources/mapper/workflow/WfDeployFormMapper.xml index 64315dee..da2963b4 100644 --- a/ruoyi-system/src/main/resources/mapper/workflow/WfDeployFormMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/workflow/WfDeployFormMapper.xml @@ -5,8 +5,11 @@ - + + + +