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 215195a..7ec0e79 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 @@ -66,8 +66,14 @@ public class ApprovalAssigneeListener implements ExecutionListener { // 获取审核意见 String approvalOpinion = (String) execution.getVariable("approvalOpinion"); - // 获取审核状态 - Long approvalResult = (Long) execution.getVariable("approvalResult"); + // 获取审核状态(兼容Integer/Long类型) + Object approvalResultObj = execution.getVariable("approvalResult"); + Long approvalResult = null; + if (approvalResultObj != null) { + // 先转为数字,再获取long值 + Number num = (Number) approvalResultObj; + approvalResult = num.longValue(); + } // 4. 后续逻辑不变:查询下一个节点负责人并更新变量 Long nextAssigneeId = getNextAssignee(currentNodeName, processInstanceId, enlistmentId, currentActivityId, approvalOpinion, approvalResult); 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 942e034..5b2b0ba 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 @@ -208,6 +208,14 @@ private static final long serialVersionUID=1L; @Excel(name = "附件id") private String affixId; + /** + * 流程部署编号 + */ + @ApiModelProperty("流程部署编号") + @TableField("deploy_id") + @Excel(name = "流程部署编号") + private String deployId; + /** * 入伍保留学籍申请表-审核记录 */ diff --git a/srs-routine/src/main/java/com/srs/routine/service/impl/RtEnlistmentReserveServiceImpl.java b/srs-routine/src/main/java/com/srs/routine/service/impl/RtEnlistmentReserveServiceImpl.java index c127476..5a2844d 100644 --- a/srs-routine/src/main/java/com/srs/routine/service/impl/RtEnlistmentReserveServiceImpl.java +++ b/srs-routine/src/main/java/com/srs/routine/service/impl/RtEnlistmentReserveServiceImpl.java @@ -109,6 +109,7 @@ public class RtEnlistmentReserveServiceImpl extends ServiceImpl + @@ -156,6 +158,7 @@ and reserve_end_date = #{reserveEndDate} and approval_no = #{approvalNo} and affix_id = #{affixId} + and deploy_id = #{deployId} @@ -206,6 +209,7 @@ create_time, update_time, affix_id, + deploy_id, #{applyNo}, @@ -230,6 +234,7 @@ #{createTime}, #{updateTime}, #{affixId}, + #{deployId}, @@ -258,6 +263,7 @@ create_time = #{createTime}, update_time = #{updateTime}, affix_id = #{affixId}, + deploy_id = #{deployId}, where id = #{id}