应征入伍保留学籍

srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphAuditDetailsController.java

@@ -266,6 +266,14 @@ public class CphAuditDetailsController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(cphAuditDetailsService.selectCphAuditDetailsById(id));
     }
+    /**
+     * 查询个人思想品得加分项申请
+     */
+    @PostMapping("/getcphiamByOne/{stuNo}")
+    public TableDataInfo getcphiamByOne(@PathVariable("stuNo") String stuNo) {
+        List<CphAuditDetails> list=cphAuditDetailsService.getcphiamByOne(stuNo);
+        return getDataTable(list);
+    }
 
     /**
      * 新增审核明细

srs-admin/src/main/java/com/srs/web/controller/comprehensive/KnzzGlApplyController.java

@@ -202,7 +202,7 @@ public class KnzzGlApplyController extends BaseController {
     /**
      * 获取国家励志奖学金详细信息
      */
-    @PreAuthorize("@ss.hasPermi('comprehensive:knzzGlApply:query')")
+//    @PreAuthorize("@ss.hasPermi('comprehensive:knzzGlApply:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation("获取国家励志奖学金详细信息")
     public AjaxResult getInfo(@PathVariable("id") Long id)
@@ -225,7 +225,7 @@ public class KnzzGlApplyController extends BaseController {
     /**
      * 修改国家励志奖学金
      */
-    @PreAuthorize("@ss.hasPermi('comprehensive:knzzGlApply:edit')")
+//    @PreAuthorize("@ss.hasPermi('comprehensive:knzzGlApply:edit')")
     @Log(title = "国家励志奖学金", businessType = BusinessType.UPDATE)
     @PostMapping("/update")
     @ApiOperation("修改国家励志奖学金")

srs-admin/src/main/java/com/srs/web/controller/dormitory/SrsDormitoryStudentController.java

@@ -222,6 +222,50 @@ public class SrsDormitoryStudentController extends BaseController {
             }
         }
 
+
+    @PreAuthorize("@ss.hasPermi('dms:dormStu:add')")
+    @ApiOperation(value = "学生自主选择床位", notes = "id不用填写,只能选择是当前学生班级并且为空的宿舍床位", response = StudentDormitoryDto.class)
+    @PostMapping("/addCheckInInformation")
+    public AjaxResult addCheckInInformation(@RequestBody StudentDormitoryDto dto) {
+        DomInfo dorm = _dormService.getDormHas(dto.getDormitoryId());
+        SrsStudent stu = _stuService.getStuInfo(dto.getStuNo());
+        QueryWrapper<SrsDormitoryStudent> query = new QueryWrapper<>();
+        query.eq("stu_no", dto.getStuNo());
+        SrsDormitoryStudent find = srsDormitoryStudentService.getOne(query);
+        if (find != null) {
+            return AjaxResult.error("该生已分配宿舍");
+        }
+        if(dorm!=null) {
+            if (!Objects.equals(stu.getGender(), dorm.gender)) {
+                return AjaxResult.error("学生性别与宿舍性别不符");
+            }
+        }
+        SrsDormitoryStudent param = new SrsDormitoryStudent();
+        if(dto.getIsInStudentsleep().equals("否")||dto.getIsInStudentsleep().equals("外宿")||dto.getIsInStudentsleep().equals("外出实习")){
+            param.setDormitoryId(null);
+            param.setBedId(null);
+            param.setStuNo(dto.getStuNo());
+            param.setIsDormitoryHead(0);
+            param.setStatus(0);
+            param.setCheckinTime(null);
+            param.setIsInStudentsleep(dto.getIsInStudentsleep());
+        }
+        if(dorm!=null) {
+            if (dorm.bedNum > dorm.occupancy) {
+//                    param.setStuNo(dto.getStuNo());
+//                    param.setDormitoryId(dto.getDormitoryId());
+//                    param.setCheckinTime(dto.checkinTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+                if (dto.getIsInStudentsleep().equals("是")) {
+                    param.setCheckinTime(dto.getCheckinTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+                    BeanUtils.copyProperties(dto, param);
+                }
+
+            } else {
+                return AjaxResult.error("宿舍床位不够");
+            }
+        }
+        return toAjax(srsDormitoryStudentService.save(param));
+    }
     @GetMapping("/list")
     public TableDataInfo list(DmsSearch param) {
         boolean hasRole = RoleBool.isHigh(getUserId(), _postService);
@@ -235,6 +279,14 @@ public class SrsDormitoryStudentController extends BaseController {
         }
     }
 
+    @PreAuthorize("@ss.hasPermi('dms:dormStu:add')")
+    @GetMapping("/checkInInformation")
+    public TableDataInfo checkInInformation(DmsSearch param) {
+        startPage();
+        List<SrsDormitoryStudentVo> list = srsDormitoryStudentService.list(param);
+        return getDataTable(list);
+    }
+
 
     @ApiOperation("查询学生宿舍关联列表")
     @PostMapping("/list")
@@ -262,6 +314,7 @@ public class SrsDormitoryStudentController extends BaseController {
         return srsDormitoryStudentService.cancel();
     }
 
+
     @ApiOperation(value = "管理员分配学生床位", notes = "id不用填写", response = StudentDormitoryDto.class)
     @PostMapping("/admin/add")
     public AjaxResult adminAdd(@RequestBody StudentDormitoryDto studentDormitoryDto) {

srs-admin/src/main/java/com/srs/web/controller/routine/RtEnlistmentReserveApprovalController.java

@@ -0,0 +1,110 @@
+package com.srs.web.controller.routine;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.*;
+import org.springframework.security.access.prepost.PreAuthorize;
+
+import com.srs.routine.domain.RtEnlistmentReserveApproval;
+import com.srs.routine.service.IRtEnlistmentReserveApprovalService;
+import com.srs.common.core.controller.BaseController;
+import com.srs.common.core.domain.AjaxResult;
+import com.srs.common.utils.poi.ExcelUtil;
+import com.srs.common.enums.BusinessType;
+import com.srs.common.annotation.Log;
+import com.srs.common.core.page.TableDataInfo;
+
+/**
+ * 保留学籍审批记录Controller
+ *
+ * @author srs
+ * @date 2025-10-31
+ */
+@RestController
+@RequestMapping("/routine/enlistmentReserveApproval")
+@Api(value = "保留学籍审批记录管理", tags = "保留学籍审批记录管理")
+public class RtEnlistmentReserveApprovalController extends BaseController {
+    @Autowired
+    private IRtEnlistmentReserveApprovalService rtEnlistmentReserveApprovalService;
+
+    /**
+     * 查询保留学籍审批记录列表
+     */
+@PreAuthorize("@ss.hasPermi('routine:enlistmentReserveApproval:list')")
+@GetMapping("/list")
+@ApiOperation("查询保留学籍审批记录列表")
+    public TableDataInfo list(RtEnlistmentReserveApproval rtEnlistmentReserveApproval)
+    {
+        startPage();
+        List<RtEnlistmentReserveApproval> list = rtEnlistmentReserveApprovalService.selectRtEnlistmentReserveApprovalList(rtEnlistmentReserveApproval);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出保留学籍审批记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('routine:enlistmentReserveApproval:export')")
+    @Log(title = "保留学籍审批记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("导出保留学籍审批记录列表")
+    public void export(HttpServletResponse response, RtEnlistmentReserveApproval rtEnlistmentReserveApproval)
+    {
+        List<RtEnlistmentReserveApproval> list = rtEnlistmentReserveApprovalService.selectRtEnlistmentReserveApprovalList(rtEnlistmentReserveApproval);
+        ExcelUtil<RtEnlistmentReserveApproval> util = new ExcelUtil<RtEnlistmentReserveApproval>(RtEnlistmentReserveApproval.class);
+        util.exportExcel(response, list, "保留学籍审批记录数据");
+    }
+
+    /**
+     * 获取保留学籍审批记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('routine:enlistmentReserveApproval:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取保留学籍审批记录详细信息")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(rtEnlistmentReserveApprovalService.selectRtEnlistmentReserveApprovalById(id));
+    }
+
+    /**
+     * 新增保留学籍审批记录
+     */
+    @PreAuthorize("@ss.hasPermi('routine:enlistmentReserveApproval:add')")
+    @Log(title = "保留学籍审批记录", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ApiOperation("新增保留学籍审批记录")
+    public AjaxResult add(@RequestBody RtEnlistmentReserveApproval rtEnlistmentReserveApproval)
+    {
+        return toAjax(rtEnlistmentReserveApprovalService.insertRtEnlistmentReserveApproval(rtEnlistmentReserveApproval));
+    }
+
+    /**
+     * 修改保留学籍审批记录
+     */
+    @PreAuthorize("@ss.hasPermi('routine:enlistmentReserveApproval:edit')")
+    @Log(title = "保留学籍审批记录", businessType = BusinessType.UPDATE)
+    @PostMapping("/update")
+    @ApiOperation("修改保留学籍审批记录")
+    public AjaxResult edit(@RequestBody RtEnlistmentReserveApproval rtEnlistmentReserveApproval)
+    {
+        return toAjax(rtEnlistmentReserveApprovalService.updateRtEnlistmentReserveApproval(rtEnlistmentReserveApproval));
+    }
+
+    /**
+     * 删除保留学籍审批记录
+     */
+    @PreAuthorize("@ss.hasPermi('routine:enlistmentReserveApproval:remove')")
+    @Log(title = "保留学籍审批记录", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    @ApiOperation("删除保留学籍审批记录")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(rtEnlistmentReserveApprovalService.deleteRtEnlistmentReserveApprovalByIds(ids));
+    }
+}

srs-admin/src/main/java/com/srs/web/controller/routine/RtEnlistmentReserveAttachController.java

@@ -0,0 +1,110 @@
+package com.srs.web.controller.routine;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.*;
+import org.springframework.security.access.prepost.PreAuthorize;
+
+import com.srs.routine.domain.RtEnlistmentReserveAttach;
+import com.srs.routine.service.IRtEnlistmentReserveAttachService;
+import com.srs.common.core.controller.BaseController;
+import com.srs.common.core.domain.AjaxResult;
+import com.srs.common.utils.poi.ExcelUtil;
+import com.srs.common.enums.BusinessType;
+import com.srs.common.annotation.Log;
+import com.srs.common.core.page.TableDataInfo;
+
+/**
+ * 保留学籍申请附件（入伍通知书等）Controller
+ *
+ * @author srs
+ * @date 2025-10-31
+ */
+@RestController
+@RequestMapping("/routine/enlistmentReserveAttach")
+@Api(value = "保留学籍申请附件（入伍通知书等）管理", tags = "保留学籍申请附件（入伍通知书等）管理")
+public class RtEnlistmentReserveAttachController extends BaseController {
+    @Autowired
+    private IRtEnlistmentReserveAttachService rtEnlistmentReserveAttachService;
+
+    /**
+     * 查询保留学籍申请附件（入伍通知书等）列表
+     */
+@PreAuthorize("@ss.hasPermi('routine:enlistmentReserveAttach:list')")
+@GetMapping("/list")
+@ApiOperation("查询保留学籍申请附件（入伍通知书等）列表")
+    public TableDataInfo list(RtEnlistmentReserveAttach rtEnlistmentReserveAttach)
+    {
+        startPage();
+        List<RtEnlistmentReserveAttach> list = rtEnlistmentReserveAttachService.selectRtEnlistmentReserveAttachList(rtEnlistmentReserveAttach);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出保留学籍申请附件（入伍通知书等）列表
+     */
+    @PreAuthorize("@ss.hasPermi('routine:enlistmentReserveAttach:export')")
+    @Log(title = "保留学籍申请附件（入伍通知书等）", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("导出保留学籍申请附件（入伍通知书等）列表")
+    public void export(HttpServletResponse response, RtEnlistmentReserveAttach rtEnlistmentReserveAttach)
+    {
+        List<RtEnlistmentReserveAttach> list = rtEnlistmentReserveAttachService.selectRtEnlistmentReserveAttachList(rtEnlistmentReserveAttach);
+        ExcelUtil<RtEnlistmentReserveAttach> util = new ExcelUtil<RtEnlistmentReserveAttach>(RtEnlistmentReserveAttach.class);
+        util.exportExcel(response, list, "保留学籍申请附件（入伍通知书等）数据");
+    }
+
+    /**
+     * 获取保留学籍申请附件（入伍通知书等）详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('routine:enlistmentReserveAttach:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取保留学籍申请附件（入伍通知书等）详细信息")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(rtEnlistmentReserveAttachService.selectRtEnlistmentReserveAttachById(id));
+    }
+
+    /**
+     * 新增保留学籍申请附件（入伍通知书等）
+     */
+    @PreAuthorize("@ss.hasPermi('routine:enlistmentReserveAttach:add')")
+    @Log(title = "保留学籍申请附件（入伍通知书等）", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ApiOperation("新增保留学籍申请附件（入伍通知书等）")
+    public AjaxResult add(@RequestBody RtEnlistmentReserveAttach rtEnlistmentReserveAttach)
+    {
+        return toAjax(rtEnlistmentReserveAttachService.insertRtEnlistmentReserveAttach(rtEnlistmentReserveAttach));
+    }
+
+    /**
+     * 修改保留学籍申请附件（入伍通知书等）
+     */
+    @PreAuthorize("@ss.hasPermi('routine:enlistmentReserveAttach:edit')")
+    @Log(title = "保留学籍申请附件（入伍通知书等）", businessType = BusinessType.UPDATE)
+    @PostMapping("/update")
+    @ApiOperation("修改保留学籍申请附件（入伍通知书等）")
+    public AjaxResult edit(@RequestBody RtEnlistmentReserveAttach rtEnlistmentReserveAttach)
+    {
+        return toAjax(rtEnlistmentReserveAttachService.updateRtEnlistmentReserveAttach(rtEnlistmentReserveAttach));
+    }
+
+    /**
+     * 删除保留学籍申请附件（入伍通知书等）
+     */
+    @PreAuthorize("@ss.hasPermi('routine:enlistmentReserveAttach:remove')")
+    @Log(title = "保留学籍申请附件（入伍通知书等）", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    @ApiOperation("删除保留学籍申请附件（入伍通知书等）")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(rtEnlistmentReserveAttachService.deleteRtEnlistmentReserveAttachByIds(ids));
+    }
+}

srs-admin/src/main/java/com/srs/web/controller/routine/RtEnlistmentReserveController.java

@@ -0,0 +1,110 @@
+package com.srs.web.controller.routine;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.*;
+import org.springframework.security.access.prepost.PreAuthorize;
+
+import com.srs.routine.domain.RtEnlistmentReserve;
+import com.srs.routine.service.IRtEnlistmentReserveService;
+import com.srs.common.core.controller.BaseController;
+import com.srs.common.core.domain.AjaxResult;
+import com.srs.common.utils.poi.ExcelUtil;
+import com.srs.common.enums.BusinessType;
+import com.srs.common.annotation.Log;
+import com.srs.common.core.page.TableDataInfo;
+
+/**
+ * 应征入伍保留学籍申请Controller
+ *
+ * @author srs
+ * @date 2025-10-31
+ */
+@RestController
+@RequestMapping("/routine/enlistmentReserve")
+@Api(value = "应征入伍保留学籍申请管理", tags = "应征入伍保留学籍申请管理")
+public class RtEnlistmentReserveController extends BaseController {
+    @Autowired
+    private IRtEnlistmentReserveService rtEnlistmentReserveService;
+
+    /**
+     * 查询应征入伍保留学籍申请列表
+     */
+@PreAuthorize("@ss.hasPermi('routine:enlistmentReserve:list')")
+@GetMapping("/list")
+@ApiOperation("查询应征入伍保留学籍申请列表")
+    public TableDataInfo list(RtEnlistmentReserve rtEnlistmentReserve)
+    {
+        startPage();
+        List<RtEnlistmentReserve> list = rtEnlistmentReserveService.selectRtEnlistmentReserveList(rtEnlistmentReserve);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出应征入伍保留学籍申请列表
+     */
+    @PreAuthorize("@ss.hasPermi('routine:enlistmentReserve:export')")
+    @Log(title = "应征入伍保留学籍申请", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("导出应征入伍保留学籍申请列表")
+    public void export(HttpServletResponse response, RtEnlistmentReserve rtEnlistmentReserve)
+    {
+        List<RtEnlistmentReserve> list = rtEnlistmentReserveService.selectRtEnlistmentReserveList(rtEnlistmentReserve);
+        ExcelUtil<RtEnlistmentReserve> util = new ExcelUtil<RtEnlistmentReserve>(RtEnlistmentReserve.class);
+        util.exportExcel(response, list, "应征入伍保留学籍申请数据");
+    }
+
+    /**
+     * 获取应征入伍保留学籍申请详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('routine:enlistmentReserve:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取应征入伍保留学籍申请详细信息")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(rtEnlistmentReserveService.selectRtEnlistmentReserveById(id));
+    }
+
+    /**
+     * 新增应征入伍保留学籍申请
+     */
+    @PreAuthorize("@ss.hasPermi('routine:enlistmentReserve:add')")
+    @Log(title = "应征入伍保留学籍申请", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ApiOperation("新增应征入伍保留学籍申请")
+    public AjaxResult add(@RequestBody RtEnlistmentReserve rtEnlistmentReserve)
+    {
+        return toAjax(rtEnlistmentReserveService.insertRtEnlistmentReserve(rtEnlistmentReserve));
+    }
+
+    /**
+     * 修改应征入伍保留学籍申请
+     */
+    @PreAuthorize("@ss.hasPermi('routine:enlistmentReserve:edit')")
+    @Log(title = "应征入伍保留学籍申请", businessType = BusinessType.UPDATE)
+    @PostMapping("/update")
+    @ApiOperation("修改应征入伍保留学籍申请")
+    public AjaxResult edit(@RequestBody RtEnlistmentReserve rtEnlistmentReserve)
+    {
+        return toAjax(rtEnlistmentReserveService.updateRtEnlistmentReserve(rtEnlistmentReserve));
+    }
+
+    /**
+     * 删除应征入伍保留学籍申请
+     */
+    @PreAuthorize("@ss.hasPermi('routine:enlistmentReserve:remove')")
+    @Log(title = "应征入伍保留学籍申请", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    @ApiOperation("删除应征入伍保留学籍申请")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(rtEnlistmentReserveService.deleteRtEnlistmentReserveByIds(ids));
+    }
+}

srs-admin/src/main/resources/application-sync.yml

@@ -8,6 +8,6 @@ sync:
     # 定时任务线程池大小，建议不超过CPU核心数
     scheduled-thread-pool-size: 8
     # 同步超时时间（分钟）
-    timeout-minutes: 300
+    timeout-minutes: 2000
     # 批量插入大小，建议根据数据库性能调整（MySQL建议1000-2000）
     batch-insert-size: 1000

srs-admin/src/main/resources/application.yml

@@ -64,8 +64,8 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-   active: druid   #正式环境
-#    active: dev   #测试环境
+#   active: druid   #正式环境
+    active: dev   #测试环境
   # 文件上传
   servlet:
     multipart:

srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphAuditDetails.java

@@ -6,12 +6,13 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.srs.common.annotation.Excel;
 import com.srs.common.core.domain.BaseEntity;
+import org.apache.poi.hpsf.Decimal;
 
 import java.math.BigDecimal;
 
 /**
  * 审核明细对象 cph_audit_details
- * 
+ *
  * @author 邓
  * @date 2023-07-04s.0
  */
@@ -67,6 +68,9 @@ public class CphAuditDetails extends BaseEntity
     public BigDecimal iamScore;
     public String auditStatus;
     public Long stuYearId;
+    public String ruleName;
+    public  String stuYearName;
+    public int operateScore;
 
 
     public String getDeptName() {
@@ -118,79 +122,79 @@ public class CphAuditDetails extends BaseEntity
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setProjectName(String projectName) 
+    public void setProjectName(String projectName)
     {
         this.projectName = projectName;
     }
 
-    public String getProjectName() 
+    public String getProjectName()
     {
         return projectName;
     }
-    public void setSubmitterId(Long submitterId) 
+    public void setSubmitterId(Long submitterId)
     {
         this.submitterId = submitterId;
     }
 
-    public Long getSubmitterId() 
+    public Long getSubmitterId()
     {
         return submitterId;
     }
-    public void setSubmitterName(String submitterName) 
+    public void setSubmitterName(String submitterName)
     {
         this.submitterName = submitterName;
     }
 
-    public String getSubmitterName() 
+    public String getSubmitterName()
     {
         return submitterName;
     }
-    public void setReviewedById(Long reviewedById) 
+    public void setReviewedById(Long reviewedById)
     {
         this.reviewedById = reviewedById;
     }
 
-    public Long getReviewedById() 
+    public Long getReviewedById()
     {
         return reviewedById;
     }
-    public void setProjectId(Long projectId) 
+    public void setProjectId(Long projectId)
     {
         this.projectId = projectId;
     }
 
-    public Long getProjectId() 
+    public Long getProjectId()
     {
         return projectId;
     }
-    public void setProjectTypeId(Long projectTypeId) 
+    public void setProjectTypeId(Long projectTypeId)
     {
         this.projectTypeId = projectTypeId;
     }
 
-    public Long getProjectTypeId() 
+    public Long getProjectTypeId()
     {
         return projectTypeId;
     }
-    public void setStatusCode(Long statusCode) 
+    public void setStatusCode(Long statusCode)
     {
         this.statusCode = statusCode;
     }
 
-    public Long getStatusCode() 
+    public Long getStatusCode()
     {
         return statusCode;
     }
-    public void setRemarks(String remarks) 
+    public void setRemarks(String remarks)
     {
         this.remarks = remarks;
     }
 
-    public String getRemarks() 
+    public String getRemarks()
     {
         return remarks;
     }

srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CphSearch.java

@@ -36,13 +36,14 @@ public class CphSearch {
     private  String typeName;
     /* 助学金审核记录操作人*/
     private String operator;
-    
+
     public String step;
 
     public String sfzhm;
 
     public String xm;
     public String xh;
+    private String bj;
     /** 贫困生认定意见*/
     public String yj;
     public String classCode;

srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphAuditDetailsMapper.java

@@ -22,6 +22,7 @@ public interface CphAuditDetailsMapper
      * @return 审核明细
      */
     public CphAuditDetails selectCphAuditDetailsById(Long id);
+    public List<CphAuditDetails> getcphiamByOne(String stuNo);
 
     public CphAuditDetails selectCphAuditDetailsByProjectId(Long id);
 

srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphAuditDetailsService.java

@@ -49,6 +49,14 @@ public interface ICphAuditDetailsService
      */
     public CphAuditDetails selectCphAuditDetailsById(Long id);
 
+    /**
+     * 查询个人思想品得加分项申请
+     *
+     * @param stuNo
+     * @return
+     **/
+    public List<CphAuditDetails> getcphiamByOne(String stuNo);
+
     /**
      * 我的已审核
      * @author zhy

srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphAuditDetailsServiceImpl.java

@@ -331,6 +331,11 @@ public class CphAuditDetailsServiceImpl implements ICphAuditDetailsService {
         return cphAuditDetailsMapper.selectCphAuditDetailsById(id);
     }
 
+    //查询个人思想品得加分申请
+    public List<CphAuditDetails> getcphiamByOne(String stuNo){
+        return  cphAuditDetailsMapper.getcphiamByOne(stuNo);
+    }
+
     /**
      * 查询已审核
      *

srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphGoodApplyServiceImpl.java

@@ -541,7 +541,9 @@ public class CphGoodApplyServiceImpl extends ServiceImpl<CphGoodApplyMapper, Cph
 //        CphCardersStudent cphCardersStudent = new LambdaQueryChainWrapper<>(cphCardersStudentMapper)
 //                .eq(CphCardersStudent::getStuNo, stuNo)
 //                .one();
-        SrsStudent srsStudent = srsStudentMapper.selectSrsStudentByStuNo(stuNo);
+        QueryWrapper<ViewStuInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("stu_no",stuNo);
+        ViewStuInfo srsStudent = viewStuInfoMapper.selectOne(queryWrapper);
 
         CphSearch cphSearch = new CphSearch();
         cphSearch.setMajorId(srsStudent.getMajorId());
@@ -572,11 +574,20 @@ public class CphGoodApplyServiceImpl extends ServiceImpl<CphGoodApplyMapper, Cph
         // 各科平均成绩75分以上含70分
         List<CphStuScoreMiddleDto> cphStuScoreMiddleDtos = new LambdaQueryChainWrapper<>(cphStuScoreMiddleDtoMapper)
                 .eq(CphStuScoreMiddleDto::getStuNo, stuNo)
+                .eq(CphStuScoreMiddleDto::getXndm, year.xndm)
                 .list();
         BigDecimal Grade = new BigDecimal(0);
         for (CphStuScoreMiddleDto cphStuScoreMiddleDto : cphStuScoreMiddleDtos) {
-            BigDecimal bigDecimal = new BigDecimal(cphStuScoreMiddleDto.getCj());
-            Grade = Grade.add(bigDecimal);
+            if(cphStuScoreMiddleDto.getCj().equals("不及格")){
+                throw new RuntimeException("有不及格成绩，无法申请");
+            }
+            if(cphStuScoreMiddleDto.getCj().equals("及格")){
+                BigDecimal bigDecimal = new BigDecimal("60.00");
+                Grade = Grade.add(bigDecimal);
+            }else{
+                BigDecimal bigDecimal = new BigDecimal(cphStuScoreMiddleDto.getCj());
+                Grade = Grade.add(bigDecimal);
+            }
         }
         if (Grade.divide(new BigDecimal(cphStuScoreMiddleDtos.size()), 2, RoundingMode.HALF_UP)
                 .compareTo(new BigDecimal(70)) < 0) {
@@ -676,8 +687,16 @@ public class CphGoodApplyServiceImpl extends ServiceImpl<CphGoodApplyMapper, Cph
                     || Objects.equals(cphStuScoreMiddleDto.getCj(), "NULL")) {
                 continue;
             }
-            BigDecimal bigDecimal = new BigDecimal(cphStuScoreMiddleDto.getCj());
-            Grade = Grade.add(bigDecimal);
+            if(cphStuScoreMiddleDto.getCj().equals("不及格")){
+                throw new RuntimeException("有不及格成绩，无法申请");
+            }
+            if(cphStuScoreMiddleDto.getCj().equals("及格")){
+                BigDecimal bigDecimal = new BigDecimal("60.00");
+                Grade = Grade.add(bigDecimal);
+            }else{
+                BigDecimal bigDecimal = new BigDecimal(cphStuScoreMiddleDto.getCj());
+                Grade = Grade.add(bigDecimal);
+            }
         }
         if (Grade.divide(new BigDecimal(cphStuScoreMiddleDtos.size()), 2, RoundingMode.HALF_UP)
                 .compareTo(new BigDecimal(75)) < 0) {
@@ -689,7 +708,11 @@ public class CphGoodApplyServiceImpl extends ServiceImpl<CphGoodApplyMapper, Cph
         for (Map<String,Object> course : cphStuScoreMiddleCjList) {
             BigDecimal bigDecimal = new BigDecimal(course.get("cj").toString());
             if (bigDecimal.compareTo(new BigDecimal("70.00")) < 0) {
-                throw new RuntimeException("考查课"+course.get("course_name").toString()+"没有达到中等及以上");
+                if(course.get("course_name")!= null){
+                    throw new RuntimeException("考查课"+course.get("course_name").toString()+"没有达到中等及以上");
+                }else{
+                    throw new RuntimeException("考查课没有达到中等及以上");
+                }
             }
         }
 
@@ -782,6 +805,7 @@ public class CphGoodApplyServiceImpl extends ServiceImpl<CphGoodApplyMapper, Cph
         // 各科平均成绩75分以上含75分
         LambdaQueryWrapper<CphStuScoreMiddleDto> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(CphStuScoreMiddleDto::getStuNo, stuNo);
+        queryWrapper.eq(CphStuScoreMiddleDto::getXndm, year.getXndm());
         List<CphStuScoreMiddleDto> cphStuScoreMiddleDtos = cphStuScoreMiddleDtoMapper
                 .selectList(queryWrapper);
         BigDecimal Grade = new BigDecimal(0);
@@ -792,8 +816,16 @@ public class CphGoodApplyServiceImpl extends ServiceImpl<CphGoodApplyMapper, Cph
                     || Objects.equals(cphStuScoreMiddleDto.getCj(), "NULL")) {
                 continue;
             }
-            BigDecimal bigDecimal = new BigDecimal(cphStuScoreMiddleDto.getCj());
-            Grade = Grade.add(bigDecimal);
+            if(cphStuScoreMiddleDto.getCj().equals("不及格")){
+                throw new RuntimeException("有不及格成绩，无法申请");
+            }
+            if(cphStuScoreMiddleDto.getCj().equals("及格")){
+                BigDecimal bigDecimal = new BigDecimal("60.00");
+                Grade = Grade.add(bigDecimal);
+            }else{
+                BigDecimal bigDecimal = new BigDecimal(cphStuScoreMiddleDto.getCj());
+                Grade = Grade.add(bigDecimal);
+            }
         }
         if (Grade.divide(new BigDecimal(cphStuScoreMiddleDtos.size()), 2, RoundingMode.HALF_UP)
                 .compareTo(new BigDecimal(75)) < 0) {
@@ -941,6 +973,10 @@ public class CphGoodApplyServiceImpl extends ServiceImpl<CphGoodApplyMapper, Cph
         return AjaxResult.success();
     }
 
+
+    @Autowired
+    private ViewStuInfoMapper  viewStuInfoMapper;
+
     @Override
     public AjaxResult verifyApplyYXGB() {
         QueryWrapper<SrsStuYear> yearQuery = new QueryWrapper<>();
@@ -958,7 +994,9 @@ public class CphGoodApplyServiceImpl extends ServiceImpl<CphGoodApplyMapper, Cph
                 .eq(CphOwnGoodType::getStuYearId,year.getId())
                 .like(CphOwnGoodType::getTypeCode, "YXXSGB")
                 .one();
-        SrsStudent srsStudent = srsStudentMapper.selectSrsStudentByStuNo(stuNo);
+        QueryWrapper<ViewStuInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("stu_no",stuNo);
+        ViewStuInfo srsStudent = viewStuInfoMapper.selectOne(queryWrapper);
         if (cphOwnGoodType == null) return AjaxResult.error("该项目不存在，请联系管理员");
 
         CphSearch cphSearch = new CphSearch();
@@ -985,8 +1023,16 @@ public class CphGoodApplyServiceImpl extends ServiceImpl<CphGoodApplyMapper, Cph
                 .list();
         BigDecimal Grade = new BigDecimal(0);
         for (CphStuScoreMiddleDto cphStuScoreMiddleDto : cphStuScoreMiddleDtos) {
-            BigDecimal bigDecimal = new BigDecimal(cphStuScoreMiddleDto.getCj());
-            Grade = Grade.add(bigDecimal);
+            if(cphStuScoreMiddleDto.getCj().equals("不及格")){
+                throw new RuntimeException("有不及格成绩，无法申请");
+            }
+            if(cphStuScoreMiddleDto.getCj().equals("及格")){
+                BigDecimal bigDecimal = new BigDecimal("60.00");
+                Grade = Grade.add(bigDecimal);
+            }else{
+                BigDecimal bigDecimal = new BigDecimal(cphStuScoreMiddleDto.getCj());
+                Grade = Grade.add(bigDecimal);
+            }
         }
         if (Grade.divide(new BigDecimal(cphStuScoreMiddleDtos.size()), 2, RoundingMode.HALF_UP)
                 .compareTo(new BigDecimal(70)) < 0) {

srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphNewGoodClassApplyServiceImpl.java

@@ -414,10 +414,11 @@ public class CphNewGoodClassApplyServiceImpl extends ServiceImpl<CphNewGoodClass
 
             QueryWrapper<CphNewGoodClassApply> query = new QueryWrapper<>();
             query.eq("class_id",classApply.classId)
+                    .eq("stu_year_id",param.stuYearId)
                     .in("apply_status",notExistStatus);
             List<CphNewGoodClassApply> findList = cphNewGoodClassApplyMapper.selectList(query);
             if(findList.size() != 0){
-                throw new Exception("您的班级已提交过一次申请");
+                throw new Exception("您的班级当前学年已提交过一次申请");
             }
 
             CphNewGoodClassApply needInsert = new CphNewGoodClassApply();

srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzGlApplyServiceImpl.java

@@ -45,9 +45,9 @@ public class KnzzGlApplyServiceImpl extends ServiceImpl<KnzzGlApplyMapper,KnzzGl
             if(!Objects.equals(apply.getStuNo(), getUsername())){
                 throw new Exception("只能重新申请自己的申请");
             }
-            if(!Objects.equals(apply.getApplyStatus(), "10")){
-                throw new Exception("申请已处理");
-            }
+//            if(!Objects.equals(apply.getApplyStatus(), "10")){
+//                throw new Exception("申请已处理");
+//            }
             UpdateWrapper<KnzzGlApply> updateWrapper = new UpdateWrapper<>();
             updateWrapper.eq("id", apply.getId())
                     // 需要重置的审批流程相关字段
@@ -107,13 +107,13 @@ public class KnzzGlApplyServiceImpl extends ServiceImpl<KnzzGlApplyMapper,KnzzGl
                 throw new Exception("申请不存在");
             }
 
-            if(!Objects.equals(apply.getStuNo(), getUsername())){
-                throw new Exception("只能修改自己的申请");
-            }
+//            if(!Objects.equals(apply.getStuNo(), getUsername())){
+//                throw new Exception("只能修改自己的申请");
+//            }
 
-            if(!Objects.equals(apply.getApplyStatus(), "1")){
-                throw new Exception("申请已处理");
-            }
+//            if(!Objects.equals(apply.getApplyStatus(), "1")){
+//                throw new Exception("申请已处理");
+//            }
 
             apply.inTime = param.inTime;
             apply.helpHis = param.helpHis;
@@ -131,6 +131,11 @@ public class KnzzGlApplyServiceImpl extends ServiceImpl<KnzzGlApplyMapper,KnzzGl
             apply.applyReason = param.applyReason;
             apply.hardFile = param.hardFile;
             apply.applySign = param.applySign;
+            apply.applyStatus = param.applyStatus ;
+            // 困难类型
+            apply.hardType = param.hardType;
+            // 家庭住址
+            apply.homeAddr = param.homeAddr;
 
             apply.setUpdateTime(getNowDate());
             apply.setUpdateBy(getUsername());

srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzTufaApplyServiceImpl.java

@@ -346,7 +346,8 @@ public class KnzzTufaApplyServiceImpl extends ServiceImpl<KnzzTufaApplyMapper,Kn
         try{
             QueryWrapper<SrsKnrdApply> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("xh",getUsername());
-            queryWrapper.eq("step","5");
+            queryWrapper.in("step", "3", "4", "5");
+            queryWrapper.eq("stu_year_id", "13");
             queryWrapper.last("limit 1");
             SrsKnrdApply srsKnrdApply = _knrdApplyMapper.selectOne(queryWrapper);
             if(srsKnrdApply == null){

srs-comprehensive/src/main/resources/mapper/comprehensive/CphAuditDetailsMapper.xml

@@ -238,11 +238,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and c.stu_no = #{stuNo}
           and b.stu_year_id = #{stuYearId}
     </select>
-    
+
     <select id="ListCheckRecord" parameterType="CheckIam" resultType="SrsAddRecord">
         select a.*,b.rule_name
         from srs_add_record as a
         left join cph_rules as b on a.rule_id = b.rule_id
         where stu_no = #{stuNo} and stu_year_id = #{stuYearId};
     </select>
+    <select id="getcphiamByOne" resultType="com.srs.comprehensive.domain.CphAuditDetails" parameterType="String">
+        select c.rule_name as rule_name, g.stu_year_name as stu_year_name,a.iam_score as operate_score
+        from cph_iam as a
+                 left join srs_student as b on a.to_add = b.stu_id
+                 left join cph_rules as c on a.rule_id = c.rule_id
+                 left join srs_class as d on b.class_id = d.class_id
+                 left join srs_majors as e on d.major_id = e.major_id
+                 left join sys_dept as f on e.college_id = f.dept_id
+                 left join srs_stu_year as g on a.stu_year_id = g.id
+                 left join cph_audit_details as h on a.id = h.project_id
+        where b.stu_no = #{stuNo} and audit_status=6
+        ORDER BY a.create_time desc
+    </select>
 </mapper>

srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzGlApplyMapper.xml

@@ -56,10 +56,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="hardFile"    column="hard_file"    />
     </resultMap>
 
     <sql id="selectKnzzGlApplyVo">
-        select id, stu_year_id, stu_no, stu_name, gender, birth_month, mz, zzmm, in_time, grade_name, id_card, stu_phone, dept_name, major_name, class_name, pic, help_his, family_num, month_money, per_money, hard_type, money_src, home_addr, post_code, major_rank, major_num, is_cph, bxk, jg, class_rank, class_num, apply_reason, apply_sign, apply_date, fdy_cmt, fdy_sign, fdy_date, fdy_no, xw_cmt, xw_sign, xw_date, xw_no, xg_cmt, xg_sign, xg_date, xg_no, apply_status, create_by, create_time, update_by, update_time from knzz_gl_apply
+        select id, stu_year_id, stu_no, stu_name, gender, birth_month, mz, zzmm, in_time, grade_name, id_card, stu_phone, dept_name, major_name,
+               class_name, pic, help_his, family_num, month_money, per_money, hard_type, money_src, home_addr, post_code, major_rank, major_num,
+               is_cph, bxk, jg, class_rank, class_num, apply_reason, apply_sign, apply_date, fdy_cmt, fdy_sign, fdy_date, fdy_no, xw_cmt, xw_sign,
+               xw_date, xw_no, xg_cmt, xg_sign, xg_date, xg_no, apply_status, create_by, create_time, update_by, update_time,hard_file from knzz_gl_apply
     </sql>
 
     <select id="selectKnzzGlApplyList" parameterType="KnzzGlApply" resultMap="KnzzGlApplyResult">

srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml

@@ -729,7 +729,7 @@
                      total_count,
                      male_count,
                      female_count
-              from (select left (AES_DECRYPT(UNHEX(id_card), 'zhxg'), 4) as id_card, count (1) as total_count, sum (case when gender='男' then 1 else 0 end) as male_count, sum (case when gender='女' then 1 else 0 end) as female_count
+              from (select left (AES_DECRYPT(UNHEX(id_card), 'zhxg'), 4) as id_card, count(1) as total_count, sum(case when gender='男' then 1 else 0 end) as male_count, sum(case when gender='女' then 1 else 0 end) as female_count
                     from srs_student d left join srs_class e
                     on d.class_id=e.class_id
                         left join srs_grade f on f.grade_id=e.grade_id
@@ -781,7 +781,7 @@
                      total_count,
                      male_count,
                      female_count
-              from (select left (AES_DECRYPT(UNHEX(id_card), 'zhxg'), 4) as id_card, count (1) as total_count, sum (case when gender='男' then 1 else 0 end) as male_count, sum (case when gender='女' then 1 else 0 end) as female_count
+              from (select left (AES_DECRYPT(UNHEX(id_card), 'zhxg'), 4) as id_card, count(1) as total_count, sum(case when gender='男' then 1 else 0 end) as male_count, sum(case when gender='女' then 1 else 0 end) as female_count
                     from srs_student d left join srs_class e
                     on d.class_id=e.class_id
                         left join srs_grade f on f.grade_id=e.grade_id

srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApplyMapper.xml

@@ -204,6 +204,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stuNo != null "> and a.xh = #{stuNo}</if>
             <if test="xm != null "> and a.xm like concat('%',#{xm},'%')</if>
             <if test="xh != null "> and a.xh like concat('%',#{xh},'%')</if>
+            <if test="classId != null "> and c.class_id = #{classId}</if>
         </where>
         order by a.id asc
     </select>

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

@@ -0,0 +1,183 @@
+package com.srs.routine.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.srs.common.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import com.srs.common.core.domain.BaseEntity;
+
+
+
+/**
+ * 应征入伍保留学籍申请对象 rt_enlistment_reserve
+ *
+ * @author srs
+ * @date 2025-10-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel(value = "RtEnlistmentReserve对象" , description = "应征入伍保留学籍申请表")
+@TableName("rt_enlistment_reserve")
+public class RtEnlistmentReserve extends BaseEntity{
+private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 申请编号（规则：RY+年份+6位序号，如RY2024000001）
+     */
+    @ApiModelProperty("申请编号（规则：RY+年份+6位序号，如RY2024000001）")
+    @TableField("apply_no")
+    @Excel(name = "申请编号" , readConverterExp = "规=则：RY+年份+6位序号，如RY2024000001")
+    private String applyNo;
+
+    /**
+     * 学生ID（关联sys_user）
+     */
+    @ApiModelProperty("学生ID（关联sys_user）")
+    @TableField("student_id")
+    @Excel(name = "学生ID" , readConverterExp = "关=联sys_user")
+    private Long studentId;
+
+    /**
+     * 姓名
+     */
+    @ApiModelProperty("姓名")
+    @TableField("student_name")
+    @Excel(name = "姓名")
+    private String studentName;
+
+    /**
+     * 性别（0-男
+     */
+    @ApiModelProperty("性别（0-男")
+    @TableField("gender")
+    @Excel(name = "性别" , readConverterExp = "性别（0-男")
+    private String gender;
+
+    /**
+     * 民族
+     */
+    @ApiModelProperty("民族")
+    @TableField("nation")
+    @Excel(name = "民族")
+    private String nation;
+
+    /**
+     * 年级
+     */
+    @ApiModelProperty("年级")
+    @TableField("grade")
+    @Excel(name = "年级")
+    private String grade;
+
+    /**
+     * 学号
+     */
+    @ApiModelProperty("学号")
+    @TableField("student_no")
+    @Excel(name = "学号")
+    private String studentNo;
+
+    /**
+     * 班级
+     */
+    @ApiModelProperty("班级")
+    @TableField("class_name")
+    @Excel(name = "班级")
+    private String className;
+
+    /**
+     * 专业名称
+     */
+    @ApiModelProperty("专业名称")
+    @TableField("major")
+    @Excel(name = "专业名称")
+    private String major;
+
+    /**
+     * 家庭地址
+     */
+    @ApiModelProperty("家庭地址")
+    @TableField("family_address")
+    @Excel(name = "家庭地址")
+    private String familyAddress;
+
+    /**
+     * 家长联系电话
+     */
+    @ApiModelProperty("家长联系电话")
+    @TableField("parent_phone")
+    @Excel(name = "家长联系电话")
+    private String parentPhone;
+
+    /**
+     * 申请理由（含入伍时间、服役期限）
+     */
+    @ApiModelProperty("申请理由（含入伍时间、服役期限）")
+    @TableField("apply_reason")
+    @Excel(name = "申请理由" , readConverterExp = "含=入伍时间、服役期限")
+    private String applyReason;
+
+    /**
+     * 申请状态（0-草稿
+     */
+    @ApiModelProperty("申请状态（0-草稿")
+    @TableField("apply_status")
+    @Excel(name = "申请状态" , readConverterExp = "申请状态（0-草稿")
+    private Long applyStatus;
+
+    /**
+     * Flowable流程实例ID
+     */
+    @ApiModelProperty("Flowable流程实例ID")
+    @TableField("process_instance_id")
+    @Excel(name = "Flowable流程实例ID")
+    private String processInstanceId;
+
+    /**
+     * 保留学籍编号（审批通过后生成）
+     */
+    @ApiModelProperty("保留学籍编号（审批通过后生成）")
+    @TableField("reserve_no")
+    @Excel(name = "保留学籍编号" , readConverterExp = "审=批通过后生成")
+    private String reserveNo;
+
+    /**
+     * 保留学籍开始日期
+     */
+    @ApiModelProperty("保留学籍开始日期")
+    @TableField("reserve_start_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "保留学籍开始日期" , width = 30, dateFormat = "yyyy-MM-dd")
+    private Date reserveStartDate;
+
+    /**
+     * 保留学籍结束日期（入伍时间+服役期限）
+     */
+    @ApiModelProperty("保留学籍结束日期（入伍时间+服役期限）")
+    @TableField("reserve_end_date")
+    @Excel(name = "保留学籍结束日期" , readConverterExp = "入=伍时间+服役期限")
+    private Date reserveEndDate;
+
+    /**
+     * 批文号
+     */
+    @ApiModelProperty("批文号")
+    @TableField("approval_no")
+    @Excel(name = "批文号")
+    private String approvalNo;
+
+
+}

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

@@ -0,0 +1,111 @@
+package com.srs.routine.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.srs.common.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import com.srs.common.core.domain.BaseEntity;
+
+
+
+/**
+ * 保留学籍审批记录对象 rt_enlistment_reserve_approval
+ *
+ * @author srs
+ * @date 2025-10-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel(value = "RtEnlistmentReserveApproval对象" , description = "保留学籍审批记录")
+@TableName("rt_enlistment_reserve_approval")
+public class RtEnlistmentReserveApproval extends BaseEntity{
+private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 申请表ID
+     */
+    @ApiModelProperty("申请表ID")
+    @TableField("apply_id")
+    @Excel(name = "申请表ID")
+    private Long applyId;
+
+    /**
+     * 流程实例ID
+     */
+    @ApiModelProperty("流程实例ID")
+    @TableField("process_instance_id")
+    @Excel(name = "流程实例ID")
+    private String processInstanceId;
+
+    /**
+     * Flowable任务ID
+     */
+    @ApiModelProperty("Flowable任务ID")
+    @TableField("task_id")
+    @Excel(name = "Flowable任务ID")
+    private String taskId;
+
+    /**
+     * 审批节点（辅导员/学务等）
+     */
+    @ApiModelProperty("审批节点（辅导员/学务等）")
+    @TableField("node_name")
+    @Excel(name = "审批节点" , readConverterExp = "辅=导员/学务等")
+    private String nodeName;
+
+    /**
+     * 审批人ID（关联sys_user）
+     */
+    @ApiModelProperty("审批人ID（关联sys_user）")
+    @TableField("approver_id")
+    @Excel(name = "审批人ID" , readConverterExp = "关=联sys_user")
+    private Long approverId;
+
+    /**
+     * 审批人姓名
+     */
+    @ApiModelProperty("审批人姓名")
+    @TableField("approver_name")
+    @Excel(name = "审批人姓名")
+    private String approverName;
+
+    /**
+     * 审批意见
+     */
+    @ApiModelProperty("审批意见")
+    @TableField("approval_opinion")
+    @Excel(name = "审批意见")
+    private String approvalOpinion;
+
+    /**
+     * 审批结果（1-通过
+     */
+    @ApiModelProperty("审批结果（1-通过")
+    @TableField("approval_result")
+    @Excel(name = "审批结果" , readConverterExp = "审批结果（1-通过")
+    private Long approvalResult;
+
+    /**
+     * 审批时间
+     */
+    @ApiModelProperty("审批时间")
+    @TableField("approval_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审批时间" , width = 30, dateFormat = "yyyy-MM-dd")
+    private Date approvalTime;
+
+
+}

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

@@ -0,0 +1,76 @@
+package com.srs.routine.domain;
+
+import com.srs.common.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import com.srs.common.core.domain.BaseEntity;
+
+
+
+/**
+ * 保留学籍申请附件（入伍通知书等）对象 rt_enlistment_reserve_attach
+ *
+ * @author srs
+ * @date 2025-10-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel(value = "RtEnlistmentReserveAttach对象" , description = "保留学籍申请附件（入伍通知书等）")
+@TableName("rt_enlistment_reserve_attach")
+public class RtEnlistmentReserveAttach extends BaseEntity{
+private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 申请表ID
+     */
+    @ApiModelProperty("申请表ID")
+    @TableField("apply_id")
+    @Excel(name = "申请表ID")
+    private Long applyId;
+
+    /**
+     * 文件名
+     */
+    @ApiModelProperty("文件名")
+    @TableField("file_name")
+    @Excel(name = "文件名")
+    private String fileName;
+
+    /**
+     * 文件路径（关联sys_file表）
+     */
+    @ApiModelProperty("文件路径（关联sys_file表）")
+    @TableField("file_path")
+    @Excel(name = "文件路径" , readConverterExp = "关=联sys_file表")
+    private String filePath;
+
+    /**
+     * 文件大小（字节）
+     */
+    @ApiModelProperty("文件大小（字节）")
+    @TableField("file_size")
+    @Excel(name = "文件大小" , readConverterExp = "字=节")
+    private Long fileSize;
+
+    /**
+     * 文件类型（如pdf、jpg）
+     */
+    @ApiModelProperty("文件类型（如pdf、jpg）")
+    @TableField("file_type")
+    @Excel(name = "文件类型" , readConverterExp = "如=pdf、jpg")
+    private String fileType;
+
+
+}

srs-routine/src/main/java/com/srs/routine/domain/dto/StuLeaveApplicationDto.java

@@ -40,9 +40,13 @@ public class  StuLeaveApplicationDto extends BaseEntity {
     @ApiModelProperty("班级id")
     private String classId;
 
+    @ApiModelProperty("班级")
+    private String className;
+
     @ApiModelProperty("辅导员工号")
     private String userName;
 
     @ApiModelProperty("部门id")
     private Long deptId;
+
 }

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

@@ -0,0 +1,62 @@
+package com.srs.routine.mapper;
+
+import java.util.List;
+
+import com.srs.routine.domain.RtEnlistmentReserveApproval;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 保留学籍审批记录Mapper接口
+ *
+ * @author srs
+ * @date 2025-10-31
+ */
+public interface RtEnlistmentReserveApprovalMapper extends BaseMapper<RtEnlistmentReserveApproval> {
+    /**
+     * 查询保留学籍审批记录
+     *
+     * @param id 保留学籍审批记录主键
+     * @return 保留学籍审批记录
+     */
+    public RtEnlistmentReserveApproval selectRtEnlistmentReserveApprovalById(Long id);
+
+    /**
+     * 查询保留学籍审批记录列表
+     *
+     * @param rtEnlistmentReserveApproval 保留学籍审批记录
+     * @return 保留学籍审批记录集合
+     */
+    List<RtEnlistmentReserveApproval> selectRtEnlistmentReserveApprovalList(RtEnlistmentReserveApproval rtEnlistmentReserveApproval);
+
+    /**
+     * 新增保留学籍审批记录
+     *
+     * @param rtEnlistmentReserveApproval 保留学籍审批记录
+     * @return 结果
+     */
+    int insertRtEnlistmentReserveApproval(RtEnlistmentReserveApproval rtEnlistmentReserveApproval);
+
+    /**
+     * 修改保留学籍审批记录
+     *
+     * @param rtEnlistmentReserveApproval 保留学籍审批记录
+     * @return 结果
+     */
+    int updateRtEnlistmentReserveApproval(RtEnlistmentReserveApproval rtEnlistmentReserveApproval);
+
+    /**
+     * 删除保留学籍审批记录
+     *
+     * @param id 保留学籍审批记录主键
+     * @return 结果
+     */
+    int deleteRtEnlistmentReserveApprovalById(Long id);
+
+    /**
+     * 批量删除保留学籍审批记录
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteRtEnlistmentReserveApprovalByIds(Long[] ids);
+}

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

@@ -0,0 +1,62 @@
+package com.srs.routine.mapper;
+
+import java.util.List;
+
+import com.srs.routine.domain.RtEnlistmentReserveAttach;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 保留学籍申请附件（入伍通知书等）Mapper接口
+ *
+ * @author srs
+ * @date 2025-10-31
+ */
+public interface RtEnlistmentReserveAttachMapper extends BaseMapper<RtEnlistmentReserveAttach> {
+    /**
+     * 查询保留学籍申请附件（入伍通知书等）
+     *
+     * @param id 保留学籍申请附件（入伍通知书等）主键
+     * @return 保留学籍申请附件（入伍通知书等）
+     */
+    public RtEnlistmentReserveAttach selectRtEnlistmentReserveAttachById(Long id);
+
+    /**
+     * 查询保留学籍申请附件（入伍通知书等）列表
+     *
+     * @param rtEnlistmentReserveAttach 保留学籍申请附件（入伍通知书等）
+     * @return 保留学籍申请附件（入伍通知书等）集合
+     */
+    List<RtEnlistmentReserveAttach> selectRtEnlistmentReserveAttachList(RtEnlistmentReserveAttach rtEnlistmentReserveAttach);
+
+    /**
+     * 新增保留学籍申请附件（入伍通知书等）
+     *
+     * @param rtEnlistmentReserveAttach 保留学籍申请附件（入伍通知书等）
+     * @return 结果
+     */
+    int insertRtEnlistmentReserveAttach(RtEnlistmentReserveAttach rtEnlistmentReserveAttach);
+
+    /**
+     * 修改保留学籍申请附件（入伍通知书等）
+     *
+     * @param rtEnlistmentReserveAttach 保留学籍申请附件（入伍通知书等）
+     * @return 结果
+     */
+    int updateRtEnlistmentReserveAttach(RtEnlistmentReserveAttach rtEnlistmentReserveAttach);
+
+    /**
+     * 删除保留学籍申请附件（入伍通知书等）
+     *
+     * @param id 保留学籍申请附件（入伍通知书等）主键
+     * @return 结果
+     */
+    int deleteRtEnlistmentReserveAttachById(Long id);
+
+    /**
+     * 批量删除保留学籍申请附件（入伍通知书等）
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteRtEnlistmentReserveAttachByIds(Long[] ids);
+}

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

@@ -0,0 +1,62 @@
+package com.srs.routine.mapper;
+
+import java.util.List;
+
+import com.srs.routine.domain.RtEnlistmentReserve;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 应征入伍保留学籍申请Mapper接口
+ *
+ * @author srs
+ * @date 2025-10-31
+ */
+public interface RtEnlistmentReserveMapper extends BaseMapper<RtEnlistmentReserve> {
+    /**
+     * 查询应征入伍保留学籍申请
+     *
+     * @param id 应征入伍保留学籍申请主键
+     * @return 应征入伍保留学籍申请
+     */
+    public RtEnlistmentReserve selectRtEnlistmentReserveById(Long id);
+
+    /**
+     * 查询应征入伍保留学籍申请列表
+     *
+     * @param rtEnlistmentReserve 应征入伍保留学籍申请
+     * @return 应征入伍保留学籍申请集合
+     */
+    List<RtEnlistmentReserve> selectRtEnlistmentReserveList(RtEnlistmentReserve rtEnlistmentReserve);
+
+    /**
+     * 新增应征入伍保留学籍申请
+     *
+     * @param rtEnlistmentReserve 应征入伍保留学籍申请
+     * @return 结果
+     */
+    int insertRtEnlistmentReserve(RtEnlistmentReserve rtEnlistmentReserve);
+
+    /**
+     * 修改应征入伍保留学籍申请
+     *
+     * @param rtEnlistmentReserve 应征入伍保留学籍申请
+     * @return 结果
+     */
+    int updateRtEnlistmentReserve(RtEnlistmentReserve rtEnlistmentReserve);
+
+    /**
+     * 删除应征入伍保留学籍申请
+     *
+     * @param id 应征入伍保留学籍申请主键
+     * @return 结果
+     */
+    int deleteRtEnlistmentReserveById(Long id);
+
+    /**
+     * 批量删除应征入伍保留学籍申请
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteRtEnlistmentReserveByIds(Long[] ids);
+}

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

@@ -0,0 +1,62 @@
+package com.srs.routine.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.srs.routine.domain.RtEnlistmentReserveApproval;
+
+/**
+ * 保留学籍审批记录Service接口
+ *
+ * @author srs
+ * @date 2025-10-31
+ */
+public interface IRtEnlistmentReserveApprovalService extends IService<RtEnlistmentReserveApproval> {
+    /**
+     * 查询保留学籍审批记录
+     *
+     * @param id 保留学籍审批记录主键
+     * @return 保留学籍审批记录
+     */
+    public RtEnlistmentReserveApproval selectRtEnlistmentReserveApprovalById(Long id);
+
+    /**
+     * 查询保留学籍审批记录列表
+     *
+     * @param rtEnlistmentReserveApproval 保留学籍审批记录
+     * @return 保留学籍审批记录集合
+     */
+    List<RtEnlistmentReserveApproval> selectRtEnlistmentReserveApprovalList(RtEnlistmentReserveApproval rtEnlistmentReserveApproval);
+
+    /**
+     * 新增保留学籍审批记录
+     *
+     * @param rtEnlistmentReserveApproval 保留学籍审批记录
+     * @return 结果
+     */
+    int insertRtEnlistmentReserveApproval(RtEnlistmentReserveApproval rtEnlistmentReserveApproval);
+
+    /**
+     * 修改保留学籍审批记录
+     *
+     * @param rtEnlistmentReserveApproval 保留学籍审批记录
+     * @return 结果
+     */
+    int updateRtEnlistmentReserveApproval(RtEnlistmentReserveApproval rtEnlistmentReserveApproval);
+
+    /**
+     * 批量删除保留学籍审批记录
+     *
+     * @param ids 需要删除的保留学籍审批记录主键集合
+     * @return 结果
+     */
+    int deleteRtEnlistmentReserveApprovalByIds(Long[] ids);
+
+    /**
+     * 删除保留学籍审批记录信息
+     *
+     * @param id 保留学籍审批记录主键
+     * @return 结果
+     */
+    int deleteRtEnlistmentReserveApprovalById(Long id);
+}

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

@@ -0,0 +1,62 @@
+package com.srs.routine.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.srs.routine.domain.RtEnlistmentReserveAttach;
+
+/**
+ * 保留学籍申请附件（入伍通知书等）Service接口
+ *
+ * @author srs
+ * @date 2025-10-31
+ */
+public interface IRtEnlistmentReserveAttachService extends IService<RtEnlistmentReserveAttach> {
+    /**
+     * 查询保留学籍申请附件（入伍通知书等）
+     *
+     * @param id 保留学籍申请附件（入伍通知书等）主键
+     * @return 保留学籍申请附件（入伍通知书等）
+     */
+    public RtEnlistmentReserveAttach selectRtEnlistmentReserveAttachById(Long id);
+
+    /**
+     * 查询保留学籍申请附件（入伍通知书等）列表
+     *
+     * @param rtEnlistmentReserveAttach 保留学籍申请附件（入伍通知书等）
+     * @return 保留学籍申请附件（入伍通知书等）集合
+     */
+    List<RtEnlistmentReserveAttach> selectRtEnlistmentReserveAttachList(RtEnlistmentReserveAttach rtEnlistmentReserveAttach);
+
+    /**
+     * 新增保留学籍申请附件（入伍通知书等）
+     *
+     * @param rtEnlistmentReserveAttach 保留学籍申请附件（入伍通知书等）
+     * @return 结果
+     */
+    int insertRtEnlistmentReserveAttach(RtEnlistmentReserveAttach rtEnlistmentReserveAttach);
+
+    /**
+     * 修改保留学籍申请附件（入伍通知书等）
+     *
+     * @param rtEnlistmentReserveAttach 保留学籍申请附件（入伍通知书等）
+     * @return 结果
+     */
+    int updateRtEnlistmentReserveAttach(RtEnlistmentReserveAttach rtEnlistmentReserveAttach);
+
+    /**
+     * 批量删除保留学籍申请附件（入伍通知书等）
+     *
+     * @param ids 需要删除的保留学籍申请附件（入伍通知书等）主键集合
+     * @return 结果
+     */
+    int deleteRtEnlistmentReserveAttachByIds(Long[] ids);
+
+    /**
+     * 删除保留学籍申请附件（入伍通知书等）信息
+     *
+     * @param id 保留学籍申请附件（入伍通知书等）主键
+     * @return 结果
+     */
+    int deleteRtEnlistmentReserveAttachById(Long id);
+}

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

@@ -0,0 +1,62 @@
+package com.srs.routine.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.srs.routine.domain.RtEnlistmentReserve;
+
+/**
+ * 应征入伍保留学籍申请Service接口
+ *
+ * @author srs
+ * @date 2025-10-31
+ */
+public interface IRtEnlistmentReserveService extends IService<RtEnlistmentReserve> {
+    /**
+     * 查询应征入伍保留学籍申请
+     *
+     * @param id 应征入伍保留学籍申请主键
+     * @return 应征入伍保留学籍申请
+     */
+    public RtEnlistmentReserve selectRtEnlistmentReserveById(Long id);
+
+    /**
+     * 查询应征入伍保留学籍申请列表
+     *
+     * @param rtEnlistmentReserve 应征入伍保留学籍申请
+     * @return 应征入伍保留学籍申请集合
+     */
+    List<RtEnlistmentReserve> selectRtEnlistmentReserveList(RtEnlistmentReserve rtEnlistmentReserve);
+
+    /**
+     * 新增应征入伍保留学籍申请
+     *
+     * @param rtEnlistmentReserve 应征入伍保留学籍申请
+     * @return 结果
+     */
+    int insertRtEnlistmentReserve(RtEnlistmentReserve rtEnlistmentReserve);
+
+    /**
+     * 修改应征入伍保留学籍申请
+     *
+     * @param rtEnlistmentReserve 应征入伍保留学籍申请
+     * @return 结果
+     */
+    int updateRtEnlistmentReserve(RtEnlistmentReserve rtEnlistmentReserve);
+
+    /**
+     * 批量删除应征入伍保留学籍申请
+     *
+     * @param ids 需要删除的应征入伍保留学籍申请主键集合
+     * @return 结果
+     */
+    int deleteRtEnlistmentReserveByIds(Long[] ids);
+
+    /**
+     * 删除应征入伍保留学籍申请信息
+     *
+     * @param id 应征入伍保留学籍申请主键
+     * @return 结果
+     */
+    int deleteRtEnlistmentReserveById(Long id);
+}

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

@@ -0,0 +1,87 @@
+package com.srs.routine.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.srs.routine.mapper.RtEnlistmentReserveApprovalMapper;
+import com.srs.routine.domain.RtEnlistmentReserveApproval;
+import com.srs.routine.service.IRtEnlistmentReserveApprovalService;
+
+/**
+ * 保留学籍审批记录Service业务层处理
+ *
+ * @author srs
+ * @date 2025-10-31
+ */
+@Service
+public class RtEnlistmentReserveApprovalServiceImpl extends ServiceImpl<RtEnlistmentReserveApprovalMapper,RtEnlistmentReserveApproval> implements IRtEnlistmentReserveApprovalService {
+    @Autowired
+    private RtEnlistmentReserveApprovalMapper rtEnlistmentReserveApprovalMapper;
+
+    /**
+     * 查询保留学籍审批记录
+     *
+     * @param id 保留学籍审批记录主键
+     * @return 保留学籍审批记录
+     */
+    @Override
+    public RtEnlistmentReserveApproval selectRtEnlistmentReserveApprovalById(Long id) {
+        return rtEnlistmentReserveApprovalMapper.selectRtEnlistmentReserveApprovalById(id);
+    }
+
+    /**
+     * 查询保留学籍审批记录列表
+     *
+     * @param rtEnlistmentReserveApproval 保留学籍审批记录
+     * @return 保留学籍审批记录
+     */
+    @Override
+    public List<RtEnlistmentReserveApproval> selectRtEnlistmentReserveApprovalList(RtEnlistmentReserveApproval rtEnlistmentReserveApproval) {
+        return rtEnlistmentReserveApprovalMapper.selectRtEnlistmentReserveApprovalList(rtEnlistmentReserveApproval);
+    }
+
+    /**
+     * 新增保留学籍审批记录
+     *
+     * @param rtEnlistmentReserveApproval 保留学籍审批记录
+     * @return 结果
+     */
+    @Override
+    public int insertRtEnlistmentReserveApproval(RtEnlistmentReserveApproval rtEnlistmentReserveApproval) {
+            return rtEnlistmentReserveApprovalMapper.insertRtEnlistmentReserveApproval(rtEnlistmentReserveApproval);
+    }
+
+    /**
+     * 修改保留学籍审批记录
+     *
+     * @param rtEnlistmentReserveApproval 保留学籍审批记录
+     * @return 结果
+     */
+    @Override
+    public int updateRtEnlistmentReserveApproval(RtEnlistmentReserveApproval rtEnlistmentReserveApproval) {
+        return rtEnlistmentReserveApprovalMapper.updateRtEnlistmentReserveApproval(rtEnlistmentReserveApproval);
+    }
+
+    /**
+     * 批量删除保留学籍审批记录
+     *
+     * @param ids 需要删除的保留学籍审批记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRtEnlistmentReserveApprovalByIds(Long[] ids) {
+        return rtEnlistmentReserveApprovalMapper.deleteRtEnlistmentReserveApprovalByIds(ids);
+    }
+
+    /**
+     * 删除保留学籍审批记录信息
+     *
+     * @param id 保留学籍审批记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRtEnlistmentReserveApprovalById(Long id) {
+        return rtEnlistmentReserveApprovalMapper.deleteRtEnlistmentReserveApprovalById(id);
+    }
+}

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

@@ -0,0 +1,89 @@
+package com.srs.routine.service.impl;
+
+import java.util.List;
+import com.srs.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.srs.routine.mapper.RtEnlistmentReserveAttachMapper;
+import com.srs.routine.domain.RtEnlistmentReserveAttach;
+import com.srs.routine.service.IRtEnlistmentReserveAttachService;
+
+/**
+ * 保留学籍申请附件（入伍通知书等）Service业务层处理
+ *
+ * @author srs
+ * @date 2025-10-31
+ */
+@Service
+public class RtEnlistmentReserveAttachServiceImpl extends ServiceImpl<RtEnlistmentReserveAttachMapper,RtEnlistmentReserveAttach> implements IRtEnlistmentReserveAttachService {
+    @Autowired
+    private RtEnlistmentReserveAttachMapper rtEnlistmentReserveAttachMapper;
+
+    /**
+     * 查询保留学籍申请附件（入伍通知书等）
+     *
+     * @param id 保留学籍申请附件（入伍通知书等）主键
+     * @return 保留学籍申请附件（入伍通知书等）
+     */
+    @Override
+    public RtEnlistmentReserveAttach selectRtEnlistmentReserveAttachById(Long id) {
+        return rtEnlistmentReserveAttachMapper.selectRtEnlistmentReserveAttachById(id);
+    }
+
+    /**
+     * 查询保留学籍申请附件（入伍通知书等）列表
+     *
+     * @param rtEnlistmentReserveAttach 保留学籍申请附件（入伍通知书等）
+     * @return 保留学籍申请附件（入伍通知书等）
+     */
+    @Override
+    public List<RtEnlistmentReserveAttach> selectRtEnlistmentReserveAttachList(RtEnlistmentReserveAttach rtEnlistmentReserveAttach) {
+        return rtEnlistmentReserveAttachMapper.selectRtEnlistmentReserveAttachList(rtEnlistmentReserveAttach);
+    }
+
+    /**
+     * 新增保留学籍申请附件（入伍通知书等）
+     *
+     * @param rtEnlistmentReserveAttach 保留学籍申请附件（入伍通知书等）
+     * @return 结果
+     */
+    @Override
+    public int insertRtEnlistmentReserveAttach(RtEnlistmentReserveAttach rtEnlistmentReserveAttach) {
+                rtEnlistmentReserveAttach.setCreateTime(DateUtils.getNowDate());
+            return rtEnlistmentReserveAttachMapper.insertRtEnlistmentReserveAttach(rtEnlistmentReserveAttach);
+    }
+
+    /**
+     * 修改保留学籍申请附件（入伍通知书等）
+     *
+     * @param rtEnlistmentReserveAttach 保留学籍申请附件（入伍通知书等）
+     * @return 结果
+     */
+    @Override
+    public int updateRtEnlistmentReserveAttach(RtEnlistmentReserveAttach rtEnlistmentReserveAttach) {
+        return rtEnlistmentReserveAttachMapper.updateRtEnlistmentReserveAttach(rtEnlistmentReserveAttach);
+    }
+
+    /**
+     * 批量删除保留学籍申请附件（入伍通知书等）
+     *
+     * @param ids 需要删除的保留学籍申请附件（入伍通知书等）主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRtEnlistmentReserveAttachByIds(Long[] ids) {
+        return rtEnlistmentReserveAttachMapper.deleteRtEnlistmentReserveAttachByIds(ids);
+    }
+
+    /**
+     * 删除保留学籍申请附件（入伍通知书等）信息
+     *
+     * @param id 保留学籍申请附件（入伍通知书等）主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRtEnlistmentReserveAttachById(Long id) {
+        return rtEnlistmentReserveAttachMapper.deleteRtEnlistmentReserveAttachById(id);
+    }
+}

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

@@ -0,0 +1,90 @@
+package com.srs.routine.service.impl;
+
+import java.util.List;
+import com.srs.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.srs.routine.mapper.RtEnlistmentReserveMapper;
+import com.srs.routine.domain.RtEnlistmentReserve;
+import com.srs.routine.service.IRtEnlistmentReserveService;
+
+/**
+ * 应征入伍保留学籍申请Service业务层处理
+ *
+ * @author srs
+ * @date 2025-10-31
+ */
+@Service
+public class RtEnlistmentReserveServiceImpl extends ServiceImpl<RtEnlistmentReserveMapper,RtEnlistmentReserve> implements IRtEnlistmentReserveService {
+    @Autowired
+    private RtEnlistmentReserveMapper rtEnlistmentReserveMapper;
+
+    /**
+     * 查询应征入伍保留学籍申请
+     *
+     * @param id 应征入伍保留学籍申请主键
+     * @return 应征入伍保留学籍申请
+     */
+    @Override
+    public RtEnlistmentReserve selectRtEnlistmentReserveById(Long id) {
+        return rtEnlistmentReserveMapper.selectRtEnlistmentReserveById(id);
+    }
+
+    /**
+     * 查询应征入伍保留学籍申请列表
+     *
+     * @param rtEnlistmentReserve 应征入伍保留学籍申请
+     * @return 应征入伍保留学籍申请
+     */
+    @Override
+    public List<RtEnlistmentReserve> selectRtEnlistmentReserveList(RtEnlistmentReserve rtEnlistmentReserve) {
+        return rtEnlistmentReserveMapper.selectRtEnlistmentReserveList(rtEnlistmentReserve);
+    }
+
+    /**
+     * 新增应征入伍保留学籍申请
+     *
+     * @param rtEnlistmentReserve 应征入伍保留学籍申请
+     * @return 结果
+     */
+    @Override
+    public int insertRtEnlistmentReserve(RtEnlistmentReserve rtEnlistmentReserve) {
+                rtEnlistmentReserve.setCreateTime(DateUtils.getNowDate());
+            return rtEnlistmentReserveMapper.insertRtEnlistmentReserve(rtEnlistmentReserve);
+    }
+
+    /**
+     * 修改应征入伍保留学籍申请
+     *
+     * @param rtEnlistmentReserve 应征入伍保留学籍申请
+     * @return 结果
+     */
+    @Override
+    public int updateRtEnlistmentReserve(RtEnlistmentReserve rtEnlistmentReserve) {
+                rtEnlistmentReserve.setUpdateTime(DateUtils.getNowDate());
+        return rtEnlistmentReserveMapper.updateRtEnlistmentReserve(rtEnlistmentReserve);
+    }
+
+    /**
+     * 批量删除应征入伍保留学籍申请
+     *
+     * @param ids 需要删除的应征入伍保留学籍申请主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRtEnlistmentReserveByIds(Long[] ids) {
+        return rtEnlistmentReserveMapper.deleteRtEnlistmentReserveByIds(ids);
+    }
+
+    /**
+     * 删除应征入伍保留学籍申请信息
+     *
+     * @param id 应征入伍保留学籍申请主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRtEnlistmentReserveById(Long id) {
+        return rtEnlistmentReserveMapper.deleteRtEnlistmentReserveById(id);
+    }
+}

srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveApprovalMapper.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.srs.routine.mapper.RtEnlistmentReserveApprovalMapper">
+    
+    <resultMap type="RtEnlistmentReserveApproval" id="RtEnlistmentReserveApprovalResult">
+        <result property="id"    column="id"    />
+        <result property="applyId"    column="apply_id"    />
+        <result property="processInstanceId"    column="process_instance_id"    />
+        <result property="taskId"    column="task_id"    />
+        <result property="nodeName"    column="node_name"    />
+        <result property="approverId"    column="approver_id"    />
+        <result property="approverName"    column="approver_name"    />
+        <result property="approvalOpinion"    column="approval_opinion"    />
+        <result property="approvalResult"    column="approval_result"    />
+        <result property="approvalTime"    column="approval_time"    />
+    </resultMap>
+
+    <sql id="selectRtEnlistmentReserveApprovalVo">
+        select id, apply_id, process_instance_id, task_id, node_name, approver_id, approver_name, approval_opinion, approval_result, approval_time from rt_enlistment_reserve_approval
+    </sql>
+
+    <select id="selectRtEnlistmentReserveApprovalList" parameterType="RtEnlistmentReserveApproval" resultMap="RtEnlistmentReserveApprovalResult">
+        <include refid="selectRtEnlistmentReserveApprovalVo"/>
+        <where>  
+            <if test="applyId != null "> and apply_id = #{applyId}</if>
+            <if test="processInstanceId != null  and processInstanceId != ''"> and process_instance_id = #{processInstanceId}</if>
+            <if test="taskId != null  and taskId != ''"> and task_id = #{taskId}</if>
+            <if test="nodeName != null  and nodeName != ''"> and node_name like concat('%', #{nodeName}, '%')</if>
+            <if test="approverId != null "> and approver_id = #{approverId}</if>
+            <if test="approverName != null  and approverName != ''"> and approver_name like concat('%', #{approverName}, '%')</if>
+            <if test="approvalOpinion != null  and approvalOpinion != ''"> and approval_opinion = #{approvalOpinion}</if>
+            <if test="approvalResult != null "> and approval_result = #{approvalResult}</if>
+            <if test="approvalTime != null "> and approval_time = #{approvalTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectRtEnlistmentReserveApprovalById" parameterType="Long" resultMap="RtEnlistmentReserveApprovalResult">
+        <include refid="selectRtEnlistmentReserveApprovalVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertRtEnlistmentReserveApproval" parameterType="RtEnlistmentReserveApproval" useGeneratedKeys="true" keyProperty="id">
+        insert into rt_enlistment_reserve_approval
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="applyId != null">apply_id,</if>
+            <if test="processInstanceId != null and processInstanceId != ''">process_instance_id,</if>
+            <if test="taskId != null and taskId != ''">task_id,</if>
+            <if test="nodeName != null and nodeName != ''">node_name,</if>
+            <if test="approverId != null">approver_id,</if>
+            <if test="approverName != null and approverName != ''">approver_name,</if>
+            <if test="approvalOpinion != null">approval_opinion,</if>
+            <if test="approvalResult != null">approval_result,</if>
+            <if test="approvalTime != null">approval_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="applyId != null">#{applyId},</if>
+            <if test="processInstanceId != null and processInstanceId != ''">#{processInstanceId},</if>
+            <if test="taskId != null and taskId != ''">#{taskId},</if>
+            <if test="nodeName != null and nodeName != ''">#{nodeName},</if>
+            <if test="approverId != null">#{approverId},</if>
+            <if test="approverName != null and approverName != ''">#{approverName},</if>
+            <if test="approvalOpinion != null">#{approvalOpinion},</if>
+            <if test="approvalResult != null">#{approvalResult},</if>
+            <if test="approvalTime != null">#{approvalTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateRtEnlistmentReserveApproval" parameterType="RtEnlistmentReserveApproval">
+        update rt_enlistment_reserve_approval
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="applyId != null">apply_id = #{applyId},</if>
+            <if test="processInstanceId != null and processInstanceId != ''">process_instance_id = #{processInstanceId},</if>
+            <if test="taskId != null and taskId != ''">task_id = #{taskId},</if>
+            <if test="nodeName != null and nodeName != ''">node_name = #{nodeName},</if>
+            <if test="approverId != null">approver_id = #{approverId},</if>
+            <if test="approverName != null and approverName != ''">approver_name = #{approverName},</if>
+            <if test="approvalOpinion != null">approval_opinion = #{approvalOpinion},</if>
+            <if test="approvalResult != null">approval_result = #{approvalResult},</if>
+            <if test="approvalTime != null">approval_time = #{approvalTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteRtEnlistmentReserveApprovalById" parameterType="Long">
+        delete from rt_enlistment_reserve_approval where id = #{id}
+    </delete>
+
+    <delete id="deleteRtEnlistmentReserveApprovalByIds" parameterType="String">
+        delete from rt_enlistment_reserve_approval where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveAttachMapper.xml

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.srs.routine.mapper.RtEnlistmentReserveAttachMapper">
+    
+    <resultMap type="RtEnlistmentReserveAttach" id="RtEnlistmentReserveAttachResult">
+        <result property="id"    column="id"    />
+        <result property="applyId"    column="apply_id"    />
+        <result property="fileName"    column="file_name"    />
+        <result property="filePath"    column="file_path"    />
+        <result property="fileSize"    column="file_size"    />
+        <result property="fileType"    column="file_type"    />
+        <result property="createTime"    column="create_time"    />
+    </resultMap>
+
+    <sql id="selectRtEnlistmentReserveAttachVo">
+        select id, apply_id, file_name, file_path, file_size, file_type, create_time from rt_enlistment_reserve_attach
+    </sql>
+
+    <select id="selectRtEnlistmentReserveAttachList" parameterType="RtEnlistmentReserveAttach" resultMap="RtEnlistmentReserveAttachResult">
+        <include refid="selectRtEnlistmentReserveAttachVo"/>
+        <where>  
+            <if test="applyId != null "> and apply_id = #{applyId}</if>
+            <if test="fileName != null  and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
+            <if test="filePath != null  and filePath != ''"> and file_path = #{filePath}</if>
+            <if test="fileSize != null "> and file_size = #{fileSize}</if>
+            <if test="fileType != null  and fileType != ''"> and file_type = #{fileType}</if>
+        </where>
+    </select>
+    
+    <select id="selectRtEnlistmentReserveAttachById" parameterType="Long" resultMap="RtEnlistmentReserveAttachResult">
+        <include refid="selectRtEnlistmentReserveAttachVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertRtEnlistmentReserveAttach" parameterType="RtEnlistmentReserveAttach" useGeneratedKeys="true" keyProperty="id">
+        insert into rt_enlistment_reserve_attach
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="applyId != null">apply_id,</if>
+            <if test="fileName != null and fileName != ''">file_name,</if>
+            <if test="filePath != null and filePath != ''">file_path,</if>
+            <if test="fileSize != null">file_size,</if>
+            <if test="fileType != null and fileType != ''">file_type,</if>
+            <if test="createTime != null">create_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="applyId != null">#{applyId},</if>
+            <if test="fileName != null and fileName != ''">#{fileName},</if>
+            <if test="filePath != null and filePath != ''">#{filePath},</if>
+            <if test="fileSize != null">#{fileSize},</if>
+            <if test="fileType != null and fileType != ''">#{fileType},</if>
+            <if test="createTime != null">#{createTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateRtEnlistmentReserveAttach" parameterType="RtEnlistmentReserveAttach">
+        update rt_enlistment_reserve_attach
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="applyId != null">apply_id = #{applyId},</if>
+            <if test="fileName != null and fileName != ''">file_name = #{fileName},</if>
+            <if test="filePath != null and filePath != ''">file_path = #{filePath},</if>
+            <if test="fileSize != null">file_size = #{fileSize},</if>
+            <if test="fileType != null and fileType != ''">file_type = #{fileType},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteRtEnlistmentReserveAttachById" parameterType="Long">
+        delete from rt_enlistment_reserve_attach where id = #{id}
+    </delete>
+
+    <delete id="deleteRtEnlistmentReserveAttachByIds" parameterType="String">
+        delete from rt_enlistment_reserve_attach where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveMapper.xml

@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.srs.routine.mapper.RtEnlistmentReserveMapper">
+    
+    <resultMap type="RtEnlistmentReserve" id="RtEnlistmentReserveResult">
+        <result property="id"    column="id"    />
+        <result property="applyNo"    column="apply_no"    />
+        <result property="studentId"    column="student_id"    />
+        <result property="studentName"    column="student_name"    />
+        <result property="gender"    column="gender"    />
+        <result property="nation"    column="nation"    />
+        <result property="grade"    column="grade"    />
+        <result property="studentNo"    column="student_no"    />
+        <result property="className"    column="class_name"    />
+        <result property="major"    column="major"    />
+        <result property="familyAddress"    column="family_address"    />
+        <result property="parentPhone"    column="parent_phone"    />
+        <result property="applyReason"    column="apply_reason"    />
+        <result property="applyStatus"    column="apply_status"    />
+        <result property="processInstanceId"    column="process_instance_id"    />
+        <result property="reserveNo"    column="reserve_no"    />
+        <result property="reserveStartDate"    column="reserve_start_date"    />
+        <result property="reserveEndDate"    column="reserve_end_date"    />
+        <result property="approvalNo"    column="approval_no"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectRtEnlistmentReserveVo">
+        select id, apply_no, student_id, student_name, gender, nation, grade, student_no, class_name, major, family_address, parent_phone, apply_reason, apply_status, process_instance_id, reserve_no, reserve_start_date, reserve_end_date, approval_no, create_time, update_time from rt_enlistment_reserve
+    </sql>
+
+    <select id="selectRtEnlistmentReserveList" parameterType="RtEnlistmentReserve" resultMap="RtEnlistmentReserveResult">
+        <include refid="selectRtEnlistmentReserveVo"/>
+        <where>  
+            <if test="applyNo != null  and applyNo != ''"> and apply_no = #{applyNo}</if>
+            <if test="studentId != null "> and student_id = #{studentId}</if>
+            <if test="studentName != null  and studentName != ''"> and student_name like concat('%', #{studentName}, '%')</if>
+            <if test="gender != null  and gender != ''"> and gender = #{gender}</if>
+            <if test="nation != null  and nation != ''"> and nation = #{nation}</if>
+            <if test="grade != null  and grade != ''"> and grade = #{grade}</if>
+            <if test="studentNo != null  and studentNo != ''"> and student_no = #{studentNo}</if>
+            <if test="className != null  and className != ''"> and class_name like concat('%', #{className}, '%')</if>
+            <if test="major != null  and major != ''"> and major = #{major}</if>
+            <if test="familyAddress != null  and familyAddress != ''"> and family_address = #{familyAddress}</if>
+            <if test="parentPhone != null  and parentPhone != ''"> and parent_phone = #{parentPhone}</if>
+            <if test="applyReason != null  and applyReason != ''"> and apply_reason = #{applyReason}</if>
+            <if test="applyStatus != null "> and apply_status = #{applyStatus}</if>
+            <if test="processInstanceId != null  and processInstanceId != ''"> and process_instance_id = #{processInstanceId}</if>
+            <if test="reserveNo != null  and reserveNo != ''"> and reserve_no = #{reserveNo}</if>
+            <if test="reserveStartDate != null "> and reserve_start_date = #{reserveStartDate}</if>
+            <if test="reserveEndDate != null "> and reserve_end_date = #{reserveEndDate}</if>
+            <if test="approvalNo != null  and approvalNo != ''"> and approval_no = #{approvalNo}</if>
+        </where>
+    </select>
+    
+    <select id="selectRtEnlistmentReserveById" parameterType="Long" resultMap="RtEnlistmentReserveResult">
+        <include refid="selectRtEnlistmentReserveVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertRtEnlistmentReserve" parameterType="RtEnlistmentReserve" useGeneratedKeys="true" keyProperty="id">
+        insert into rt_enlistment_reserve
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="applyNo != null and applyNo != ''">apply_no,</if>
+            <if test="studentId != null">student_id,</if>
+            <if test="studentName != null and studentName != ''">student_name,</if>
+            <if test="gender != null and gender != ''">gender,</if>
+            <if test="nation != null and nation != ''">nation,</if>
+            <if test="grade != null and grade != ''">grade,</if>
+            <if test="studentNo != null and studentNo != ''">student_no,</if>
+            <if test="className != null and className != ''">class_name,</if>
+            <if test="major != null and major != ''">major,</if>
+            <if test="familyAddress != null and familyAddress != ''">family_address,</if>
+            <if test="parentPhone != null and parentPhone != ''">parent_phone,</if>
+            <if test="applyReason != null and applyReason != ''">apply_reason,</if>
+            <if test="applyStatus != null">apply_status,</if>
+            <if test="processInstanceId != null">process_instance_id,</if>
+            <if test="reserveNo != null">reserve_no,</if>
+            <if test="reserveStartDate != null">reserve_start_date,</if>
+            <if test="reserveEndDate != null">reserve_end_date,</if>
+            <if test="approvalNo != null">approval_no,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="applyNo != null and applyNo != ''">#{applyNo},</if>
+            <if test="studentId != null">#{studentId},</if>
+            <if test="studentName != null and studentName != ''">#{studentName},</if>
+            <if test="gender != null and gender != ''">#{gender},</if>
+            <if test="nation != null and nation != ''">#{nation},</if>
+            <if test="grade != null and grade != ''">#{grade},</if>
+            <if test="studentNo != null and studentNo != ''">#{studentNo},</if>
+            <if test="className != null and className != ''">#{className},</if>
+            <if test="major != null and major != ''">#{major},</if>
+            <if test="familyAddress != null and familyAddress != ''">#{familyAddress},</if>
+            <if test="parentPhone != null and parentPhone != ''">#{parentPhone},</if>
+            <if test="applyReason != null and applyReason != ''">#{applyReason},</if>
+            <if test="applyStatus != null">#{applyStatus},</if>
+            <if test="processInstanceId != null">#{processInstanceId},</if>
+            <if test="reserveNo != null">#{reserveNo},</if>
+            <if test="reserveStartDate != null">#{reserveStartDate},</if>
+            <if test="reserveEndDate != null">#{reserveEndDate},</if>
+            <if test="approvalNo != null">#{approvalNo},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateRtEnlistmentReserve" parameterType="RtEnlistmentReserve">
+        update rt_enlistment_reserve
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="applyNo != null and applyNo != ''">apply_no = #{applyNo},</if>
+            <if test="studentId != null">student_id = #{studentId},</if>
+            <if test="studentName != null and studentName != ''">student_name = #{studentName},</if>
+            <if test="gender != null and gender != ''">gender = #{gender},</if>
+            <if test="nation != null and nation != ''">nation = #{nation},</if>
+            <if test="grade != null and grade != ''">grade = #{grade},</if>
+            <if test="studentNo != null and studentNo != ''">student_no = #{studentNo},</if>
+            <if test="className != null and className != ''">class_name = #{className},</if>
+            <if test="major != null and major != ''">major = #{major},</if>
+            <if test="familyAddress != null and familyAddress != ''">family_address = #{familyAddress},</if>
+            <if test="parentPhone != null and parentPhone != ''">parent_phone = #{parentPhone},</if>
+            <if test="applyReason != null and applyReason != ''">apply_reason = #{applyReason},</if>
+            <if test="applyStatus != null">apply_status = #{applyStatus},</if>
+            <if test="processInstanceId != null">process_instance_id = #{processInstanceId},</if>
+            <if test="reserveNo != null">reserve_no = #{reserveNo},</if>
+            <if test="reserveStartDate != null">reserve_start_date = #{reserveStartDate},</if>
+            <if test="reserveEndDate != null">reserve_end_date = #{reserveEndDate},</if>
+            <if test="approvalNo != null">approval_no = #{approvalNo},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteRtEnlistmentReserveById" parameterType="Long">
+        delete from rt_enlistment_reserve where id = #{id}
+    </delete>
+
+    <delete id="deleteRtEnlistmentReserveByIds" parameterType="String">
+        delete from rt_enlistment_reserve where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

srs-routine/src/main/resources/mapper/routine/RtStuLeaveApplicationMapper.xml

@@ -81,7 +81,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.leave_status='1'
             <if test="leaveApplicationId != null and leaveApplicationId != ''">AND a.leave_application_id = #{leaveApplicationId}</if>
             <if test="stuNo!=null and stuNo != '' ">AND b.stu_no = #{stuNo}</if>
-            <if test="name != null and name != '' ">AND a.name = #{name}</if>
+            <if test="name != null and name != '' ">AND b.name = #{name}</if>
+            <if test="className != null and className != '' ">AND c.class_name = #{className}</if>
             <if test="classId != null and classId != '' ">AND c.class_id = #{classId}</if>
             <if test="userName != null and userName != '' ">AND d.employee_id = #{userName}</if>
         </where>

srs-stureg/src/main/resources/mapper/stureg/SrsStuRegCountMapper.xml

@@ -238,7 +238,7 @@
                  select s.tools_type,case  when r.xy='经济管理学院' then '长堽校区'
                                            when  r.xy='信息工程学院' then '长堽校区' else '里建校区' end as xq
                  from srs_at_station s inner  join srs_stu_reg r on s.ksh=r.ksh where s.create_time>CURDATE()-INTERVAL 90 DAY ) t
-        group by tools_type,xq order by xq,totalnum desc
+        group by tools_type,xq order by xq,count(1) desc
     </select>