add 新增流程定义与表单关联

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java

@@ -47,7 +47,7 @@ public class ActProcessDefinitionController extends BaseController {
      * @param key 流程定义key
      */
     @GetMapping("/getProcessDefinitionListByKey/{key}")
-    public R<List<ProcessDefinitionVo>> getProcessDefinitionList(@NotEmpty(message = "流程定义key不能为空") @PathVariable String key) {
+    public R<List<ProcessDefinitionVo>> getProcessDefinitionListByKey(@NotEmpty(message = "流程定义key不能为空") @PathVariable String key) {
         return R.ok("操作成功", iActProcessDefinitionService.getProcessDefinitionListByKey(key));
     }
 

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfFormDefinitionController.java

@@ -0,0 +1,39 @@
+package org.dromara.workflow.controller;
+
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.workflow.domain.bo.WfFormDefinitionBo;
+import org.dromara.workflow.service.IWfFormDefinitionService;
+
+/**
+ * 动态单与流程定义关联信息
+ *
+ * @author may
+ * @date 2023-08-31
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/workflow/formDefinition")
+public class WfFormDefinitionController extends BaseController {
+
+    private final IWfFormDefinitionService wfFormDefinitionService;
+
+    /**
+     * 新增动态单与流程定义关联信息
+     */
+    @Log(title = "动态单与流程定义关联信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody WfFormDefinitionBo bo) {
+        return toAjax(wfFormDefinitionService.insertByBo(bo));
+    }
+}

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfForm.java

@@ -37,6 +37,11 @@ public class WfForm extends TenantEntity {
      */
     private String content;
 
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
     /**
      * 备注
      */

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfFormDefinition.java

@@ -0,0 +1,56 @@
+package org.dromara.workflow.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 动态单与流程定义关联信息对象 wf_form_definition
+ *
+ * @author may
+ * @date 2023-08-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("wf_form_definition")
+public class WfFormDefinition extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 动态表单id
+     */
+    private Long formId;
+
+    /**
+     * 流程定义key
+     */
+    private String processDefinitionKey;
+
+    /**
+     * 流程定义名称
+     */
+    private String processDefinitionName;
+
+    /**
+     * 流程定义id
+     */
+    private String processDefinitionId;
+
+    /**
+     * 流程定义版本
+     */
+    private Long processDefinitionVersion;
+
+
+}

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfFormBo.java

@@ -49,8 +49,19 @@ public class WfFormBo extends BaseEntity {
     @NotBlank(message = "表单内容不能为空", groups = { AddGroup.class, EditGroup.class })
     private String content;
 
+    /**
+     * 状态（0正常 1停用）
+     */
+    @NotBlank(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String status;
+
     /**
      * 备注
      */
     private String remark;
+
+    /**
+     * 动态单与流程定义关联信息业务对象
+     */
+    private WfFormDefinitionBo wfFormDefinitionBo;
 }

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfFormDefinitionBo.java

@@ -0,0 +1,60 @@
+package org.dromara.workflow.domain.bo;
+
+import org.dromara.workflow.domain.WfFormDefinition;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 动态单与流程定义关联信息业务对象 wf_form_definition
+ *
+ * @author may
+ * @date 2023-08-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = WfFormDefinition.class, reverseConvertGenerate = false)
+public class WfFormDefinitionBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 动态表单id
+     */
+    @NotNull(message = "动态表单id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long formId;
+
+    /**
+     * 流程定义id
+     */
+    @NotBlank(message = "流程定义key不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String processDefinitionKey;
+
+    /**
+     * 流程定义名称
+     */
+    @NotBlank(message = "流程定义名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String processDefinitionName;
+
+    /**
+     * 流程定义id
+     */
+    @NotBlank(message = "流程定义id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String processDefinitionId;
+
+    /**
+     * 流程定义版本
+     */
+    @NotNull(message = "流程定义版本不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long processDefinitionVersion;
+
+
+}

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfFormDefinitionVo.java

@@ -0,0 +1,65 @@
+package org.dromara.workflow.domain.vo;
+
+import org.dromara.workflow.domain.WfFormDefinition;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+
+/**
+ * 动态单与流程定义关联信息视图对象 wf_form_definition
+ *
+ * @author may
+ * @date 2023-08-31
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = WfFormDefinition.class)
+public class WfFormDefinitionVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 动态表单id
+     */
+    @ExcelProperty(value = "动态表单id")
+    private Long formId;
+
+    /**
+     * 流程定义id
+     */
+    @ExcelProperty(value = "流程定义key")
+    private String processDefinitionKey;
+
+    /**
+     * 流程定义名称
+     */
+    @ExcelProperty(value = "流程定义名称")
+    private String processDefinitionName;
+
+    /**
+     * 流程定义id
+     */
+    @ExcelProperty(value = "流程定义id")
+    private String processDefinitionId;
+
+    /**
+     * 流程定义版本
+     */
+    @ExcelProperty(value = "流程定义版本")
+    private Long processDefinitionVersion;
+
+
+}

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfFormVo.java

@@ -39,8 +39,18 @@ public class WfFormVo implements Serializable {
      */
     private String content;
 
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
     /**
      * 备注
      */
     private String remark;
+
+    /**
+     * 动态单与流程定义关联信息业务对象
+     */
+    private WfFormDefinitionVo wfFormDefinitionVo;
 }

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfFormDefinitionMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.workflow.mapper;
+
+import org.dromara.workflow.domain.WfFormDefinition;
+import org.dromara.workflow.domain.vo.WfFormDefinitionVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 动态单与流程定义关联信息Mapper接口
+ *
+ * @author may
+ * @date 2023-08-31
+ */
+public interface WfFormDefinitionMapper extends BaseMapperPlus<WfFormDefinition, WfFormDefinitionVo> {
+
+}

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfFormDefinitionService.java

@@ -0,0 +1,48 @@
+package org.dromara.workflow.service;
+
+import org.dromara.workflow.domain.vo.WfFormDefinitionVo;
+import org.dromara.workflow.domain.bo.WfFormDefinitionBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 动态单与流程定义关联信息Service接口
+ *
+ * @author may
+ * @date 2023-08-31
+ */
+public interface IWfFormDefinitionService {
+
+    /**
+     * 查询动态单与流程定义关联信息
+     */
+    WfFormDefinitionVo queryById(Long id);
+
+    /**
+     * 查询动态单与流程定义关联信息列表
+     */
+    TableDataInfo<WfFormDefinitionVo> queryPageList(WfFormDefinitionBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询动态单与流程定义关联信息列表
+     */
+    List<WfFormDefinitionVo> queryList(WfFormDefinitionBo bo);
+
+    /**
+     * 新增动态单与流程定义关联信息
+     */
+    Boolean insertByBo(WfFormDefinitionBo bo);
+
+    /**
+     * 修改动态单与流程定义关联信息
+     */
+    Boolean updateByBo(WfFormDefinitionBo bo);
+
+    /**
+     * 校验并批量删除动态单与流程定义关联信息信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfFormDefinitionServiceImpl.java

@@ -0,0 +1,117 @@
+package org.dromara.workflow.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.workflow.domain.bo.WfFormDefinitionBo;
+import org.dromara.workflow.domain.vo.WfFormDefinitionVo;
+import org.dromara.workflow.domain.WfFormDefinition;
+import org.dromara.workflow.mapper.WfFormDefinitionMapper;
+import org.dromara.workflow.service.IWfFormDefinitionService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 动态单与流程定义关联信息Service业务层处理
+ *
+ * @author may
+ * @date 2023-08-31
+ */
+@RequiredArgsConstructor
+@Service
+public class WfFormDefinitionServiceImpl implements IWfFormDefinitionService {
+
+    private final WfFormDefinitionMapper baseMapper;
+
+    /**
+     * 查询动态单与流程定义关联信息
+     */
+    @Override
+    public WfFormDefinitionVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询动态单与流程定义关联信息列表
+     */
+    @Override
+    public TableDataInfo<WfFormDefinitionVo> queryPageList(WfFormDefinitionBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<WfFormDefinition> lqw = buildQueryWrapper(bo);
+        Page<WfFormDefinitionVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询动态单与流程定义关联信息列表
+     */
+    @Override
+    public List<WfFormDefinitionVo> queryList(WfFormDefinitionBo bo) {
+        LambdaQueryWrapper<WfFormDefinition> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<WfFormDefinition> buildQueryWrapper(WfFormDefinitionBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<WfFormDefinition> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getFormId() != null, WfFormDefinition::getFormId, bo.getFormId());
+        lqw.eq(StringUtils.isNotBlank(bo.getProcessDefinitionKey()), WfFormDefinition::getProcessDefinitionKey, bo.getProcessDefinitionKey());
+        lqw.like(StringUtils.isNotBlank(bo.getProcessDefinitionName()), WfFormDefinition::getProcessDefinitionName, bo.getProcessDefinitionName());
+        lqw.eq(StringUtils.isNotBlank(bo.getProcessDefinitionId()), WfFormDefinition::getProcessDefinitionId, bo.getProcessDefinitionId());
+        lqw.eq(bo.getProcessDefinitionVersion() != null, WfFormDefinition::getProcessDefinitionVersion, bo.getProcessDefinitionVersion());
+        return lqw;
+    }
+
+    /**
+     * 新增动态单与流程定义关联信息
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(WfFormDefinitionBo bo) {
+        WfFormDefinition add = MapstructUtils.convert(bo, WfFormDefinition.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改动态单与流程定义关联信息
+     */
+    @Override
+    public Boolean updateByBo(WfFormDefinitionBo bo) {
+        WfFormDefinition update = MapstructUtils.convert(bo, WfFormDefinition.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(WfFormDefinition entity){
+        LambdaQueryWrapper<WfFormDefinition> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(WfFormDefinition::getFormId,entity.getFormId());
+        baseMapper.delete(wrapper);
+    }
+
+    /**
+     * 批量删除动态单与流程定义关联信息
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfFormServiceImpl.java

@@ -1,5 +1,6 @@
 package org.dromara.workflow.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -7,12 +8,16 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.workflow.domain.WfForm;
+import org.dromara.workflow.domain.WfFormDefinition;
 import org.dromara.workflow.domain.bo.WfFormBo;
+import org.dromara.workflow.domain.vo.WfFormDefinitionVo;
 import org.dromara.workflow.domain.vo.WfFormVo;
+import org.dromara.workflow.mapper.WfFormDefinitionMapper;
 import org.dromara.workflow.mapper.WfFormMapper;
 import org.dromara.workflow.service.IWfFormService;
 import org.springframework.stereotype.Service;
@@ -32,6 +37,8 @@ public class WfFormServiceImpl implements IWfFormService {
 
     private final WfFormMapper baseMapper;
 
+    private final WfFormDefinitionMapper wfFormDefinitionMapper;
+
     /**
      * 查询流程表单
      *
@@ -53,6 +60,18 @@ public class WfFormServiceImpl implements IWfFormService {
     public TableDataInfo<WfFormVo> queryPageList(WfFormBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<WfForm> lqw = buildQueryWrapper(bo);
         Page<WfFormVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        List<WfFormVo> records = result.getRecords();
+        if(CollUtil.isNotEmpty(records)){
+            List<Long> formIds = StreamUtils.toList(records, WfFormVo::getFormId);
+            List<WfFormDefinitionVo> wfFormDefinitionVos = wfFormDefinitionMapper.selectVoList(
+                new LambdaQueryWrapper<WfFormDefinition>().in(WfFormDefinition::getFormId, formIds)
+            );
+            for (WfFormVo record : records) {
+                if(CollUtil.isNotEmpty(wfFormDefinitionVos)){
+                    wfFormDefinitionVos.stream().filter(e->String.valueOf(e.getFormId()).equals(String.valueOf(record.getFormId()))).findFirst().ifPresent(record::setWfFormDefinitionVo);
+                }
+            }
+        }
         return TableDataInfo.build(result);
     }
 
@@ -92,6 +111,7 @@ public class WfFormServiceImpl implements IWfFormService {
             .set(StrUtil.isNotBlank(bo.getFormName()), WfForm::getFormName, bo.getFormName())
             .set(StrUtil.isNotBlank(bo.getContent()), WfForm::getContent, bo.getContent())
             .set(StrUtil.isNotBlank(bo.getRemark()), WfForm::getRemark, bo.getRemark())
+            .set(StrUtil.isNotBlank(bo.getStatus()), WfForm::getStatus, bo.getStatus())
             .eq(WfForm::getFormId, bo.getFormId()));
     }
 

ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfFormDefinitionMapper.xml

@@ -0,0 +1,7 @@
+<?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="org.dromara.workflow.mapper.WfFormDefinitionMapper">
+
+</mapper>

script/sql/ry_vue_5.X.sql

@@ -887,6 +887,7 @@ create table wf_form (
   form_id         bigint        not null                  comment '表单id',
   tenant_id       varchar(20)             default '000000'comment '租户编号',
   form_name       varchar(255)            default null    comment '表单名称',
+  status          char(1)                 default '1'     comment '状态（0正常 1停用）',
   content         longtext                                comment '表单内容',
   create_dept     bigint                  default null    comment '创建部门',
   create_by       bigint                  default null    comment '创建者',
@@ -918,6 +919,27 @@ create table wf_category
         unique (category_code)
 ) engine=innodb comment= '流程分类';
 
+-- ----------------------------
+-- 流程分类信息表
+-- ----------------------------
+drop table if exists wf_form_definition;
+create table wf_form_definition
+(
+    id                         bigint                       not null comment '主键'
+        primary key,
+    form_id                    bigint                       not null comment '动态表单id',
+    process_definition_key     varchar(255)                 not null comment '流程定义key',
+    process_definition_name    varchar(255)                 not null comment '流程定义名称',
+    process_definition_id      varchar(255)                 not null comment '流程定义id',
+    process_definition_version int                          not null comment '流程定义版本',
+    tenant_id                  varchar(20) default '000000' null comment '租户编号',
+    create_dept                bigint                       null comment '创建部门',
+    create_by                  bigint                       null comment '创建者',
+    create_time                datetime                     null comment '创建时间',
+    update_by                  bigint                       null comment '更新者',
+    update_time                datetime                     null comment '更新时间'
+) engine=innodb comment= '动态表单与流程定义关联信息';
+
 -- ----------------------------
 -- 系统授权表
 -- ----------------------------