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 eeec62f..c155a2c 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
@@ -70,18 +70,33 @@ public class ApprovalAssigneeListener implements ExecutionListener {
approvalResult = num.longValue();
}
- // 添加审批记录
EnlistmentReserveMapper rtEnlistmentReserveMapper = (EnlistmentReserveMapper) SpringUtils.getBean(EnlistmentReserveMapper.class);
// 根据Id查询入伍申请记录
EnlistmentReserve enlistmentReserve = rtEnlistmentReserveMapper.selectRtEnlistmentReserveById(enlistmentId);
+ // 添加审批记录
saveApprovalRecord(enlistmentReserve.getId(), enlistmentReserve.getProcessInstanceId(),currentActivityId,currentNodeName, enlistmentReserve.getStudentName(), enlistmentReserve.getStudentNo(), approvalOpinion, approvalResult);
+ Long status = 1L;
+ if (currentNodeName.equals("辅导员审批")) {
+ status = 2L;
+ }
+ if (currentNodeName.equals("学务审批")) {
+ status = 3L;
+ }
+ if (currentNodeName.equals("二级学院审批")) {
+ status = 4L;
+ }
+ if (currentNodeName.equals("学籍管理科审批")){
+ // 改变申请表中的审核状态(审核通过)
+ status = 5L;
+ }
// 如果到了最后一个审批人,则修改申请表审核状态
if (currentNodeName.equals("教务处主管领导审批")){
- // 改变申请表中的审核状态(审核通过)
- enlistmentReserve.setApplyStatus(2L);
- rtEnlistmentReserveMapper.updateRtEnlistmentReserve(enlistmentReserve);
+ status = 6L;
}
+ // 改变申请表中的审核状态(审核通过)
+ enlistmentReserve.setApplyStatus(status);
+ rtEnlistmentReserveMapper.updateRtEnlistmentReserve(enlistmentReserve);
}
/**
diff --git a/srs-routine/src/main/java/com/srs/routine/domain/RtEnlistmentReserve.java b/srs-routine/src/main/java/com/srs/routine/domain/RtEnlistmentReserve.java
index 5b2b0ba..49e6ec0 100644
--- a/srs-routine/src/main/java/com/srs/routine/domain/RtEnlistmentReserve.java
+++ b/srs-routine/src/main/java/com/srs/routine/domain/RtEnlistmentReserve.java
@@ -142,11 +142,11 @@ private static final long serialVersionUID=1L;
private String applyReason;
/**
- * 申请状态(0-草稿
+ * 申请状态(0-草稿,1=待辅导员审批,2=待学务审批,3=待二级学院审批,4=待学籍管理科审批,5=待教务处主管领导审批,6=审批通过,7=驳回)
*/
- @ApiModelProperty("申请状态(0-草稿 1-审批中 2-通过 3-驳回)")
+ @ApiModelProperty("申请状态(0-草稿,1=待辅导员审批,2=待学务审批,3=待二级学院审批,4=待学籍管理科审批,5=待教务处主管领导审批,6=审批通过,7=驳回)")
@TableField("apply_status")
- @Excel(name = "申请状态" , readConverterExp = "申请状态(0-草稿 1-审批中 2-通过 3-驳回)")
+ @Excel(name = "申请状态" , readConverterExp = "0=-草稿,1=待辅导员审批,2=待学务审批,3=待二级学院审批,4=待学籍管理科审批,5=待教务处主管领导审批,6=审批通过,7=驳回")
private Long applyStatus;
/**
diff --git a/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveAttachMapper.xml b/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveAttachMapper.xml
index 31b134d..370f133 100644
--- a/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveAttachMapper.xml
+++ b/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveAttachMapper.xml
@@ -15,7 +15,7 @@
-
+
@@ -46,6 +46,10 @@
+
+
@@ -65,6 +69,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
select id,
apply_id,