diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationApproval.java b/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationApproval.java index e6c006a..b61e3f3 100644 --- a/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationApproval.java +++ b/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationApproval.java @@ -1,6 +1,7 @@ package com.srs.dormitory.domain; import java.util.Date; + import com.fasterxml.jackson.annotation.JsonFormat; import com.srs.common.annotation.Excel; import com.baomidou.mybatisplus.annotation.*; @@ -10,22 +11,21 @@ import lombok.*; import com.srs.common.core.domain.BaseEntity; - /** * 外宿申请审批记录对象 dms_outside_accommodation_approval * * @author srs - * @date 2025-12-05 + * @date 2025-12-19 */ @Data @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel(value = "DmsOutsideAccommodationApproval对象" , description = "外宿申请审批记录表") +@ApiModel(value = "DmsOutsideAccommodationApproval对象", description = "外宿申请审批记录表") @TableName("dms_outside_accommodation_approval") -public class DmsOutsideAccommodationApproval extends BaseEntity{ -private static final long serialVersionUID=1L; +public class DmsOutsideAccommodationApproval extends BaseEntity { + private static final long serialVersionUID = 1L; /** * 主键ID @@ -39,7 +39,7 @@ private static final long serialVersionUID=1L; */ @ApiModelProperty("外宿申请ID（关联申请表）") @TableField("apply_id") - @Excel(name = "外宿申请ID" , readConverterExp = "关=联申请表") + @Excel(name = "外宿申请ID", readConverterExp = "关=联申请表") private Long applyId; /** @@ -95,7 +95,7 @@ private static final long serialVersionUID=1L; */ @ApiModelProperty("审批结果（1=同意，0=驳回）") @TableField("approval_result") - @Excel(name = "审批结果" , readConverterExp = "1==同意，0=驳回") + @Excel(name = "审批结果", readConverterExp = "1==同意，0=驳回") private Long approvalResult; /** @@ -104,7 +104,7 @@ private static final long serialVersionUID=1L; @ApiModelProperty("审批时间") @TableField("approval_time") @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "审批时间" , width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "审批时间", width = 30, dateFormat = "yyyy-MM-dd") private Date approvalTime; /** @@ -131,5 +131,13 @@ private static final long serialVersionUID=1L; @Excel(name = "学生学号") private String studentNo; + /** + * 签名 + */ + @ApiModelProperty("签名") + @TableField("signature") + @Excel(name = "签名") + private String signature; + } diff --git a/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApplyMapper.xml b/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApplyMapper.xml index f4d0f33..b24e915 100644 --- a/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApplyMapper.xml +++ b/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApplyMapper.xml @@ -49,7 +49,7 @@ - + + @@ -90,7 +91,7 @@ - + diff --git a/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApprovalMapper.xml b/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApprovalMapper.xml index e3c6fa4..d1a6668 100644 --- a/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApprovalMapper.xml +++ b/dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApprovalMapper.xml @@ -18,6 +18,7 @@ + @@ -33,7 +34,8 @@ approval_time, process_instance_id, student_name, - student_no + student_no, + signature from dms_outside_accommodation_approval @@ -59,6 +61,7 @@ '%') and student_no = #{studentNo} + and signature = #{signature} @@ -100,6 +103,7 @@ process_instance_id, student_name, student_no, + signature, #{applyId}, @@ -114,6 +118,7 @@ #{processInstanceId}, #{studentName}, #{studentNo}, + #{signature}, @@ -132,6 +137,7 @@ process_instance_id = #{processInstanceId}, student_name = #{studentName}, student_no = #{studentNo}, + signature = #{signature}, where id = #{id} diff --git a/srs-flowable/src/main/java/com/srs/flowable/domain/EnlistmentReserveApproval.java b/srs-flowable/src/main/java/com/srs/flowable/domain/EnlistmentReserveApproval.java index d33c691..baf6d91 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/domain/EnlistmentReserveApproval.java +++ b/srs-flowable/src/main/java/com/srs/flowable/domain/EnlistmentReserveApproval.java @@ -1,6 +1,7 @@ package com.srs.flowable.domain; import java.util.Date; + import com.fasterxml.jackson.annotation.JsonFormat; import com.srs.common.annotation.Excel; import com.baomidou.mybatisplus.annotation.*; @@ -10,7 +11,6 @@ import lombok.*; import com.srs.common.core.domain.BaseEntity; - /** * 保留学籍审批记录对象 rt_enlistment_reserve_approval * @@ -22,10 +22,10 @@ import com.srs.common.core.domain.BaseEntity; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel(value = "RtEnlistmentReserveApproval对象" , description = "保留学籍审批记录") +@ApiModel(value = "RtEnlistmentReserveApproval对象", description = "保留学籍审批记录") @TableName("rt_enlistment_reserve_approval") -public class EnlistmentReserveApproval extends BaseEntity{ - private static final long serialVersionUID=1L; +public class EnlistmentReserveApproval extends BaseEntity { + private static final long serialVersionUID = 1L; /** * 主键 @@ -63,7 +63,7 @@ public class EnlistmentReserveApproval extends BaseEntity{ */ @ApiModelProperty("审批节点（辅导员/学务等）") @TableField("node_name") - @Excel(name = "审批节点" , readConverterExp = "辅=导员/学务等") + @Excel(name = "审批节点", readConverterExp = "辅=导员/学务等") private String nodeName; /** @@ -71,7 +71,7 @@ public class EnlistmentReserveApproval extends BaseEntity{ */ @ApiModelProperty("审批人ID（关联sys_user）") @TableField("approver_id") - @Excel(name = "审批人ID" , readConverterExp = "关=联sys_user") + @Excel(name = "审批人ID", readConverterExp = "关=联sys_user") private Long approverId; /** @@ -95,7 +95,7 @@ public class EnlistmentReserveApproval extends BaseEntity{ */ @ApiModelProperty("审批结果（1-通过") @TableField("approval_result") - @Excel(name = "审批结果" , readConverterExp = "审批结果（1-通过") + @Excel(name = "审批结果", readConverterExp = "审批结果（1-通过") private Long approvalResult; /** @@ -104,7 +104,7 @@ public class EnlistmentReserveApproval extends BaseEntity{ @ApiModelProperty("审批时间") @TableField("approval_time") @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "审批时间" , width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "审批时间", width = 30, dateFormat = "yyyy-MM-dd") private Date approvalTime; /** @@ -123,5 +123,12 @@ public class EnlistmentReserveApproval extends BaseEntity{ @Excel(name = "学号") private String studentNo; + /** + * 签名 + */ + @ApiModelProperty("签名") + @TableField("signature") + @Excel(name = "签名") + private String signature; } diff --git a/srs-flowable/src/main/java/com/srs/flowable/domain/OutsideAccommodationApproval.java b/srs-flowable/src/main/java/com/srs/flowable/domain/OutsideAccommodationApproval.java index dbadaab..aa267c1 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/domain/OutsideAccommodationApproval.java +++ b/srs-flowable/src/main/java/com/srs/flowable/domain/OutsideAccommodationApproval.java @@ -14,7 +14,6 @@ import lombok.*; import java.util.Date; - /** * 外宿申请审批记录对象 dms_outside_accommodation_approval * @@ -26,10 +25,10 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel(value = "DmsOutsideAccommodationApproval对象" , description = "外宿申请审批记录表") +@ApiModel(value = "DmsOutsideAccommodationApproval对象", description = "外宿申请审批记录表") @TableName("dms_outside_accommodation_approval") -public class OutsideAccommodationApproval extends BaseEntity{ -private static final long serialVersionUID=1L; +public class OutsideAccommodationApproval extends BaseEntity { + private static final long serialVersionUID = 1L; /** * 主键ID @@ -43,7 +42,7 @@ private static final long serialVersionUID=1L; */ @ApiModelProperty("外宿申请ID（关联申请表）") @TableField("apply_id") - @Excel(name = "外宿申请ID" , readConverterExp = "关=联申请表") + @Excel(name = "外宿申请ID", readConverterExp = "关=联申请表") private Long applyId; /** @@ -99,7 +98,7 @@ private static final long serialVersionUID=1L; */ @ApiModelProperty("审批结果（1=同意，0=驳回）") @TableField("approval_result") - @Excel(name = "审批结果" , readConverterExp = "1==同意，0=驳回") + @Excel(name = "审批结果", readConverterExp = "1==同意，0=驳回") private Long approvalResult; /** @@ -108,7 +107,7 @@ private static final long serialVersionUID=1L; @ApiModelProperty("审批时间") @TableField("approval_time") @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "审批时间" , width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "审批时间", width = 30, dateFormat = "yyyy-MM-dd") private Date approvalTime; /** @@ -136,4 +135,12 @@ private static final long serialVersionUID=1L; private String studentNo; + /** + * 签名 + */ + @ApiModelProperty("签名") + @TableField("signature") + @Excel(name = "签名") + private String signature; + } diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/enlistmentReserve/ApprovalAssigneeListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/enlistmentReserve/ApprovalAssigneeListener.java index 4fd0322..c2ddf88 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/listener/enlistmentReserve/ApprovalAssigneeListener.java +++ b/srs-flowable/src/main/java/com/srs/flowable/listener/enlistmentReserve/ApprovalAssigneeListener.java @@ -61,6 +61,9 @@ public class ApprovalAssigneeListener implements ExecutionListener { // 获取审核意见 String approvalOpinion = (String) execution.getVariable("approvalOpinion"); + // 获取签名 + String signature = (String) execution.getVariable("signature"); + // 获取审核状态（兼容Integer/Long类型） Object approvalResultObj = execution.getVariable("approvalResult"); Long approvalResult = null; @@ -74,7 +77,7 @@ public class ApprovalAssigneeListener implements ExecutionListener { // 根据Id查询入伍申请记录 EnlistmentReserve enlistmentReserve = rtEnlistmentReserveMapper.selectRtEnlistmentReserveById(enlistmentId); // 添加审批记录 - saveApprovalRecord(enlistmentReserve.getId(), enlistmentReserve.getProcessInstanceId(),currentActivityId,currentNodeName, enlistmentReserve.getStudentName(), enlistmentReserve.getStudentNo(), approvalOpinion, approvalResult); + saveApprovalRecord(enlistmentReserve.getId(), enlistmentReserve.getProcessInstanceId(),currentActivityId,currentNodeName, enlistmentReserve.getStudentName(), enlistmentReserve.getStudentNo(), approvalOpinion, approvalResult, signature); Long status = 1L; if (currentNodeName.equals("辅导员审批")) { @@ -120,7 +123,7 @@ public class ApprovalAssigneeListener implements ExecutionListener { /** * 通用审批记录保存方法 */ - private void saveApprovalRecord(Long ApplyId,String processInstanceId, String taskId, String nodeName, String studentName, String studentNo, String approvalOpinion, Long approvalResult) { + private void saveApprovalRecord(Long ApplyId,String processInstanceId, String taskId, String nodeName, String studentName, String studentNo, String approvalOpinion, Long approvalResult, String signature) { EnlistmentReserveApproval enlistmentReserveApproval = new EnlistmentReserveApproval(); // 赋值 enlistmentReserveApproval.setApplyId(ApplyId); @@ -141,7 +144,9 @@ public class ApprovalAssigneeListener implements ExecutionListener { enlistmentReserveApproval.setApprovalTime(new Date()); enlistmentReserveApproval.setStudentName(studentName); enlistmentReserveApproval.setStudentNo(studentNo); - System.out.println(SecurityUtils.getLoginUser().getUser()); +// System.out.println(SecurityUtils.getLoginUser().getUser()); + // 设置签名 + enlistmentReserveApproval.setSignature(signature); EnlistmentReserveApprovalMapper rtEnlistmentReserveApprovalMapper = (EnlistmentReserveApprovalMapper) SpringUtils.getBean(EnlistmentReserveApprovalMapper.class); // 查询审批记录是否存在 EnlistmentReserveApproval enlistmentReserveApproval1 = rtEnlistmentReserveApprovalMapper.selectRtEnlistmentReserveApprovalByStuName(studentName, studentNo, SecurityUtils.getLoginUser().getUser().getUserId()); diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/outsideAccommodation/OutsideAccommodationEndListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/outsideAccommodation/OutsideAccommodationEndListener.java index 308d58e..2613247 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/listener/outsideAccommodation/OutsideAccommodationEndListener.java +++ b/srs-flowable/src/main/java/com/srs/flowable/listener/outsideAccommodation/OutsideAccommodationEndListener.java @@ -48,6 +48,9 @@ public class OutsideAccommodationEndListener implements ExecutionListener { // 获取审核意见 String approvalOpinion = (String) execution.getVariable("approvalOpinion"); + // 获取签名 + String signature = (String) execution.getVariable("signature"); + // 获取审核状态（兼容Integer/Long类型） Object approvalResultObj = execution.getVariable("approvalResult"); Long approvalResult = null; @@ -62,7 +65,7 @@ public class OutsideAccommodationEndListener implements ExecutionListener { // 根据Id查询外宿申请记录 OutsideAccommodationApply outsideAccommodationApply = outsideAccommodationApplyMapper.selectDmsOutsideAccommodationApplyById(accommodationId); // 添加审批记录 - saveApprovalRecord(outsideAccommodationApply.getId(), outsideAccommodationApply.getProcessInstanceId(),outsideAccommodationApply.getApplyNo(),currentNodeName, outsideAccommodationApply.getStudentName(), outsideAccommodationApply.getStudentNo(), approvalOpinion, approvalResult); + saveApprovalRecord(outsideAccommodationApply.getId(), outsideAccommodationApply.getProcessInstanceId(),outsideAccommodationApply.getApplyNo(),currentNodeName, outsideAccommodationApply.getStudentName(), outsideAccommodationApply.getStudentNo(), approvalOpinion, approvalResult, signature); Long status = 1L; if (currentNodeName.equals("辅导员审批")) { status = 2L; @@ -105,7 +108,7 @@ public class OutsideAccommodationEndListener implements ExecutionListener { /** * 通用审批记录保存方法 */ - private void saveApprovalRecord(Long ApplyId,String processInstanceId, String applyNo, String nodeName, String studentName, String studentNo, String approvalOpinion, Long approvalResult) { + private void saveApprovalRecord(Long ApplyId,String processInstanceId, String applyNo, String nodeName, String studentName, String studentNo, String approvalOpinion, Long approvalResult, String signature) { OutsideAccommodationApproval outsideAccommodationApproval = new OutsideAccommodationApproval(); // 赋值 outsideAccommodationApproval.setApplyId(ApplyId); @@ -126,6 +129,8 @@ public class OutsideAccommodationEndListener implements ExecutionListener { outsideAccommodationApproval.setApprovalTime(new Date()); outsideAccommodationApproval.setStudentName(studentName); outsideAccommodationApproval.setStudentNo(studentNo); + // 设置签名 + outsideAccommodationApproval.setSignature(signature); OutsideAccommodationApprovalMapper outsideAccommodationApprovalMapper = (OutsideAccommodationApprovalMapper) SpringUtils.getBean(OutsideAccommodationApprovalMapper.class); // 查询审批记录是否存在 OutsideAccommodationApproval approval = outsideAccommodationApprovalMapper.selectOutsideAccommodationApprovalByStuName(studentName, studentNo, SecurityUtils.getLoginUser().getUser().getUserId()); diff --git a/srs-flowable/src/main/resources/mapper/EnlistmentReserveApprovalMapper.xml b/srs-flowable/src/main/resources/mapper/EnlistmentReserveApprovalMapper.xml index 734e30f..ebdf34d 100644 --- a/srs-flowable/src/main/resources/mapper/EnlistmentReserveApprovalMapper.xml +++ b/srs-flowable/src/main/resources/mapper/EnlistmentReserveApprovalMapper.xml @@ -5,42 +5,64 @@ - - - - - - - - - - - - + + + + + + + + + + + + + - 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 + 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, + signature + from rt_enlistment_reserve_approval - - and apply_id = #{applyId} - and process_instance_id = #{processInstanceId} - and task_id = #{taskId} - and node_name like concat('%', #{nodeName}, '%') - and approver_id = #{approverId} - and approver_name like concat('%', #{approverName}, '%') - and approval_opinion = #{approvalOpinion} - and approval_result = #{approvalResult} - and approval_time = #{approvalTime} - and student_name like concat('%', #{studentName}, '%') - and student_no = #{studentNo} + and apply_id = #{applyId} + and process_instance_id = + #{processInstanceId} + + and task_id = #{taskId} + and node_name like concat('%', #{nodeName}, '%') + and approver_id = #{approverId} + and approver_name like concat('%', #{approverName}, + '%') + + and approval_opinion = #{approvalOpinion} + and approval_result = #{approvalResult} + and approval_time = #{approvalTime} + and student_name like concat('%', #{studentName}, + '%') + + and student_no = #{studentNo} - where id = #{id} @@ -61,7 +83,8 @@ - + insert into rt_enlistment_reserve_approval apply_id, @@ -75,6 +98,7 @@ approval_time, student_name, student_no, + signature, #{applyId}, @@ -88,6 +112,7 @@ #{approvalTime}, #{studentName}, #{studentNo}, + #{signature}, @@ -95,7 +120,9 @@ update rt_enlistment_reserve_approval apply_id = #{applyId}, - process_instance_id = #{processInstanceId}, + process_instance_id = + #{processInstanceId}, + task_id = #{taskId}, node_name = #{nodeName}, approver_id = #{approverId}, @@ -105,12 +132,15 @@ approval_time = #{approvalTime}, student_name = #{studentName}, student_no = #{studentNo}, + signature = #{signature}, where id = #{id} - delete from rt_enlistment_reserve_approval where id = #{id} + delete + from rt_enlistment_reserve_approval + where id = #{id} diff --git a/srs-flowable/src/main/resources/mapper/OutsideAccommodationApprovalMapper.xml b/srs-flowable/src/main/resources/mapper/OutsideAccommodationApprovalMapper.xml index a2be377..c28c1fc 100644 --- a/srs-flowable/src/main/resources/mapper/OutsideAccommodationApprovalMapper.xml +++ b/srs-flowable/src/main/resources/mapper/OutsideAccommodationApprovalMapper.xml @@ -1,48 +1,72 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - - - - - - - - - - - - - + + + + + + + + + + + + + + - select id, apply_id, apply_no, approval_node, approver_id, approver_name, approver_role, approval_opinion, approval_result, approval_time, process_instance_id, student_name, student_no from dms_outside_accommodation_approval + select id, + apply_id, + apply_no, + approval_node, + approver_id, + approver_name, + approver_role, + approval_opinion, + approval_result, + approval_time, + process_instance_id, + student_name, + student_no, + signature + from dms_outside_accommodation_approval - - - and apply_id = #{applyId} - and apply_no = #{applyNo} - and approval_node = #{approvalNode} - and approver_id = #{approverId} - and approver_name like concat('%', #{approverName}, '%') - and approver_role = #{approverRole} - and approval_opinion = #{approvalOpinion} - and approval_result = #{approvalResult} - and approval_time = #{approvalTime} - and process_instance_id = #{processInstanceId} - and student_name like concat('%', #{studentName}, '%') - and student_no = #{studentNo} + + and apply_id = #{applyId} + and apply_no = #{applyNo} + and approval_node = #{approvalNode} + and approver_id = #{approverId} + and approver_name like concat('%', #{approverName}, + '%') + + and approver_role = #{approverRole} + and approval_opinion = #{approvalOpinion} + and approval_result = #{approvalResult} + and approval_time = #{approvalTime} + and process_instance_id = + #{processInstanceId} + + and student_name like concat('%', #{studentName}, + '%') + + and student_no = #{studentNo} + and signature = #{signature} - - where id = #{id} @@ -62,8 +86,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + insert into dms_outside_accommodation_approval apply_id, @@ -78,7 +103,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" process_instance_id, student_name, student_no, - + signature, + #{applyId}, #{applyNo}, @@ -92,7 +118,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{processInstanceId}, #{studentName}, #{studentNo}, - + #{signature}, + @@ -110,16 +137,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" process_instance_id = #{processInstanceId}, student_name = #{studentName}, student_no = #{studentNo}, + signature = #{signature}, where id = #{id} - delete from dms_outside_accommodation_approval where id = #{id} + delete + from dms_outside_accommodation_approval + where id = #{id} - delete from dms_outside_accommodation_approval where id in + delete from dms_outside_accommodation_approval where id in #{id} diff --git a/srs-routine/src/main/java/com/srs/routine/domain/RtEnlistmentReserveApproval.java b/srs-routine/src/main/java/com/srs/routine/domain/RtEnlistmentReserveApproval.java index b9964ff..728fb5b 100644 --- a/srs-routine/src/main/java/com/srs/routine/domain/RtEnlistmentReserveApproval.java +++ b/srs-routine/src/main/java/com/srs/routine/domain/RtEnlistmentReserveApproval.java @@ -1,6 +1,7 @@ package com.srs.routine.domain; import java.util.Date; + import com.fasterxml.jackson.annotation.JsonFormat; import com.srs.common.annotation.Excel; import com.baomidou.mybatisplus.annotation.*; @@ -10,7 +11,6 @@ import lombok.*; import com.srs.common.core.domain.BaseEntity; - /** * 保留学籍审批记录对象 rt_enlistment_reserve_approval * @@ -22,10 +22,10 @@ import com.srs.common.core.domain.BaseEntity; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel(value = "RtEnlistmentReserveApproval对象" , description = "保留学籍审批记录") +@ApiModel(value = "RtEnlistmentReserveApproval对象", description = "保留学籍审批记录") @TableName("rt_enlistment_reserve_approval") -public class RtEnlistmentReserveApproval extends BaseEntity{ - private static final long serialVersionUID=1L; +public class RtEnlistmentReserveApproval extends BaseEntity { + private static final long serialVersionUID = 1L; /** * 主键 @@ -63,7 +63,7 @@ public class RtEnlistmentReserveApproval extends BaseEntity{ */ @ApiModelProperty("审批节点（辅导员/学务等）") @TableField("node_name") - @Excel(name = "审批节点" , readConverterExp = "辅=导员/学务等") + @Excel(name = "审批节点", readConverterExp = "辅=导员/学务等") private String nodeName; /** @@ -71,7 +71,7 @@ public class RtEnlistmentReserveApproval extends BaseEntity{ */ @ApiModelProperty("审批人ID（关联sys_user）") @TableField("approver_id") - @Excel(name = "审批人ID" , readConverterExp = "关=联sys_user") + @Excel(name = "审批人ID", readConverterExp = "关=联sys_user") private Long approverId; /** @@ -95,7 +95,7 @@ public class RtEnlistmentReserveApproval extends BaseEntity{ */ @ApiModelProperty("审批结果（1-通过") @TableField("approval_result") - @Excel(name = "审批结果" , readConverterExp = "审批结果（1-通过") + @Excel(name = "审批结果", readConverterExp = "审批结果（1-通过") private Long approvalResult; /** @@ -104,7 +104,7 @@ public class RtEnlistmentReserveApproval extends BaseEntity{ @ApiModelProperty("审批时间") @TableField("approval_time") @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "审批时间" , width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "审批时间", width = 30, dateFormat = "yyyy-MM-dd") private Date approvalTime; /** @@ -123,5 +123,13 @@ public class RtEnlistmentReserveApproval extends BaseEntity{ @Excel(name = "学号") private String studentNo; + /** + * 签名 + */ + @ApiModelProperty("签名") + @TableField("signature") + @Excel(name = "签名") + private String signature; + } diff --git a/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveApprovalMapper.xml b/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveApprovalMapper.xml index 216286e..01873dd 100644 --- a/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveApprovalMapper.xml +++ b/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveApprovalMapper.xml @@ -17,6 +17,7 @@ + @@ -31,7 +32,8 @@ approval_result, approval_time, student_name, - student_no + student_no, + signature from rt_enlistment_reserve_approval @@ -96,6 +98,7 @@ approval_time, student_name, student_no, + signature, #{applyId}, @@ -109,6 +112,7 @@ #{approvalTime}, #{studentName}, #{studentNo}, + #{signature}, @@ -128,6 +132,7 @@ approval_time = #{approvalTime}, student_name = #{studentName}, student_no = #{studentNo}, + signature = #{signature}, where id = #{id} diff --git a/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveMapper.xml b/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveMapper.xml index 5d0ed9b..cf7e2a1 100644 --- a/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveMapper.xml +++ b/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveMapper.xml @@ -28,7 +28,7 @@ - + + @@ -158,7 +159,7 @@ and reserve_end_date = #{reserveEndDate} and approval_no = #{approvalNo} and affix_id = #{affixId} - and deploy_id = #{deployId} + and deploy_id = #{deployId}