应征入伍保留学籍工作流监听器
This commit is contained in:
@@ -70,9 +70,9 @@ private static final long serialVersionUID=1L;
|
||||
/**
|
||||
* 性别(0-男
|
||||
*/
|
||||
@ApiModelProperty("性别(0-男")
|
||||
@ApiModelProperty("性别(1-男 0-女)")
|
||||
@TableField("gender")
|
||||
@Excel(name = "性别" , readConverterExp = "性别(0-男")
|
||||
@Excel(name = "性别" , readConverterExp = "性别(1-男 0-女)")
|
||||
private String gender;
|
||||
|
||||
/**
|
||||
|
||||
@@ -15,7 +15,7 @@ import com.srs.common.core.domain.BaseEntity;
|
||||
* 保留学籍审批记录对象 rt_enlistment_reserve_approval
|
||||
*
|
||||
* @author srs
|
||||
* @date 2025-10-31
|
||||
* @date 2025-11-13
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@@ -25,7 +25,7 @@ import com.srs.common.core.domain.BaseEntity;
|
||||
@ApiModel(value = "RtEnlistmentReserveApproval对象" , description = "保留学籍审批记录")
|
||||
@TableName("rt_enlistment_reserve_approval")
|
||||
public class RtEnlistmentReserveApproval extends BaseEntity{
|
||||
private static final long serialVersionUID=1L;
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
@@ -107,5 +107,21 @@ private static final long serialVersionUID=1L;
|
||||
@Excel(name = "审批时间" , width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date approvalTime;
|
||||
|
||||
/**
|
||||
* 姓名
|
||||
*/
|
||||
@ApiModelProperty("姓名")
|
||||
@TableField("student_name")
|
||||
@Excel(name = "姓名")
|
||||
private String studentName;
|
||||
|
||||
/**
|
||||
* 学号
|
||||
*/
|
||||
@ApiModelProperty("学号")
|
||||
@TableField("student_no")
|
||||
@Excel(name = "学号")
|
||||
private String studentNo;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -4,12 +4,13 @@ import java.util.List;
|
||||
|
||||
import com.srs.routine.domain.RtEnlistmentReserveApproval;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
/**
|
||||
* 保留学籍审批记录Mapper接口
|
||||
*
|
||||
* @author srs
|
||||
* @date 2025-10-31
|
||||
* @date 2025-11-13
|
||||
*/
|
||||
public interface RtEnlistmentReserveApprovalMapper extends BaseMapper<RtEnlistmentReserveApproval> {
|
||||
/**
|
||||
@@ -52,6 +53,14 @@ public interface RtEnlistmentReserveApprovalMapper extends BaseMapper<RtEnlistme
|
||||
*/
|
||||
int deleteRtEnlistmentReserveApprovalById(Long id);
|
||||
|
||||
/**
|
||||
* 根据学生姓名学号和审批人id查询保留学籍审批记录
|
||||
*
|
||||
* @param
|
||||
* @return 结果
|
||||
*/
|
||||
RtEnlistmentReserveApproval selectRtEnlistmentReserveApprovalByStuName(@Param("studentName") String studentName, @Param("studentNo") String studentNo, @Param("approverId") Long approverId);
|
||||
|
||||
/**
|
||||
* 批量删除保留学籍审批记录
|
||||
*
|
||||
|
||||
@@ -196,7 +196,7 @@ public class RtEnlistmentReserveServiceImpl extends ServiceImpl<RtEnlistmentRese
|
||||
variables.put("deptId", counselorInfo.getDeptId());
|
||||
|
||||
// 3. 启动流程
|
||||
AjaxResult ajaxResult = flowDefinitionService.startProcessInstanceById("flow_r064jfpz:7:1055004", variables);
|
||||
AjaxResult ajaxResult = flowDefinitionService.startProcessInstanceById("flow_r064jfpz:8:1080009", variables);
|
||||
String code = ajaxResult.get("code").toString();
|
||||
if (!"200".equals(code)) {
|
||||
throw new ServiceException("流程启动失败,错误码:" + code, 500);
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
<?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">
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.srs.routine.mapper.RtEnlistmentReserveApprovalMapper">
|
||||
|
||||
<resultMap type="RtEnlistmentReserveApproval" id="RtEnlistmentReserveApprovalResult">
|
||||
|
||||
<resultMap type="EnlistmentReserveApproval" id="RtEnlistmentReserveApprovalResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="applyId" column="apply_id" />
|
||||
<result property="processInstanceId" column="process_instance_id" />
|
||||
@@ -15,15 +15,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="approvalOpinion" column="approval_opinion" />
|
||||
<result property="approvalResult" column="approval_result" />
|
||||
<result property="approvalTime" column="approval_time" />
|
||||
<result property="studentName" column="student_name" />
|
||||
<result property="studentNo" column="student_no" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectRtEnlistmentReserveApprovalVo">
|
||||
select id, apply_id, process_instance_id, task_id, node_name, approver_id, approver_name, approval_opinion, approval_result, approval_time from rt_enlistment_reserve_approval
|
||||
select id, apply_id, process_instance_id, task_id, node_name, approver_id, approver_name, approval_opinion, approval_result, approval_time, student_name, student_no from rt_enlistment_reserve_approval
|
||||
</sql>
|
||||
|
||||
<select id="selectRtEnlistmentReserveApprovalList" parameterType="RtEnlistmentReserveApproval" resultMap="RtEnlistmentReserveApprovalResult">
|
||||
<select id="selectRtEnlistmentReserveApprovalList" parameterType="EnlistmentReserveApproval" resultMap="RtEnlistmentReserveApprovalResult">
|
||||
<include refid="selectRtEnlistmentReserveApprovalVo"/>
|
||||
<where>
|
||||
<where>
|
||||
<if test="applyId != null "> and apply_id = #{applyId}</if>
|
||||
<if test="processInstanceId != null and processInstanceId != ''"> and process_instance_id = #{processInstanceId}</if>
|
||||
<if test="taskId != null and taskId != ''"> and task_id = #{taskId}</if>
|
||||
@@ -33,15 +35,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="approvalOpinion != null and approvalOpinion != ''"> and approval_opinion = #{approvalOpinion}</if>
|
||||
<if test="approvalResult != null "> and approval_result = #{approvalResult}</if>
|
||||
<if test="approvalTime != null "> and approval_time = #{approvalTime}</if>
|
||||
<if test="studentName != null and studentName != ''"> and student_name like concat('%', #{studentName}, '%')</if>
|
||||
<if test="studentNo != null and studentNo != ''"> and student_no = #{studentNo}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
|
||||
<select id="selectRtEnlistmentReserveApprovalById" parameterType="Long" resultMap="RtEnlistmentReserveApprovalResult">
|
||||
<include refid="selectRtEnlistmentReserveApprovalVo"/>
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertRtEnlistmentReserveApproval" parameterType="RtEnlistmentReserveApproval" useGeneratedKeys="true" keyProperty="id">
|
||||
|
||||
<select id="selectRtEnlistmentReserveApprovalByStuName" resultMap="RtEnlistmentReserveApprovalResult">
|
||||
select *
|
||||
from rt_enlistment_reserve_approval
|
||||
<where>
|
||||
<if test="studentName != null and studentName != ''">
|
||||
and student_name = #{studentName}
|
||||
</if>
|
||||
<if test="studentNo != null and studentNo != ''">
|
||||
and student_no = #{studentNo}
|
||||
</if>
|
||||
<if test="approverId != null and approverId != ''">
|
||||
and approver_id = #{approverId}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<insert id="insertRtEnlistmentReserveApproval" parameterType="EnlistmentReserveApproval" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into rt_enlistment_reserve_approval
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="applyId != null">apply_id,</if>
|
||||
@@ -53,7 +73,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="approvalOpinion != null">approval_opinion,</if>
|
||||
<if test="approvalResult != null">approval_result,</if>
|
||||
<if test="approvalTime != null">approval_time,</if>
|
||||
</trim>
|
||||
<if test="studentName != null and studentName != ''">student_name,</if>
|
||||
<if test="studentNo != null and studentNo != ''">student_no,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="applyId != null">#{applyId},</if>
|
||||
<if test="processInstanceId != null and processInstanceId != ''">#{processInstanceId},</if>
|
||||
@@ -64,10 +86,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="approvalOpinion != null">#{approvalOpinion},</if>
|
||||
<if test="approvalResult != null">#{approvalResult},</if>
|
||||
<if test="approvalTime != null">#{approvalTime},</if>
|
||||
</trim>
|
||||
<if test="studentName != null and studentName != ''">#{studentName},</if>
|
||||
<if test="studentNo != null and studentNo != ''">#{studentNo},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateRtEnlistmentReserveApproval" parameterType="RtEnlistmentReserveApproval">
|
||||
<update id="updateRtEnlistmentReserveApproval" parameterType="EnlistmentReserveApproval">
|
||||
update rt_enlistment_reserve_approval
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="applyId != null">apply_id = #{applyId},</if>
|
||||
@@ -79,6 +103,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="approvalOpinion != null">approval_opinion = #{approvalOpinion},</if>
|
||||
<if test="approvalResult != null">approval_result = #{approvalResult},</if>
|
||||
<if test="approvalTime != null">approval_time = #{approvalTime},</if>
|
||||
<if test="studentName != null and studentName != ''">student_name = #{studentName},</if>
|
||||
<if test="studentNo != null and studentNo != ''">student_no = #{studentNo},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
@@ -88,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
</delete>
|
||||
|
||||
<delete id="deleteRtEnlistmentReserveApprovalByIds" parameterType="String">
|
||||
delete from rt_enlistment_reserve_approval where id in
|
||||
delete from rt_enlistment_reserve_approval where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
|
||||
@@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
WHERE a.stu_no = #{stuNo}
|
||||
</select>
|
||||
|
||||
<insert id="insertRtEnlistmentReserve" parameterType="RtEnlistmentReserve" useGeneratedKeys="true" keyProperty="id">
|
||||
<insert id="insertRtEnlistmentReserve" parameterType="EnlistmentReserve" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into rt_enlistment_reserve
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="applyNo != null and applyNo != ''">apply_no,</if>
|
||||
@@ -128,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateRtEnlistmentReserve" parameterType="RtEnlistmentReserve">
|
||||
<update id="updateRtEnlistmentReserve" parameterType="EnlistmentReserve">
|
||||
update rt_enlistment_reserve
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="applyNo != null and applyNo != ''">apply_no = #{applyNo},</if>
|
||||
|
||||
Reference in New Issue
Block a user