From 41d310ca2f0aa44f7eff46f7d7be1064c3cc1330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=88=90?= <962704835@qq.com>
Date: Wed, 4 Mar 2026 17:14:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E4=BC=8D=E4=BF=9D=E7=95=99=E5=AD=A6?=
 =?UTF-8?q?=E7=B1=8D=E7=94=B3=E8=AF=B7=E3=80=81=E4=BF=9D=E7=95=99=E5=AD=A6?=
 =?UTF-8?q?=E7=B1=8D=E7=BC=96=E5=8F=B7=E5=92=8C=E6=97=B6=E9=97=B4=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/RtEnlistmentReserveMapper.java     |  3 +++
 .../impl/RtEnlistmentReserveServiceImpl.java  | 22 +++++++++++++++++++
 .../routine/RtEnlistmentReserveMapper.xml     |  6 +++++
 3 files changed, 31 insertions(+)

diff --git a/srs-routine/src/main/java/com/srs/routine/mapper/RtEnlistmentReserveMapper.java b/srs-routine/src/main/java/com/srs/routine/mapper/RtEnlistmentReserveMapper.java
index c101e66..129e91b 100644
--- a/srs-routine/src/main/java/com/srs/routine/mapper/RtEnlistmentReserveMapper.java
+++ b/srs-routine/src/main/java/com/srs/routine/mapper/RtEnlistmentReserveMapper.java
@@ -50,6 +50,9 @@ public interface RtEnlistmentReserveMapper extends BaseMapper<RtEnlistmentReserv
      */
     List<RtEnlistmentReserve> selectRtEnlistmentReserveList(RtEnlistmentReserve rtEnlistmentReserve);
 
+    //    查询全部申请记录
+    List<RtEnlistmentReserve> getEnlistmentReserves();
+
     /**
      * 新增应征入伍保留学籍申请
      *
diff --git a/srs-routine/src/main/java/com/srs/routine/service/impl/RtEnlistmentReserveServiceImpl.java b/srs-routine/src/main/java/com/srs/routine/service/impl/RtEnlistmentReserveServiceImpl.java
index 08caea1..dd91db5 100644
--- a/srs-routine/src/main/java/com/srs/routine/service/impl/RtEnlistmentReserveServiceImpl.java
+++ b/srs-routine/src/main/java/com/srs/routine/service/impl/RtEnlistmentReserveServiceImpl.java
@@ -1,5 +1,7 @@
 package com.srs.routine.service.impl;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -13,6 +15,7 @@ import com.srs.common.utils.SecurityUtils;
 import com.srs.dormitory.domain.DmsOutsideAccommodationApply;
 import com.srs.dormitory.mapper.DmsOutsideAccommodationApplyMapper;
 import com.srs.flowable.service.IFlowDefinitionService;
+import com.srs.routine.domain.RtEnlistmentReserveApproval;
 import lombok.extern.slf4j.Slf4j;
 import com.srs.routine.mapper.RtStuLeaveApplicationMapper;
 import org.apache.commons.lang3.StringUtils;
@@ -100,6 +103,25 @@ public class RtEnlistmentReserveServiceImpl extends ServiceImpl<RtEnlistmentRese
             throw new ServiceException("您已经申请过了，请勿重新申请！", 400);
         }
 
+        // ========== 生成保留学籍编号 ==========
+        // 查询申请记录数量
+        List<RtEnlistmentReserve> rtEnlistmentReserves = rtEnlistmentReserveMapper.getEnlistmentReserves();
+        int total = rtEnlistmentReserves.size();
+        // 设置保留学籍编号 （LBXJ0001（LBXJ是固定的，0001根据数据数量累加） + 时间（根据系统时间，但是格式要20260304））
+        // 1. 获取当前系统时间，格式化为8位日期（yyyyMMdd）
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        String dateStr = sdf.format(new Date());
+
+        // 2. 计算自增序号（总数+1，确保新编号是下一个序号），补零为4位
+        int seq = total + 1;
+        String seqStr = String.format("%04d", seq); // 不足4位时前面补0，如1→0001，10→0010
+
+        // 3. 拼接保留学籍编号：LBXJ + 4位序号 + 8位日期
+        String reserveNo = "LBXJ" + seqStr + dateStr;
+
+        // 4. 设置到实体对象中
+        rtEnlistmentReserve.setReserveNo(reserveNo);
+
         rtEnlistmentReserve.setCreateTime(DateUtils.getNowDate());
 
         // 先插入申请表数据，获取自增 ID（数据库自动为 applyStatus 赋值 0 若未传值）
diff --git a/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveMapper.xml b/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveMapper.xml
index cf7e2a1..b9d6473 100644
--- a/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveMapper.xml
+++ b/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveMapper.xml
@@ -182,6 +182,12 @@
         </where>
     </select>
 
+    <!--  查询全部申请记录  -->
+    <select id="getEnlistmentReserves" parameterType="RtEnlistmentReserve"
+            resultMap="RtEnlistmentReserveResult">
+        select * from rt_enlistment_reserve
+    </select>
+
     <!--  根据流程编号查询申请记录  -->
     <select id="selectRtEnlistmentReserveByProcessInstanceId" parameterType="String"
             resultMap="RtEnlistmentReserveResult">