应征入伍保留学籍申请表联表操作

srs-routine/src/main/java/com/srs/routine/domain/RtEnlistmentReserve.java

@@ -1,6 +1,8 @@
 package com.srs.routine.domain;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.srs.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.*;
@@ -197,4 +199,18 @@ private static final long serialVersionUID=1L;
     @TableField("update_time")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date  updateTime;
+
+    /**
+     * 入伍保留学籍申请表-审核记录
+     */
+    @ApiModelProperty(value = "入伍保留学籍申请表-审核记录", hidden = true)
+    @Excel(name = "入伍保留学籍申请表-审核记录")
+    private List<RtEnlistmentReserveApproval> enlistmentReserveApprovalList;
+
+    /**
+     * 入伍保留学籍申请表-附件记录
+     */
+    @ApiModelProperty(value = "入伍保留学籍申请表-附件记录", hidden = true)
+    @Excel(name = "入伍保留学籍申请表-附件记录")
+    private List<RtEnlistmentReserveAttach> enlistmentReserveAttachList;
 }

srs-routine/src/main/java/com/srs/routine/domain/RtEnlistmentReserveAttach.java

@@ -8,22 +8,21 @@ import lombok.*;
 import com.srs.common.core.domain.BaseEntity;
 
 
-
 /**
  * 保留学籍申请附件（入伍通知书等）对象 rt_enlistment_reserve_attach
  *
  * @author srs
- * @date 2025-10-31
+ * @date 2025-11-14
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@ApiModel(value = "RtEnlistmentReserveAttach对象" , description = "保留学籍申请附件（入伍通知书等）")
+@ApiModel(value = "RtEnlistmentReserveAttach对象", description = "保留学籍申请附件（入伍通知书等）")
 @TableName("rt_enlistment_reserve_attach")
-public class RtEnlistmentReserveAttach extends BaseEntity{
-private static final long serialVersionUID=1L;
+public class RtEnlistmentReserveAttach extends BaseEntity {
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键
@@ -53,7 +52,7 @@ private static final long serialVersionUID=1L;
      */
     @ApiModelProperty("文件路径（关联sys_file表）")
     @TableField("file_path")
-    @Excel(name = "文件路径" , readConverterExp = "关=联sys_file表")
+    @Excel(name = "文件路径", readConverterExp = "关=联sys_file表")
     private String filePath;
 
     /**
@@ -61,7 +60,7 @@ private static final long serialVersionUID=1L;
      */
     @ApiModelProperty("文件大小（字节）")
     @TableField("file_size")
-    @Excel(name = "文件大小" , readConverterExp = "字=节")
+    @Excel(name = "文件大小", readConverterExp = "字=节")
     private Long fileSize;
 
     /**
@@ -69,8 +68,32 @@ private static final long serialVersionUID=1L;
      */
     @ApiModelProperty("文件类型（如pdf、jpg）")
     @TableField("file_type")
-    @Excel(name = "文件类型" , readConverterExp = "如=pdf、jpg")
+    @Excel(name = "文件类型", readConverterExp = "如=pdf、jpg")
     private String fileType;
 
+    /**
+     * 申请编号（规则：RY+年份+6位序号，如RY2024000001）
+     */
+    @ApiModelProperty("申请编号（规则：RY+年份+6位序号，如RY2024000001）")
+    @TableField("apply_no")
+    @Excel(name = "申请编号", readConverterExp = "规=则：RY+年份+6位序号，如RY2024000001")
+    private String applyNo;
+
+    /**
+     * 姓名
+     */
+    @ApiModelProperty("姓名")
+    @TableField("student_name")
+    @Excel(name = "姓名")
+    private String studentName;
+
+    /**
+     * 学号
+     */
+    @ApiModelProperty("学号")
+    @TableField("student_no")
+    @Excel(name = "学号")
+    private String studentNo;
+
 
 }

srs-routine/src/main/java/com/srs/routine/service/IRtEnlistmentReserveService.java

@@ -20,6 +20,14 @@ public interface IRtEnlistmentReserveService extends IService<RtEnlistmentReserv
      */
     public RtEnlistmentReserve selectRtEnlistmentReserveById(Long id);
 
+    /**
+     * 查询应征入伍保留学籍申请
+     *
+     * @param processInstanceId Flowable流程实例ID
+     * @return 应征入伍保留学籍申请
+     */
+    public RtEnlistmentReserve selectRtEnlistmentReserveByProcessInstanceId(String processInstanceId);
+
     /**
      * 查询应征入伍保留学籍申请列表
      *

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

@@ -58,6 +58,11 @@ public class RtEnlistmentReserveServiceImpl extends ServiceImpl<RtEnlistmentRese
         return rtEnlistmentReserveMapper.selectRtEnlistmentReserveById(id);
     }
 
+    @Override
+    public RtEnlistmentReserve selectRtEnlistmentReserveByProcessInstanceId(String processInstanceId) {
+        return rtEnlistmentReserveMapper.selectRtEnlistmentReserveByProcessInstanceId(processInstanceId);
+    }
+
     /**
      * 查询应征入伍保留学籍申请列表
      *
@@ -196,7 +201,7 @@ public class RtEnlistmentReserveServiceImpl extends ServiceImpl<RtEnlistmentRese
         variables.put("deptId", counselorInfo.getDeptId());
 
         // 3. 启动流程
-        AjaxResult ajaxResult = flowDefinitionService.startProcessInstanceById("flow_r064jfpz:8:1080009", variables);
+        AjaxResult ajaxResult = flowDefinitionService.startProcessInstanceById("flow_r064jfpz:9:1090020", variables);
         String code = ajaxResult.get("code").toString();
         if (!"200".equals(code)) {
             throw new ServiceException("流程启动失败，错误码：" + code, 500);