From 05a7b006cab2b29b1b51e565f603c5e3c0e36b94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=88=90?= <962704835@qq.com>
Date: Fri, 3 Apr 2026 16:07:18 +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=E5=AF=BC=E5=87=BA=E6=B0=91=E6=97=8F=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RtEnlistmentReserveController.java        |  6 ++++-
 .../dto/RtEnlistmentReserveExportDto.java     | 25 +++++++++----------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/srs-admin/src/main/java/com/srs/web/controller/routine/RtEnlistmentReserveController.java b/srs-admin/src/main/java/com/srs/web/controller/routine/RtEnlistmentReserveController.java
index 4b74a37..fcdc43c 100644
--- a/srs-admin/src/main/java/com/srs/web/controller/routine/RtEnlistmentReserveController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/routine/RtEnlistmentReserveController.java
@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.srs.dormitory.domain.DmsOutsideAccommodationApply;
 import com.srs.routine.domain.dto.RtEnlistmentReserveExportDto;
+import com.srs.system.service.ISysDictDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -38,6 +39,9 @@ public class RtEnlistmentReserveController extends BaseController {
     @Autowired
     private IRtEnlistmentReserveService rtEnlistmentReserveService;
 
+    @Autowired
+    private ISysDictDataService sysDictDataService;
+
     /**
      * 查询应征入伍保留学籍申请列表
      */
@@ -80,7 +84,7 @@ public class RtEnlistmentReserveController extends BaseController {
         dto.setApplyNo(source.getApplyNo());
         dto.setTeacherName(source.getTeacherName());
         dto.setStudentName(source.getStudentName());
-        dto.setNation(source.getNation());
+        dto.setNation(sysDictDataService.selectDictLabel("rt_nation", source.getNation()));
         dto.setGrade(source.getGrade());
         dto.setStudentNo(source.getStudentNo());
         dto.setClassName(source.getClassName());
diff --git a/srs-routine/src/main/java/com/srs/routine/domain/dto/RtEnlistmentReserveExportDto.java b/srs-routine/src/main/java/com/srs/routine/domain/dto/RtEnlistmentReserveExportDto.java
index 8b75a8f..81f49f5 100644
--- a/srs-routine/src/main/java/com/srs/routine/domain/dto/RtEnlistmentReserveExportDto.java
+++ b/srs-routine/src/main/java/com/srs/routine/domain/dto/RtEnlistmentReserveExportDto.java
@@ -19,19 +19,18 @@ public class RtEnlistmentReserveExportDto {
     @Excel(name = "申请编号")
     private String applyNo;
 
-
-    /**
-     * 辅导员姓名
-     */
-    @Excel(name = "辅导员姓名")
-    private String teacherName;
-
     /**
      * 姓名
      */
     @Excel(name = "学生姓名")
     private String studentName;
 
+    /**
+     * 学号
+     */
+    @Excel(name = "学号")
+    private String studentNo;
+
     /**
      * 性别（0-男
      */
@@ -50,12 +49,6 @@ public class RtEnlistmentReserveExportDto {
     @Excel(name = "年级")
     private String grade;
 
-    /**
-     * 学号
-     */
-    @Excel(name = "学号")
-    private String studentNo;
-
     /**
      * 班级
      */
@@ -68,6 +61,12 @@ public class RtEnlistmentReserveExportDto {
     @Excel(name = "专业名称")
     private String major;
 
+    /**
+     * 辅导员姓名
+     */
+    @Excel(name = "辅导员姓名")
+    private String teacherName;
+
     /**
      * 家庭地址
      */