From e6376dfd91833290ddc3f390b94ef4977dbeff92 Mon Sep 17 00:00:00 2001 From: wangxy <1481820854@qq.com> Date: Thu, 7 Nov 2024 14:58:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=80=9A=E9=AB=98=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/count/SysTrainnumController.java | 8 ++++---- .../web/controller/system/system/TdTrainController.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysTrainnumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysTrainnumController.java index 36f1449..9d07f03 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysTrainnumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysTrainnumController.java @@ -81,11 +81,11 @@ public class SysTrainnumController extends BaseController { { List list = tdTrainService.selectTdTrainList(tdTrain); list.forEach(tdTrain1 -> { - tdTrain1.setAREAID(sysAreaManager.getAreaName(tdTrain1.getAREAID())); - tdTrain1.setFRAMEWORK(sysAreaManager.getAreaName(tdTrain1.getFRAMEWORK())); - SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tdTrain1.getUSERNAME())); + tdTrain1.setAreaid(sysAreaManager.getAreaName(tdTrain1.getAreaid())); + tdTrain1.setFramework(sysAreaManager.getAreaName(tdTrain1.getFramework())); + SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tdTrain1.getUsername())); if(Objects.nonNull(sysUser)){ - tdTrain1.setUSERNAME(sysUser.getUserName()); + tdTrain1.setUsername(sysUser.getUserName()); } }); ExcelUtil util = new ExcelUtil(TdTrain.class); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdTrainController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdTrainController.java index c0044b4..a0af4d3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdTrainController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdTrainController.java @@ -74,8 +74,8 @@ public class TdTrainController extends BaseController { List list = tdTrainService.selectTdTrainList(tdTrain); list.forEach(tdTrain1 -> { - tdTrain1.setAREAID(sysAreaManager.getAreaName(tdTrain1.getAREAID())); - tdTrain1.setFRAMEWORK(sysAreaManager.getAreaName(tdTrain1.getFRAMEWORK())); + tdTrain1.setAreaid(sysAreaManager.getAreaName(tdTrain1.getAreaid())); + tdTrain1.setFramework(sysAreaManager.getAreaName(tdTrain1.getFramework())); }); ExcelUtil util = new ExcelUtil(TdTrain.class); return util.exportExcel(list, "涉密人员培训数据");