Merge remote-tracking branch 'origin/main'

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;
+
     /**
      * 入伍保留学籍申请表-审核记录
      */

srs-routine/src/main/java/com/srs/routine/service/impl/RtEnlistmentReserveServiceImpl.java

@@ -109,6 +109,7 @@ public class RtEnlistmentReserveServiceImpl extends ServiceImpl<RtEnlistmentRese
                 RtEnlistmentReserve updateEntity = new RtEnlistmentReserve();
                 updateEntity.setId(applyId);
                 updateEntity.setProcessInstanceId(processResultDto.getProcessInstanceId());
+                updateEntity.setDeployId(processResultDto.getDeploymentId());
                 updateEntity.setApplyStatus(1L); // 审批中状态（根据实际枚举调整）
                 rtEnlistmentReserveMapper.updateRtEnlistmentReserve(updateEntity);
                 System.out.println("申请表[" + applyId + "]已启动流程，实例ID：" + processResultDto.getProcessInstanceId() + "，状态更新为审批中");
@@ -165,6 +166,7 @@ public class RtEnlistmentReserveServiceImpl extends ServiceImpl<RtEnlistmentRese
 
                 // 关联流程实例ID，更新为“审批中”状态
                 rtEnlistmentReserve.setProcessInstanceId(processResultDto.getProcessInstanceId());
+                rtEnlistmentReserve.setDeployId(processResultDto.getDeploymentId());
                 rtEnlistmentReserve.setApplyStatus(1L); // 审批中
                 System.out.println("申请表[" + rtEnlistmentReserve.getId() + "]启动流程成功，实例ID：" + processResultDto.getProcessInstanceId());
             } else {