From e3d6ee367206bc2287513610390bfc5003250262 Mon Sep 17 00:00:00 2001 From: wangxy <1356089412@qq.com> Date: Tue, 25 Jun 2024 11:09:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/system/system/TdTrainController.java | 2 ++ .../src/main/java/com/ruoyi/system/domain/TdTrain.java | 8 +++----- 2 files changed, 5 insertions(+), 5 deletions(-) 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 8778d2f..e543ba0 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 @@ -91,6 +91,7 @@ public class TdTrainController extends BaseController { tdTrain.setCreateStaffid(getLoginName()); tdTrain.setCreateDate(new Date()); + tdTrain.setCreateDepartid(String.valueOf(getSysUser().getDeptId())); return toAjax(tdTrainService.insertTdTrain(tdTrain)); } @@ -118,6 +119,7 @@ public class TdTrainController extends BaseController { tdTrain.setUpdateStaffid(getLoginName()); tdTrain.setUpdateDate(new Date()); + tdTrain.setUpdateDepartid(String.valueOf(getSysUser().getDeptId())); return toAjax(tdTrainService.updateTdTrain(tdTrain)); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdTrain.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdTrain.java index 40aeff1..913543a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdTrain.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdTrain.java @@ -29,11 +29,11 @@ public class TdTrain extends BaseEntity private String deptName; /** 培训类型 */ - @Excel(name = "培训类型") + @Excel(name = "培训类型",readConverterExp = "0=资料学习,1=视频学习,2=音频学习") private String trainType; /** 培训对象 */ - @Excel(name = "培训对象") + @Excel(name = "培训对象",readConverterExp = "0=涉密文件,1=涉密设备,2=涉密资产3=涉密人员") private String trainSubject; /** 培训地点 */ @@ -50,7 +50,6 @@ public class TdTrain extends BaseEntity private String createStaffid; /** 创建单位 */ - @Excel(name = "创建单位") private String createDepartid; /** 创建日期 */ @@ -59,7 +58,6 @@ public class TdTrain extends BaseEntity private Date createDate; /** 更新单位 */ - @Excel(name = "更新单位") private String updateDepartid; /** 更新人员 */ @@ -84,7 +82,7 @@ public class TdTrain extends BaseEntity private String trainName; /** 培训状态 */ - @Excel(name = "培训状态") + @Excel(name = "培训状态",readConverterExp = "0=通过,1=未通过,2=待审核") private Long trainState; /** 培训结束时间 */