From ce74b7f958b4dfbfd6c2c0865877f290bc6455c2 Mon Sep 17 00:00:00 2001
From: sunxiqing <2240398334@qq.com>
Date: Mon, 6 Jan 2025 19:49:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=95=99=E5=B8=88=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/admin/user/UserController.java     | 5 +++++
 .../admin/user/vo/user/UserTeacherExcelVO.java           | 9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

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 f6fcf16a6..5ac73161a 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
@@ -195,6 +195,11 @@ public class UserController {
             userRespVOS.stream().forEach(sysUser ->{
                 UserTeacherExcelVO student = new UserTeacherExcelVO();
                 BeanUtil.copyProperties(sysUser, student);
+                if (sysUser.getUserType()==1){
+                    student.setStatusType(sysUser.getStatusType()==1?"培训教师":"教师");
+                }else if (sysUser.getUserType()==2){
+                    student.setStatusType(sysUser.getStatusType()==1?"学员":"学生");
+                }
                 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/UserTeacherExcelVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserTeacherExcelVO.java
index 7f3d2ef11..69e8a2d9b 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserTeacherExcelVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserTeacherExcelVO.java
@@ -1,5 +1,8 @@
 package cn.iocoder.yudao.module.system.controller.admin.user.vo.user;
 
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -29,10 +32,12 @@ public class UserTeacherExcelVO {
     @ExcelProperty("手机号码")
     private String mobile;
 
-    @ExcelProperty("性别")
+    @ExcelProperty(value = "性别",converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.USER_SEX)
     private String sex;
 
-    @ExcelProperty("状态")
+    @ExcelProperty(value = "状态",converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.COMMON_STATUS)
     private String status;
 
     @ExcelProperty("出生日期")