From 8bb3af30364019b87e89b177d7768b696694699c Mon Sep 17 00:00:00 2001
From: sunxiqing <2240398334@qq.com>
Date: Mon, 6 Jan 2025 18:36:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/system/controller/admin/user/UserController.java  | 5 +++++
 .../controller/admin/user/vo/user/UserStudentExcelVO.java    | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
index a8bcc0551..751fc83ac 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
@@ -162,6 +162,11 @@ public class UserController {
         if (!userRespVOS.isEmpty()) {
             userRespVOS.stream().forEach(sysUser ->{
                 UserStudentExcelVO student = new UserStudentExcelVO();
+                if (sysUser.getUserType()==1){
+                    student.setStatusType(sysUser.getStatusType()==1?"培训教师":"教师");
+                }else if (sysUser.getUserType()==2){
+                    student.setStatusType(sysUser.getStatusType()==1?"学员":"学生");
+                }
                 BeanUtil.copyProperties(sysUser, student);
                 studentUserList.add(student);
             });
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserStudentExcelVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserStudentExcelVO.java
index 807500c9a..c04168e95 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserStudentExcelVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserStudentExcelVO.java
@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.system.controller.admin.user.vo.user;
 
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -27,11 +29,13 @@ public class UserStudentExcelVO {
     private String statusType;
 
     @ExcelProperty("性别")
+    @DictFormat(DictTypeConstants.USER_SEX)
     private String sex;
 
     @ExcelProperty("手机号码")
     private String mobile;
 
     @ExcelProperty("状态")
+    @DictFormat(DictTypeConstants.COMMON_STATUS)
     private String status;
 }