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 1/5] =?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; } From 6603c32b6c1c05d77198c12d5459f34eed0e9e17 Mon Sep 17 00:00:00 2001 From: sunxiqing <2240398334@qq.com> Date: Mon, 6 Jan 2025 18:46:21 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A4=87=E4=BB=BD--=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modelassesstaskauto/ModelAssessTaskAutoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskauto/ModelAssessTaskAutoServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskauto/ModelAssessTaskAutoServiceImpl.java index 4e0b215fa..b870e18ea 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskauto/ModelAssessTaskAutoServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskauto/ModelAssessTaskAutoServiceImpl.java @@ -132,7 +132,7 @@ public class ModelAssessTaskAutoServiceImpl implements ModelAssessTaskAutoServic @Override public ModelAssessTaskAutoRespVO getModelAssessTaskAuto(Long id) { - ModelAssessTaskAutoDO modelAssessTaskAutoDO = modelAssessTaskAutoMapper.selectById(id); + ModelAssessTaskAutoBackupDO modelAssessTaskAutoDO = modelAssessTaskAutoBackupMapper.selectById(id); ModelAssessTaskAutoRespVO result = BeanUtils.toBean(modelAssessTaskAutoDO, ModelAssessTaskAutoRespVO.class); // 标注查询 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 3/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=AF=BC=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; } From e9ad8709869cfe83d0fe3f272b8cd319f700f674 Mon Sep 17 00:00:00 2001 From: sunxiqing <2240398334@qq.com> Date: Mon, 6 Jan 2025 19:22:35 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=AF=84=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modelassesstaskauto/ModelAssessTaskAutoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskauto/ModelAssessTaskAutoServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskauto/ModelAssessTaskAutoServiceImpl.java index b870e18ea..4e0b215fa 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskauto/ModelAssessTaskAutoServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskauto/ModelAssessTaskAutoServiceImpl.java @@ -132,7 +132,7 @@ public class ModelAssessTaskAutoServiceImpl implements ModelAssessTaskAutoServic @Override public ModelAssessTaskAutoRespVO getModelAssessTaskAuto(Long id) { - ModelAssessTaskAutoBackupDO modelAssessTaskAutoDO = modelAssessTaskAutoBackupMapper.selectById(id); + ModelAssessTaskAutoDO modelAssessTaskAutoDO = modelAssessTaskAutoMapper.selectById(id); ModelAssessTaskAutoRespVO result = BeanUtils.toBean(modelAssessTaskAutoDO, ModelAssessTaskAutoRespVO.class); // 标注查询 From ba6a6b57351b245dd346ff43656bd349f17032fc Mon Sep 17 00:00:00 2001 From: sunxiqing <2240398334@qq.com> Date: Mon, 6 Jan 2025 19:40:55 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/user/vo/user/UserStudentExcelVO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 854acb99a..cacabff95 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 @@ -31,12 +31,12 @@ public class UserStudentExcelVO { @ExcelProperty(value = "性别",converter = DictConvert.class) @DictFormat(DictTypeConstants.USER_SEX) - private Integer sex; + private String sex; @ExcelProperty("手机号码") private String mobile; @ExcelProperty(value = "状态",converter = DictConvert.class) @DictFormat(DictTypeConstants.COMMON_STATUS) - private Integer status; + private String status; }