移除请假流程，增加接口对于mapper文件

boman-modules/boman-activity/src/main/java/com/boman/activity/domain/workflow/WorkflowLeave.java

@@ -1,164 +0,0 @@
-package com.boman.activity.domain.workflow;
-
-import java.util.Date;
-
-import com.boman.common.core.annotation.Excel;
-import com.boman.common.core.web.domain.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-
-/**
- * 请假对象 workflow_leave
- * 
- * @author danny
- * @date 2020-10-28
- */
-public class WorkflowLeave extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键ID */
-    private String id;
-
-    /** 请假类型 */
-    @Excel(name = "请假类型")
-    private String type;
-
-    /** 标题 */
-    @Excel(name = "标题")
-    private String title;
-
-    /** 原因 */
-    @Excel(name = "原因")
-    private String reason;
-
-    /** 开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date leaveStartTime;
-
-    /** 结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date leaveEndTime;
-
-
-    private String instanceId;
-    private String taskName;
-
-    /** 状态 */
-    @Excel(name = "状态")
-    private String state;
-
-    /** 创建人 */
-    @Excel(name = "创建人")
-    private String createName;
-
-    public void setId(String id) 
-    {
-        this.id = id;
-    }
-
-    public String getId() 
-    {
-        return id;
-    }
-    public void setType(String type) 
-    {
-        this.type = type;
-    }
-
-    public String getType() 
-    {
-        return type;
-    }
-    public void setTitle(String title) 
-    {
-        this.title = title;
-    }
-
-    public String getTitle() 
-    {
-        return title;
-    }
-    public void setReason(String reason) 
-    {
-        this.reason = reason;
-    }
-
-    public String getReason() 
-    {
-        return reason;
-    }
-    public void setLeaveStartTime(Date leaveStartTime) 
-    {
-        this.leaveStartTime = leaveStartTime;
-    }
-
-    public Date getLeaveStartTime() 
-    {
-        return leaveStartTime;
-    }
-    public void setLeaveEndTime(Date leaveEndTime) 
-    {
-        this.leaveEndTime = leaveEndTime;
-    }
-
-    public Date getLeaveEndTime() 
-    {
-        return leaveEndTime;
-    }
-    public void setInstanceId(String instanceId) 
-    {
-        this.instanceId = instanceId;
-    }
-
-    public String getInstanceId() 
-    {
-        return instanceId;
-    }
-    public void setState(String state) 
-    {
-        this.state = state;
-    }
-
-    public String getState() 
-    {
-        return state;
-    }
-
-    public String getCreateName() {
-        return createName;
-    }
-
-    public void setCreateName(String createName) {
-        this.createName = createName;
-    }
-
-    public String getTaskName() {
-        return taskName;
-    }
-
-    public void setTaskName(String taskName) {
-        this.taskName = taskName;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("type", getType())
-            .append("title", getTitle())
-            .append("reason", getReason())
-            .append("leaveStartTime", getLeaveStartTime())
-            .append("leaveEndTime", getLeaveEndTime())
-            .append("instanceId", getInstanceId())
-            .append("state", getState())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}

boman-modules/boman-activity/src/main/java/com/boman/activity/mapper/workflow/WorkflowLeaveMapper.java

@@ -1,77 +0,0 @@
-package com.boman.activity.mapper.workflow;
-
-import java.util.List;
-
-import com.boman.activity.domain.workflow.WorkflowLeave;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * 请假Mapper接口
- * 
- * @author danny
- * @date 2020-10-28
- */
-public interface WorkflowLeaveMapper 
-{
-    /**
-     * 查询请假
-     * 
-     * @param id 请假ID
-     * @return 请假
-     */
-    public WorkflowLeave selectWorkflowLeaveById(String id); /**
-     * 查询请假
-     *
-     * @param instanceId 请假ID
-     * @return 请假
-     */
-    public WorkflowLeave selectWorkflowLeaveByInstanceId(String instanceId);
-
-    /**
-     * 查询请假列表根据部门编号和WorkflowLeave
-     * 
-     * @param workflowLeave 请假
-     * @return 请假集合
-     */
-    public List<WorkflowLeave> selectWorkflowLeaveListByWorkflowLeaveAndDeptId(@Param("workflowLeave")WorkflowLeave workflowLeave,@Param("deptId") Long deptId);
-    /**
-     * 查询请假列表
-     *
-     * @param workflowLeave 请假
-     * @return 请假集合
-     */
-    public List<WorkflowLeave> selectWorkflowLeaveList(WorkflowLeave workflowLeave);
-
-
-    /**
-     * 新增请假
-     * 
-     * @param workflowLeave 请假
-     * @return 结果
-     */
-    public int insertWorkflowLeave(WorkflowLeave workflowLeave);
-
-    /**
-     * 修改请假
-     * 
-     * @param workflowLeave 请假
-     * @return 结果
-     */
-    public int updateWorkflowLeave(WorkflowLeave workflowLeave);
-
-    /**
-     * 删除请假
-     * 
-     * @param id 请假ID
-     * @return 结果
-     */
-    public int deleteWorkflowLeaveById(String id);
-
-    /**
-     * 批量删除请假
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteWorkflowLeaveByIds(String[] ids);
-}

boman-modules/boman-activity/src/main/resources/application.properties

@@ -1 +0,0 @@
-

boman-modules/boman-activity/src/main/resources/mapper/activiti/ActReDeploymentMapper.xml

@@ -0,0 +1,27 @@
+<?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.boman.activity.mapper.ActReDeploymentMapper">
+
+	<resultMap type="ActReDeploymentVO" id="ActReDeploymentResult">
+		<id     property="id"       column="id"      />
+		<result property="deployTime"       column="deploy_time"      />
+	</resultMap>
+	
+
+	<sql id="selectDeploymentVo">
+       select ID_ id,DEPLOY_TIME_ deploy_time from `act_re_deployment`
+    </sql>
+
+	
+	<select id="selectActReDeploymentByIds"  parameterType="String" resultMap="ActReDeploymentResult">
+	    <include refid="selectDeploymentVo"/>
+		where ID_  in
+		<foreach collection="ids" item="id" index="index" open="(" separator="," close=")">
+			#{id}
+		</foreach>
+	</select>
+
+
+</mapper> 

boman-modules/boman-activity/src/main/resources/mapper/activiti/ActWorkflowFormDataMapper.xml

@@ -0,0 +1,101 @@
+<?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.boman.activity.mapper.ActWorkflowFormDataMapper">
+    <resultMap type="ActWorkflowFormData" id="ActWorkflowFormDataResult">
+        <result property="id"    column="id"    />
+        <result property="businessKey"    column="business_key"    />
+        <result property="formKey"    column="form_key"    />
+        <result property="controlId"    column="control_id"    />
+        <result property="controlName"    column="control_name"    />
+        <result property="controlValue"    column="control_value"    />
+        <result property="taskNodeName"    column="task_node_name"    />
+        <result property="createName"    column="create_name"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+    </resultMap>
+
+    <sql id="selectActWorkflowFormDataVo">
+        select id, business_key, form_key, control_id,control_name, control_value, task_node_name, create_name,create_by, create_time from act_workflow_FormData
+    </sql>
+
+    <select id="selectActWorkflowFormDataList" parameterType="ActWorkflowFormData" resultMap="ActWorkflowFormDataResult">
+        <include refid="selectActWorkflowFormDataVo"/>
+        <where>
+            <if test="businessKey != null  and businessKey != ''"> and business_key = #{businessKey}</if>
+            <if test="formKey != null  and formKey != ''"> and form_key = #{formKey}</if>
+            <if test="controlId != null  and controlId != ''"> and control_id = #{controlId}</if>
+            <if test="controlValue != null  and controlValue != ''"> and control_value = #{controlValue}</if>
+            <if test="taskNodeName != null  and taskNodeName != ''"> and task_node_name = #{taskNodeName}</if>
+        </where>
+    </select>
+
+    <select id="selectActWorkflowFormDataById" parameterType="Long" resultMap="ActWorkflowFormDataResult">
+        <include refid="selectActWorkflowFormDataVo"/>
+        where id = #{id}
+    </select>
+    <select id="selectActWorkflowFormDataByBusinessKey" parameterType="string" resultMap="ActWorkflowFormDataResult">
+        <include refid="selectActWorkflowFormDataVo"/>
+        where  business_key = #{businessKey}
+    </select>
+
+    <insert id="insertActWorkflowFormData" parameterType="ActWorkflowFormData" useGeneratedKeys="true" keyProperty="id">
+        insert into act_workflow_FormData
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="businessKey != null">business_key,</if>
+            <if test="formKey != null">form_key,</if>
+            <if test="controlId != null">control_id,</if>
+            <if test="controlName != null">control_name,</if>
+            <if test="controlValue != null">control_value,</if>
+            <if test="taskNodeName != null">task_node_name,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="businessKey != null">#{businessKey},</if>
+            <if test="formKey != null">#{formKey},</if>
+            <if test="controlId != null">#{controlId},</if>
+            <if test="controlName != null">#{controlName},</if>
+            <if test="controlValue != null">#{controlValue},</if>
+            <if test="taskNodeName != null">#{taskNodeName},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+        </trim>
+    </insert>
+
+    <insert id="insertActWorkflowFormDatas"  useGeneratedKeys="true" >
+        insert into act_workflow_FormData (business_key,form_key,control_id,control_name,control_value,task_node_name,create_by,create_time,create_name) values
+        <foreach collection="param2" item="awfd" index="index" separator=",">
+            (#{awfd.businessKey},#{awfd.formKey},#{awfd.controlId},#{awfd.controlName}, #{awfd.controlValue},#{awfd.taskNodeName},#{param1},#{param3},#{param4})
+        </foreach>
+    </insert>
+
+    <update id="updateActWorkflowFormData" parameterType="ActWorkflowFormData">
+        update act_workflow_FormData
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="businessKey != null">business_key = #{businessKey},</if>
+            <if test="formKey != null">form_key = #{formKey},</if>
+            <if test="controlId != null">control_id = #{controlId},</if>
+            <if test="controlName != null">control_name = #{controlName},</if>
+            <if test="controlValue != null">control_value = #{controlValue},</if>
+            <if test="taskNodeName != null">task_node_name = #{taskNodeName},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteActWorkflowFormDataById" parameterType="Long">
+        delete from act_workflow_FormData where id = #{id}
+    </delete>
+
+    <delete id="deleteActWorkflowFormDataByIds" parameterType="String">
+        delete from act_workflow_FormData where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>
+

boman-modules/boman-activity/src/test/java/com/boman/activity/BomanActivityApplicationTests.java

@@ -1,13 +0,0 @@
-package com.boman.activity;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class BomanActivityApplicationTests {
-
-	@Test
-	void contextLoads() {
-	}
-
-}