From d36a3914fcbbfd98c74130b46fa9e9296f806d11 Mon Sep 17 00:00:00 2001
From: sunxiqing <2240398334@qq.com>
Date: Mon, 6 Jan 2025 19:06:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/admin/user/UserController.java     | 7 +++++--
 .../admin/user/vo/user/UserStudentExcelVO.java           | 9 +++++----
 2 files changed, 10 insertions(+), 6 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 751fc83ac..f6fcf16a6 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
@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.*;
 import cn.iocoder.yudao.module.system.convert.user.UserConvert;
@@ -162,17 +163,19 @@ public class UserController {
         if (!userRespVOS.isEmpty()) {
             userRespVOS.stream().forEach(sysUser ->{
                 UserStudentExcelVO student = new UserStudentExcelVO();
+                BeanUtil.copyProperties(sysUser, student);
                 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);
             });
         }
         // 输出 Excel
-        ExcelUtils.write(response, "学生数据.xls", "数据", UserStudentExcelVO.class, studentUserList );
+        ExcelUtils.write(response, "学生数据.xls", "数据", UserStudentExcelVO.class,
+                BeanUtils.toBean(studentUserList, UserStudentExcelVO.class));
+//        ExcelUtils.write(response, "学生数据.xls", "数据", UserStudentExcelVO.class, studentUserList );
     }
 
     @GetMapping("/teacher/export")
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 c04168e95..854acb99a 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,6 +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.framework.excel.core.convert.DictConvert;
 import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.AllArgsConstructor;
@@ -28,14 +29,14 @@ public class UserStudentExcelVO {
     @ExcelProperty("学生类型")
     private String statusType;
 
-    @ExcelProperty("性别")
+    @ExcelProperty(value = "性别",converter = DictConvert.class)
     @DictFormat(DictTypeConstants.USER_SEX)
-    private String sex;
+    private Integer sex;
 
     @ExcelProperty("手机号码")
     private String mobile;
 
-    @ExcelProperty("状态")
+    @ExcelProperty(value = "状态",converter = DictConvert.class)
     @DictFormat(DictTypeConstants.COMMON_STATUS)
-    private String status;
+    private Integer status;
 }