删除执行节点表单关系表、动态表单以及流程关系表后台代码逻辑，流程配置表、节点执行表（记录表）添加表单类型字段代码逻辑

ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/controller/BpmExecuteNodeFormController.java

@@ -1,105 +0,0 @@
-package com.ruoyi.execution.produce.dispersed.controller;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNodeForm;
-import com.ruoyi.execution.produce.dispersed.service.IBpmExecuteNodeFormService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 执行节点单关系Controller
- * 
- * @author ruoyi
- * @date 2023-11-28
- */
-@RestController
-@RequestMapping("/system/form")
-public class BpmExecuteNodeFormController extends BaseController
-{
-    @Autowired
-    private IBpmExecuteNodeFormService bpmExecuteNodeFormService;
-
-    /**
-     * 查询执行节点单关系列表
-     */
-    @PreAuthorize("@ss.hasPermi('system:form:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(BpmExecuteNodeForm bpmExecuteNodeForm)
-    {
-        startPage();
-        List<BpmExecuteNodeForm> list = bpmExecuteNodeFormService.selectBpmExecuteNodeFormList(bpmExecuteNodeForm);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出执行节点单关系列表
-     */
-    @PreAuthorize("@ss.hasPermi('system:form:export')")
-    @Log(title = "执行节点单关系", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, BpmExecuteNodeForm bpmExecuteNodeForm)
-    {
-        List<BpmExecuteNodeForm> list = bpmExecuteNodeFormService.selectBpmExecuteNodeFormList(bpmExecuteNodeForm);
-        ExcelUtil<BpmExecuteNodeForm> util = new ExcelUtil<BpmExecuteNodeForm>(BpmExecuteNodeForm.class);
-        util.exportExcel(response, list, "执行节点单关系数据");
-    }
-
-    /**
-     * 获取执行节点单关系详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('system:form:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return success(bpmExecuteNodeFormService.selectBpmExecuteNodeFormById(id));
-    }
-
-    /**
-     * 新增执行节点单关系
-     */
-    @PreAuthorize("@ss.hasPermi('system:form:add')")
-    @Log(title = "执行节点单关系", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody BpmExecuteNodeForm bpmExecuteNodeForm)
-    {
-        return toAjax(bpmExecuteNodeFormService.insertBpmExecuteNodeForm(bpmExecuteNodeForm));
-    }
-
-    /**
-     * 修改执行节点单关系
-     */
-    @PreAuthorize("@ss.hasPermi('system:form:edit')")
-    @Log(title = "执行节点单关系", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody BpmExecuteNodeForm bpmExecuteNodeForm)
-    {
-        return toAjax(bpmExecuteNodeFormService.updateBpmExecuteNodeForm(bpmExecuteNodeForm));
-    }
-
-    /**
-     * 删除执行节点单关系
-     */
-    @PreAuthorize("@ss.hasPermi('system:form:remove')")
-    @Log(title = "执行节点单关系", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(bpmExecuteNodeFormService.deleteBpmExecuteNodeFormByIds(ids));
-    }
-}

ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/entity/BpmExecuteNode.java

@@ -45,6 +45,11 @@ public class BpmExecuteNode extends BaseEntity implements Serializable {
     @Excel(name = "表单编号")
     private String taskNodeFormKey;
 
+    /**
+     * 任务节点表单类型
+     */
+    private String taskNodeFormType;
+
     /**
      * 节点类型（当前节点是判断、网关、普通节点等等。。。。。）
      */
@@ -180,6 +185,14 @@ public class BpmExecuteNode extends BaseEntity implements Serializable {
         return taskNodeFormKey;
     }
 
+    public String getTaskNodeFormType() {
+        return taskNodeFormType;
+    }
+
+    public void setTaskNodeFormType(String taskNodeFormType) {
+        this.taskNodeFormType = taskNodeFormType;
+    }
+
     public void setTaskNodeType(String taskNodeType) {
         this.taskNodeType = taskNodeType;
     }
@@ -317,6 +330,7 @@ public class BpmExecuteNode extends BaseEntity implements Serializable {
                 .append("taskNodeKey", getTaskNodeKey())
                 .append("taskNodeName", getTaskNodeName())
                 .append("taskNodeFormKey", getTaskNodeFormKey())
+                .append("taskNodeFormType",getTaskNodeFormType())
                 .append("taskNodeType", getTaskNodeType())
                 .append("taskNodeExecuteType",getTaskNodeExecuteType())
                 .append("taskNodeBefore", getTaskNodeBefore())

ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/entity/BpmExecuteNodeForm.java

@@ -1,107 +0,0 @@
-package com.ruoyi.execution.produce.dispersed.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 执行节点单关系对象 bpm_execute_node_form
- * 
- * @author ruoyi
- * @date 2023-11-28
- */
-public class BpmExecuteNodeForm extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
-    private Long id;
-
-    /** 标识 */
-    @Excel(name = "标识")
-    private String taskNFKey;
-
-    /** 流程节点标识 */
-    @Excel(name = "流程节点标识")
-    private String taskProcessKey;
-
-    /** 流程节点标识 */
-    @Excel(name = "流程节点标识")
-    private String taskNodeKey;
-
-    /** 动态表单标识 */
-    @Excel(name = "动态表单标识")
-    private String taskFormKey;
-
-    /** 表单类型 */
-    @Excel(name = "表单类型")
-    private String taskTemplateType;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setTaskNFKey(String taskNFKey) 
-    {
-        this.taskNFKey = taskNFKey;
-    }
-
-    public String getTaskNFKey() 
-    {
-        return taskNFKey;
-    }
-    public void setTaskProcessKey(String taskProcessKey) 
-    {
-        this.taskProcessKey = taskProcessKey;
-    }
-
-    public String getTaskProcessKey() 
-    {
-        return taskProcessKey;
-    }
-    public void setTaskNodeKey(String taskNodeKey) 
-    {
-        this.taskNodeKey = taskNodeKey;
-    }
-
-    public String getTaskNodeKey() 
-    {
-        return taskNodeKey;
-    }
-    public void setTaskFormKey(String taskFormKey) 
-    {
-        this.taskFormKey = taskFormKey;
-    }
-
-    public String getTaskFormKey() 
-    {
-        return taskFormKey;
-    }
-    public void setTaskTemplateType(String taskTemplateType) 
-    {
-        this.taskTemplateType = taskTemplateType;
-    }
-
-    public String getTaskTemplateType() 
-    {
-        return taskTemplateType;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("taskNFKey", getTaskNFKey())
-            .append("taskProcessKey", getTaskProcessKey())
-            .append("taskNodeKey", getTaskNodeKey())
-            .append("taskFormKey", getTaskFormKey())
-            .append("taskTemplateType", getTaskTemplateType())
-            .toString();
-    }
-}

ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/mapper/BpmExecuteNodeFormMapper.java

@@ -1,62 +0,0 @@
-package com.ruoyi.execution.produce.dispersed.mapper;
-
-import com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNodeForm;
-
-import java.util.List;
-
-/**
- * 执行节点单关系Mapper接口
- * 
- * @author ruoyi
- * @date 2023-11-28
- */
-public interface BpmExecuteNodeFormMapper 
-{
-    /**
-     * 查询执行节点单关系
-     * 
-     * @param id 执行节点单关系主键
-     * @return 执行节点单关系
-     */
-    public BpmExecuteNodeForm selectBpmExecuteNodeFormById(Long id);
-
-    /**
-     * 查询执行节点单关系列表
-     * 
-     * @param bpmExecuteNodeForm 执行节点单关系
-     * @return 执行节点单关系集合
-     */
-    public List<BpmExecuteNodeForm> selectBpmExecuteNodeFormList(BpmExecuteNodeForm bpmExecuteNodeForm);
-
-    /**
-     * 新增执行节点单关系
-     * 
-     * @param bpmExecuteNodeForm 执行节点单关系
-     * @return 结果
-     */
-    public int insertBpmExecuteNodeForm(BpmExecuteNodeForm bpmExecuteNodeForm);
-
-    /**
-     * 修改执行节点单关系
-     * 
-     * @param bpmExecuteNodeForm 执行节点单关系
-     * @return 结果
-     */
-    public int updateBpmExecuteNodeForm(BpmExecuteNodeForm bpmExecuteNodeForm);
-
-    /**
-     * 删除执行节点单关系
-     * 
-     * @param id 执行节点单关系主键
-     * @return 结果
-     */
-    public int deleteBpmExecuteNodeFormById(Long id);
-
-    /**
-     * 批量删除执行节点单关系
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteBpmExecuteNodeFormByIds(Long[] ids);
-}

ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/service/IBpmExecuteNodeFormService.java

@@ -1,62 +0,0 @@
-package com.ruoyi.execution.produce.dispersed.service;
-
-import com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNodeForm;
-
-import java.util.List;
-
-/**
- * 执行节点单关系Service接口
- * 
- * @author ruoyi
- * @date 2023-11-28
- */
-public interface IBpmExecuteNodeFormService 
-{
-    /**
-     * 查询执行节点单关系
-     * 
-     * @param id 执行节点单关系主键
-     * @return 执行节点单关系
-     */
-    public BpmExecuteNodeForm selectBpmExecuteNodeFormById(Long id);
-
-    /**
-     * 查询执行节点单关系列表
-     * 
-     * @param bpmExecuteNodeForm 执行节点单关系
-     * @return 执行节点单关系集合
-     */
-    public List<BpmExecuteNodeForm> selectBpmExecuteNodeFormList(BpmExecuteNodeForm bpmExecuteNodeForm);
-
-    /**
-     * 新增执行节点单关系
-     * 
-     * @param bpmExecuteNodeForm 执行节点单关系
-     * @return 结果
-     */
-    public int insertBpmExecuteNodeForm(BpmExecuteNodeForm bpmExecuteNodeForm);
-
-    /**
-     * 修改执行节点单关系
-     * 
-     * @param bpmExecuteNodeForm 执行节点单关系
-     * @return 结果
-     */
-    public int updateBpmExecuteNodeForm(BpmExecuteNodeForm bpmExecuteNodeForm);
-
-    /**
-     * 批量删除执行节点单关系
-     * 
-     * @param ids 需要删除的执行节点单关系主键集合
-     * @return 结果
-     */
-    public int deleteBpmExecuteNodeFormByIds(Long[] ids);
-
-    /**
-     * 删除执行节点单关系信息
-     * 
-     * @param id 执行节点单关系主键
-     * @return 结果
-     */
-    public int deleteBpmExecuteNodeFormById(Long id);
-}

ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/service/impl/BpmExecuteNodeFormServiceImpl.java

@@ -1,94 +0,0 @@
-package com.ruoyi.execution.produce.dispersed.service.impl;
-
-import java.util.List;
-
-import com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNodeForm;
-import com.ruoyi.execution.produce.dispersed.mapper.BpmExecuteNodeFormMapper;
-import com.ruoyi.execution.produce.dispersed.service.IBpmExecuteNodeFormService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 执行节点单关系Service业务层处理
- * 
- * @author ruoyi
- * @date 2023-11-28
- */
-@Service
-public class BpmExecuteNodeFormServiceImpl implements IBpmExecuteNodeFormService
-{
-    @Autowired
-    private BpmExecuteNodeFormMapper bpmExecuteNodeFormMapper;
-
-    /**
-     * 查询执行节点单关系
-     * 
-     * @param id 执行节点单关系主键
-     * @return 执行节点单关系
-     */
-    @Override
-    public BpmExecuteNodeForm selectBpmExecuteNodeFormById(Long id)
-    {
-        return bpmExecuteNodeFormMapper.selectBpmExecuteNodeFormById(id);
-    }
-
-    /**
-     * 查询执行节点单关系列表
-     * 
-     * @param bpmExecuteNodeForm 执行节点单关系
-     * @return 执行节点单关系
-     */
-    @Override
-    public List<BpmExecuteNodeForm> selectBpmExecuteNodeFormList(BpmExecuteNodeForm bpmExecuteNodeForm)
-    {
-        return bpmExecuteNodeFormMapper.selectBpmExecuteNodeFormList(bpmExecuteNodeForm);
-    }
-
-    /**
-     * 新增执行节点单关系
-     * 
-     * @param bpmExecuteNodeForm 执行节点单关系
-     * @return 结果
-     */
-    @Override
-    public int insertBpmExecuteNodeForm(BpmExecuteNodeForm bpmExecuteNodeForm)
-    {
-        return bpmExecuteNodeFormMapper.insertBpmExecuteNodeForm(bpmExecuteNodeForm);
-    }
-
-    /**
-     * 修改执行节点单关系
-     * 
-     * @param bpmExecuteNodeForm 执行节点单关系
-     * @return 结果
-     */
-    @Override
-    public int updateBpmExecuteNodeForm(BpmExecuteNodeForm bpmExecuteNodeForm)
-    {
-        return bpmExecuteNodeFormMapper.updateBpmExecuteNodeForm(bpmExecuteNodeForm);
-    }
-
-    /**
-     * 批量删除执行节点单关系
-     * 
-     * @param ids 需要删除的执行节点单关系主键
-     * @return 结果
-     */
-    @Override
-    public int deleteBpmExecuteNodeFormByIds(Long[] ids)
-    {
-        return bpmExecuteNodeFormMapper.deleteBpmExecuteNodeFormByIds(ids);
-    }
-
-    /**
-     * 删除执行节点单关系信息
-     * 
-     * @param id 执行节点单关系主键
-     * @return 结果
-     */
-    @Override
-    public int deleteBpmExecuteNodeFormById(Long id)
-    {
-        return bpmExecuteNodeFormMapper.deleteBpmExecuteNodeFormById(id);
-    }
-}

ruoyi-process-execution/src/main/resources/mapper/bpm/dispersed/BpmExecuteNodeFormMapper.xml

@@ -1,76 +0,0 @@
-<?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="com.ruoyi.execution.produce.dispersed.mapper.BpmExecuteNodeFormMapper">
-    
-    <resultMap type="com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNodeForm" id="BpmExecuteNodeFormResult">
-        <result property="id"    column="id"    />
-        <result property="taskNFKey"    column="task_n_f_key"    />
-        <result property="taskProcessKey"    column="task_process_key"    />
-        <result property="taskNodeKey"    column="task_node_key"    />
-        <result property="taskFormKey"    column="task_form_key"    />
-        <result property="taskTemplateType"    column="task_template_type"    />
-    </resultMap>
-
-    <sql id="selectBpmExecuteNodeFormVo">
-        select id, task_n_f_key, task_process_key, task_node_key, task_form_key, task_template_type from bpm_execute_node_form
-    </sql>
-
-    <select id="selectBpmExecuteNodeFormList" parameterType="com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNodeForm" resultMap="BpmExecuteNodeFormResult">
-        <include refid="selectBpmExecuteNodeFormVo"/>
-        <where>  
-            <if test="taskNFKey != null  and taskNFKey != ''"> and task_n_f_key = #{taskNFKey}</if>
-            <if test="taskProcessKey != null  and taskProcessKey != ''"> and task_process_key = #{taskProcessKey}</if>
-            <if test="taskNodeKey != null  and taskNodeKey != ''"> and task_node_key = #{taskNodeKey}</if>
-            <if test="taskFormKey != null  and taskFormKey != ''"> and task_form_key = #{taskFormKey}</if>
-            <if test="taskTemplateType != null  and taskTemplateType != ''"> and task_template_type = #{taskTemplateType}</if>
-        </where>
-    </select>
-    
-    <select id="selectBpmExecuteNodeFormById" parameterType="Long" resultMap="BpmExecuteNodeFormResult">
-        <include refid="selectBpmExecuteNodeFormVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertBpmExecuteNodeForm" parameterType="com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNodeForm" useGeneratedKeys="true" keyProperty="id">
-        insert into bpm_execute_node_form
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="taskNFKey != null">task_n_f_key,</if>
-            <if test="taskProcessKey != null">task_process_key,</if>
-            <if test="taskNodeKey != null">task_node_key,</if>
-            <if test="taskFormKey != null">task_form_key,</if>
-            <if test="taskTemplateType != null">task_template_type,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="taskNFKey != null">#{taskNFKey},</if>
-            <if test="taskProcessKey != null">#{taskProcessKey},</if>
-            <if test="taskNodeKey != null">#{taskNodeKey},</if>
-            <if test="taskFormKey != null">#{taskFormKey},</if>
-            <if test="taskTemplateType != null">#{taskTemplateType},</if>
-         </trim>
-    </insert>
-
-    <update id="updateBpmExecuteNodeForm" parameterType="com.ruoyi.execution.produce.dispersed.entity.BpmExecuteNodeForm">
-        update bpm_execute_node_form
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="taskNFKey != null">task_n_f_key = #{taskNFKey},</if>
-            <if test="taskProcessKey != null">task_process_key = #{taskProcessKey},</if>
-            <if test="taskNodeKey != null">task_node_key = #{taskNodeKey},</if>
-            <if test="taskFormKey != null">task_form_key = #{taskFormKey},</if>
-            <if test="taskTemplateType != null">task_template_type = #{taskTemplateType},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteBpmExecuteNodeFormById" parameterType="Long">
-        delete from bpm_execute_node_form where id = #{id}
-    </delete>
-
-    <delete id="deleteBpmExecuteNodeFormByIds" parameterType="String">
-        delete from bpm_execute_node_form where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-process-execution/src/main/resources/mapper/bpm/dispersed/BpmExecuteNodeMapper.xml

@@ -10,6 +10,7 @@
         <result property="taskNodeKey" column="task_node_key"/>
         <result property="taskNodeName" column="task_node_name"/>
         <result property="taskNodeFormKey" column="task_node_form_key"/>
+        <result property="taskNodeFormType" column="task_node_form_type"/>
         <result property="taskNodeType" column="task_node_type"/>
         <result property="taskNodeExecuteType" column="task_node_execute_type"/>
         <result property="taskNodeBefore" column="task_node_before"/>
@@ -37,6 +38,7 @@
                task_node_key,
                task_node_name,
                task_node_form_key,
+               task_node_form_type,
                task_node_type,
                task_node_execute_type,
                task_node_before,
@@ -103,6 +105,7 @@
             <if test="taskNodeKey != null">task_node_key,</if>
             <if test="taskNodeName != null">task_node_name,</if>
             <if test="taskNodeFormKey != null">task_node_form_key,</if>
+            <if test="taskNodeFormType != null">task_node_form_type,</if>
             <if test="taskNodeType != null">task_node_type,</if>
             <if test="taskNodeExecuteType != null">task_node_execute_type,</if>
             <if test="taskNodeBefore != null">task_node_before,</if>
@@ -128,6 +131,7 @@
             <if test="taskNodeKey != null">#{taskNodeKey},</if>
             <if test="taskNodeName != null">#{taskNodeName},</if>
             <if test="taskNodeFormKey != null">#{taskNodeFormKey},</if>
+            <if test="taskNodeFormType != null">#{taskNodeFormType},</if>
             <if test="taskNodeType != null">#{taskNodeType},</if>
             <if test="taskNodeExecuteType != null">#{taskNodeExecuteType},</if>
             <if test="taskNodeBefore != null">#{taskNodeBefore},</if>
@@ -156,6 +160,7 @@
         task_node_key,
         task_node_name,
         task_node_form_key,
+        task_node_form_type,
         task_node_type,
         task_node_execute_type,
         task_node_before,
@@ -181,6 +186,7 @@
             coalesce(#{item.taskNodeKey},''),
             coalesce(#{item.taskNodeName},''),
             coalesce(#{item.taskNodeFormKey},''),
+            coalesce(#{item.taskNodeFormType},''),
             coalesce(#{item.taskNodeType},''),
             coalesce(#{item.taskNodeExecuteType},''),
             coalesce(#{item.taskNodeBefore},''),
@@ -210,6 +216,7 @@
             <if test="taskNodeKey != null">task_node_key = #{taskNodeKey},</if>
             <if test="taskNodeName != null">task_node_name = #{taskNodeName},</if>
             <if test="taskNodeFormKey != null">task_node_form_key = #{taskNodeFormKey},</if>
+            <if test="taskNodeFormType != null">task_node_form_type = #{taskNodeFormType},</if>
             <if test="taskNodeType != null">task_node_type = #{taskNodeType},</if>
             <if test="taskNodeExecuteType != null">task_node_execute_type = #{taskNodeExecuteType},</if>
             <if test="taskNodeBefore != null">task_node_before = #{taskNodeBefore},</if>
@@ -254,6 +261,7 @@
             <if test="taskNodeKey != null">task_node_key = #{taskNodeKey},</if>
             <if test="taskNodeName != null">task_node_name = #{taskNodeName},</if>
             <if test="taskNodeFormKey != null">task_node_form_key = #{taskNodeFormKey},</if>
+            <if test="taskNodeFormType != null">task_node_form_type = #{taskNodeFormType},</if>
             <if test="taskNodeType != null">task_node_type = #{taskNodeType},</if>
             <if test="taskNodeExecuteType != null">task_node_execute_type = #{taskNodeExecuteType},</if>
             <if test="taskNodeBefore != null">task_node_before = #{taskNodeBefore},</if>

ruoyi-system/src/main/java/com/ruoyi/system/entity/BpmNodeForm.java

@@ -1,93 +0,0 @@
-package com.ruoyi.system.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 动态单以及流程关系对象 bpm_node_form
- * 
- * @author ruoyi
- * @date 2023-11-28
- */
-public class BpmNodeForm extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
-    private Long id;
-
-    /** 标识 */
-    @Excel(name = "标识")
-    private String nFKey;
-
-    /** 流程节点标识 */
-    @Excel(name = "流程节点标识")
-    private String nodeKey;
-
-    /** 动态表单标识 */
-    @Excel(name = "动态表单标识")
-    private String formKey;
-
-    /** 表单类型 */
-    @Excel(name = "表单类型")
-    private String templateType;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setnFKey(String nFKey) 
-    {
-        this.nFKey = nFKey;
-    }
-
-    public String getnFKey() 
-    {
-        return nFKey;
-    }
-    public void setNodeKey(String nodeKey) 
-    {
-        this.nodeKey = nodeKey;
-    }
-
-    public String getNodeKey() 
-    {
-        return nodeKey;
-    }
-    public void setFormKey(String formKey) 
-    {
-        this.formKey = formKey;
-    }
-
-    public String getFormKey() 
-    {
-        return formKey;
-    }
-    public void setTemplateType(String templateType) 
-    {
-        this.templateType = templateType;
-    }
-
-    public String getTemplateType() 
-    {
-        return templateType;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("nFKey", getnFKey())
-            .append("nodeKey", getNodeKey())
-            .append("formKey", getFormKey())
-            .append("templateType", getTemplateType())
-            .toString();
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/entity/BpmProcessConfiguration.java

@@ -37,6 +37,11 @@ public class BpmProcessConfiguration extends BaseEntity implements Serializable
      */
     private String nodeFormKey;
 
+    /**
+     * 节点表单类型
+     */
+    private String nodeFormType;
+
     /**
      * 流程编号
      */
@@ -94,11 +99,12 @@ public class BpmProcessConfiguration extends BaseEntity implements Serializable
         this.nodeProcessKey = nodeProcessKey;
     }
 
-    public BpmProcessConfiguration(Long id, String nodeKey, String nodeName, String nodeFormKey, String nodeProcessKey, String nodeType, String nodeExecuteType, String nodeBefore, String nodeAfter, String nodeRolePermission, String spare1, String spare2, String spare3, String delFlag) {
+    public BpmProcessConfiguration(Long id, String nodeKey, String nodeName, String nodeFormKey, String nodeFormType, String nodeProcessKey, String nodeType, String nodeExecuteType, String nodeBefore, String nodeAfter, String nodeRolePermission, String spare1, String spare2, String spare3, String delFlag) {
         this.id = id;
         this.nodeKey = nodeKey;
         this.nodeName = nodeName;
         this.nodeFormKey = nodeFormKey;
+        this.nodeFormType = nodeFormType;
         this.nodeProcessKey = nodeProcessKey;
         this.nodeType = nodeType;
         this.nodeExecuteType = nodeExecuteType;
@@ -143,6 +149,14 @@ public class BpmProcessConfiguration extends BaseEntity implements Serializable
         this.nodeFormKey = nodeFormKey;
     }
 
+    public String getNodeFormType() {
+        return nodeFormType;
+    }
+
+    public void setNodeFormType(String nodeFormType) {
+        this.nodeFormType = nodeFormType;
+    }
+
     public String getNodeProcessKey() {
         return nodeProcessKey;
     }
@@ -230,6 +244,7 @@ public class BpmProcessConfiguration extends BaseEntity implements Serializable
                 .append("nodeKey", getNodeKey())
                 .append("nodeName", getNodeName())
                 .append("nodeFormKey", getNodeFormKey())
+                .append("nodeFormType", getNodeFormType())
                 .append("nodeProcessKey", getNodeProcessKey())
                 .append("nodeType", getNodeType())
                 .append("nodeExecuteType",getNodeExecuteType())

ruoyi-system/src/main/java/com/ruoyi/system/mapper/BpmNodeFormMapper.java

@@ -1,62 +0,0 @@
-package com.ruoyi.system.mapper;
-
-import com.ruoyi.system.entity.BpmNodeForm;
-
-import java.util.List;
-
-/**
- * 动态单以及流程关系Mapper接口
- * 
- * @author ruoyi
- * @date 2023-11-28
- */
-public interface BpmNodeFormMapper 
-{
-    /**
-     * 查询动态单以及流程关系
-     * 
-     * @param id 动态单以及流程关系主键
-     * @return 动态单以及流程关系
-     */
-    public BpmNodeForm selectBpmNodeFormById(Long id);
-
-    /**
-     * 查询动态单以及流程关系列表
-     * 
-     * @param bpmNodeForm 动态单以及流程关系
-     * @return 动态单以及流程关系集合
-     */
-    public List<BpmNodeForm> selectBpmNodeFormList(BpmNodeForm bpmNodeForm);
-
-    /**
-     * 新增动态单以及流程关系
-     * 
-     * @param bpmNodeForm 动态单以及流程关系
-     * @return 结果
-     */
-    public int insertBpmNodeForm(BpmNodeForm bpmNodeForm);
-
-    /**
-     * 修改动态单以及流程关系
-     * 
-     * @param bpmNodeForm 动态单以及流程关系
-     * @return 结果
-     */
-    public int updateBpmNodeForm(BpmNodeForm bpmNodeForm);
-
-    /**
-     * 删除动态单以及流程关系
-     * 
-     * @param id 动态单以及流程关系主键
-     * @return 结果
-     */
-    public int deleteBpmNodeFormById(Long id);
-
-    /**
-     * 批量删除动态单以及流程关系
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteBpmNodeFormByIds(Long[] ids);
-}

ruoyi-system/src/main/java/com/ruoyi/system/service/IBpmNodeFormService.java

@@ -1,62 +0,0 @@
-package com.ruoyi.system.service;
-
-import com.ruoyi.system.entity.BpmNodeForm;
-
-import java.util.List;
-
-/**
- * 动态单以及流程关系Service接口
- * 
- * @author ruoyi
- * @date 2023-11-28
- */
-public interface IBpmNodeFormService 
-{
-    /**
-     * 查询动态单以及流程关系
-     * 
-     * @param id 动态单以及流程关系主键
-     * @return 动态单以及流程关系
-     */
-    public BpmNodeForm selectBpmNodeFormById(Long id);
-
-    /**
-     * 查询动态单以及流程关系列表
-     * 
-     * @param bpmNodeForm 动态单以及流程关系
-     * @return 动态单以及流程关系集合
-     */
-    public List<BpmNodeForm> selectBpmNodeFormList(BpmNodeForm bpmNodeForm);
-
-    /**
-     * 新增动态单以及流程关系
-     * 
-     * @param bpmNodeForm 动态单以及流程关系
-     * @return 结果
-     */
-    public int insertBpmNodeForm(BpmNodeForm bpmNodeForm);
-
-    /**
-     * 修改动态单以及流程关系
-     * 
-     * @param bpmNodeForm 动态单以及流程关系
-     * @return 结果
-     */
-    public int updateBpmNodeForm(BpmNodeForm bpmNodeForm);
-
-    /**
-     * 批量删除动态单以及流程关系
-     * 
-     * @param ids 需要删除的动态单以及流程关系主键集合
-     * @return 结果
-     */
-    public int deleteBpmNodeFormByIds(Long[] ids);
-
-    /**
-     * 删除动态单以及流程关系信息
-     * 
-     * @param id 动态单以及流程关系主键
-     * @return 结果
-     */
-    public int deleteBpmNodeFormById(Long id);
-}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BpmNodeFormServiceImpl.java

@@ -1,94 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import java.util.List;
-
-import com.ruoyi.system.entity.BpmNodeForm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.system.mapper.BpmNodeFormMapper;
-import com.ruoyi.system.service.IBpmNodeFormService;
-
-/**
- * 动态单以及流程关系Service业务层处理
- * 
- * @author ruoyi
- * @date 2023-11-28
- */
-@Service
-public class BpmNodeFormServiceImpl implements IBpmNodeFormService 
-{
-    @Autowired
-    private BpmNodeFormMapper bpmNodeFormMapper;
-
-    /**
-     * 查询动态单以及流程关系
-     * 
-     * @param id 动态单以及流程关系主键
-     * @return 动态单以及流程关系
-     */
-    @Override
-    public BpmNodeForm selectBpmNodeFormById(Long id)
-    {
-        return bpmNodeFormMapper.selectBpmNodeFormById(id);
-    }
-
-    /**
-     * 查询动态单以及流程关系列表
-     * 
-     * @param bpmNodeForm 动态单以及流程关系
-     * @return 动态单以及流程关系
-     */
-    @Override
-    public List<BpmNodeForm> selectBpmNodeFormList(BpmNodeForm bpmNodeForm)
-    {
-        return bpmNodeFormMapper.selectBpmNodeFormList(bpmNodeForm);
-    }
-
-    /**
-     * 新增动态单以及流程关系
-     * 
-     * @param bpmNodeForm 动态单以及流程关系
-     * @return 结果
-     */
-    @Override
-    public int insertBpmNodeForm(BpmNodeForm bpmNodeForm)
-    {
-        return bpmNodeFormMapper.insertBpmNodeForm(bpmNodeForm);
-    }
-
-    /**
-     * 修改动态单以及流程关系
-     * 
-     * @param bpmNodeForm 动态单以及流程关系
-     * @return 结果
-     */
-    @Override
-    public int updateBpmNodeForm(BpmNodeForm bpmNodeForm)
-    {
-        return bpmNodeFormMapper.updateBpmNodeForm(bpmNodeForm);
-    }
-
-    /**
-     * 批量删除动态单以及流程关系
-     * 
-     * @param ids 需要删除的动态单以及流程关系主键
-     * @return 结果
-     */
-    @Override
-    public int deleteBpmNodeFormByIds(Long[] ids)
-    {
-        return bpmNodeFormMapper.deleteBpmNodeFormByIds(ids);
-    }
-
-    /**
-     * 删除动态单以及流程关系信息
-     * 
-     * @param id 动态单以及流程关系主键
-     * @return 结果
-     */
-    @Override
-    public int deleteBpmNodeFormById(Long id)
-    {
-        return bpmNodeFormMapper.deleteBpmNodeFormById(id);
-    }
-}

ruoyi-system/src/main/resources/mapper/bpm/BpmNodeFormMapper.xml

@@ -1,71 +0,0 @@
-<?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="com.ruoyi.system.mapper.BpmNodeFormMapper">
-    
-    <resultMap type="com.ruoyi.system.entity.BpmNodeForm" id="BpmNodeFormResult">
-        <result property="id"    column="id"    />
-        <result property="nFKey"    column="n_f_key"    />
-        <result property="nodeKey"    column="node_key"    />
-        <result property="formKey"    column="form_key"    />
-        <result property="templateType"    column="template_type"    />
-    </resultMap>
-
-    <sql id="selectBpmNodeFormVo">
-        select id, n_f_key, node_key, form_key, template_type from bpm_node_form
-    </sql>
-
-    <select id="selectBpmNodeFormList" parameterType="com.ruoyi.system.entity.BpmNodeForm" resultMap="BpmNodeFormResult">
-        <include refid="selectBpmNodeFormVo"/>
-        <where>  
-            <if test="nFKey != null  and nFKey != ''"> and n_f_key = #{nFKey}</if>
-            <if test="nodeKey != null  and nodeKey != ''"> and node_key = #{nodeKey}</if>
-            <if test="formKey != null  and formKey != ''"> and form_key = #{formKey}</if>
-            <if test="templateType != null  and templateType != ''"> and template_type = #{templateType}</if>
-        </where>
-    </select>
-    
-    <select id="selectBpmNodeFormById" parameterType="Long" resultMap="BpmNodeFormResult">
-        <include refid="selectBpmNodeFormVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertBpmNodeForm" parameterType="com.ruoyi.system.entity.BpmNodeForm" useGeneratedKeys="true" keyProperty="id">
-        insert into bpm_node_form
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="nFKey != null">n_f_key,</if>
-            <if test="nodeKey != null">node_key,</if>
-            <if test="formKey != null">form_key,</if>
-            <if test="templateType != null">template_type,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="nFKey != null">#{nFKey},</if>
-            <if test="nodeKey != null">#{nodeKey},</if>
-            <if test="formKey != null">#{formKey},</if>
-            <if test="templateType != null">#{templateType},</if>
-         </trim>
-    </insert>
-
-    <update id="updateBpmNodeForm" parameterType="com.ruoyi.system.entity.BpmNodeForm">
-        update bpm_node_form
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="nFKey != null">n_f_key = #{nFKey},</if>
-            <if test="nodeKey != null">node_key = #{nodeKey},</if>
-            <if test="formKey != null">form_key = #{formKey},</if>
-            <if test="templateType != null">template_type = #{templateType},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteBpmNodeFormById" parameterType="Long">
-        delete from bpm_node_form where id = #{id}
-    </delete>
-
-    <delete id="deleteBpmNodeFormByIds" parameterType="String">
-        delete from bpm_node_form where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/src/main/resources/mapper/bpm/BpmProcessConfigurationMapper.xml

@@ -9,6 +9,7 @@
         <result property="nodeKey"    column="node_key"    />
         <result property="nodeName" column="node_name"/>
         <result property="nodeFormKey"    column="node_form_key"    />
+        <result property="nodeFormType" column="node_form_type"/>
         <result property="nodeProcessKey"    column="node_process_key"    />
         <result property="nodeType"    column="node_type"    />
         <result property="nodeExecuteType" column="node_execute_type"/>
@@ -31,6 +32,7 @@
                node_key,
                node_name,
                node_form_key,
+               node_form_type,
                node_process_key,
                node_type,
                node_execute_type,
@@ -72,14 +74,15 @@
 
     <insert id="insertBpmProcessConfiguration" parameterType="java.util.List">
         insert into {DBNAME}.bpm_process_configuration(
-        node_key,node_name,node_form_key, node_process_key,
+        node_key,node_name,node_form_key,node_form_type, node_process_key,
         node_type,node_execute_type, node_before, node_after,
         node_role_permission, spare1, spare2,
         spare3, del_flag,create_by_id,create_by,create_time,
         update_by_id,update_by,update_time, remark)
         values
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.nodeKey},#{item.nodeName}, #{item.nodeFormKey}, #{item.nodeProcessKey}, #{item.nodeType},#{item.nodeExecuteType}, #{item.nodeBefore},
+            (#{item.nodeKey},#{item.nodeName}, #{item.nodeFormKey},#{item.nodeFormType},
+            #{item.nodeProcessKey}, #{item.nodeType},#{item.nodeExecuteType}, #{item.nodeBefore},
             #{item.nodeAfter},
             #{item.nodeRolePermission}, #{item.spare1}, #{item.spare2}, #{item.spare3}, '0',
             #{item.createById},
@@ -96,6 +99,7 @@
             <if test="nodeKey != null">node_key = #{nodeKey},</if>
             <if test="nodeName != null">node_key = #{nodeName},</if>
             <if test="nodeFormKey != null">node_form_key = #{nodeFormKey},</if>
+            <if test="nodeFormType != null">node_form_type = #{nodeFormType},</if>
             <if test="nodeProcessKey != null">node_process_key = #{nodeProcessKey},</if>
             <if test="nodeType != null">node_type = #{nodeType},</if>
             <if test="nodeExecuteType != null">node_execute_type = #{nodeExecuteType},</if>