应征入伍保留学籍工作流

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

@@ -50,6 +50,15 @@ private static final long serialVersionUID=1L;
     @Excel(name = "学生ID" , readConverterExp = "关=联sys_user")
     private Long studentId;
 
+
+    /**
+     * 辅导员姓名
+     */
+    @ApiModelProperty("辅导员姓名")
+    @TableField("teacher_name")
+    @Excel(name = "辅导员姓名")
+    private String teacherName;
+
     /**
      * 姓名
      */

srs-routine/src/main/java/com/srs/routine/mapper/RtEnlistmentReserveMapper.java

@@ -22,6 +22,14 @@ public interface RtEnlistmentReserveMapper extends BaseMapper<RtEnlistmentReserv
      */
     public RtEnlistmentReserve selectRtEnlistmentReserveById(Long id);
 
+    /**
+     * 查询应征入伍保留学籍申请
+     *
+     * @param processInstanceId Flowable流程实例ID
+     * @return 应征入伍保留学籍申请
+     */
+    public RtEnlistmentReserve selectRtEnlistmentReserveByProcessInstanceId(String processInstanceId);
+
     //    <!--  根据学号查询辅导员信息  -->
     public TeacherVo getCounselorInfo(String stuNo);
 

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

@@ -99,7 +99,7 @@ public class RtEnlistmentReserveServiceImpl extends ServiceImpl<RtEnlistmentRese
             // 启动流程（此时 applyId 已存在，可正常传递）
             ProcessResultDto processResultDto = startEnlistmentReserveProcess(rtEnlistmentReserve);
 
-            // 3.3 同步更新流程实例 ID + 申请状态为“审批中”（2），形成业务闭环
+            // 同步更新流程实例 ID + 申请状态为“审批中”（2），形成业务闭环
             if (processResultDto != null && StringUtils.isNotBlank(processResultDto.getProcessInstanceId())) {
                 RtEnlistmentReserve updateEntity = new RtEnlistmentReserve();
                 updateEntity.setId(applyId);
@@ -196,7 +196,7 @@ public class RtEnlistmentReserveServiceImpl extends ServiceImpl<RtEnlistmentRese
         variables.put("deptId", counselorInfo.getDeptId());
 
         // 3. 启动流程
-        AjaxResult ajaxResult = flowDefinitionService.startProcessInstanceById("flow_r064jfpz:4:1032511", variables);
+        AjaxResult ajaxResult = flowDefinitionService.startProcessInstanceById("flow_r064jfpz:7:1055004", variables);
         String code = ajaxResult.get("code").toString();
         if (!"200".equals(code)) {
             throw new ServiceException("流程启动失败，错误码：" + code, 500);