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..b9d5098 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); @@ -96,10 +96,10 @@ public class SysTrainnumController extends BaseController { * 详细 */ @RequiresPermissions("system:trainnum:detail") - @GetMapping("/detail/{ID}") - public String detail(@PathVariable("ID") Long ID, ModelMap mmap) + @GetMapping("/detail/{id}") + public String detail(@PathVariable("id") Long id, ModelMap mmap) { - mmap.put("tdTrain", tdTrainService.selectTdTrainByID(ID)); + mmap.put("tdTrain", tdTrainService.selectTdTrainByID(id)); SysUser user = getSysUser(); mmap.put("user", user); return prefix + "/detail"; 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..51be34b 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, "涉密人员培训数据"); @@ -109,11 +109,11 @@ public class TdTrainController extends BaseController * 修改涉密人员培训 */ @RequiresPermissions("system:train:edit") - @GetMapping("/edit/{ID}") - public String edit(@PathVariable("ID") Long ID, ModelMap mmap) + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) { - TdTrain tdTrain = tdTrainService.selectTdTrainByID(ID); + TdTrain tdTrain = tdTrainService.selectTdTrainByID(id); mmap.put("tdTrain", tdTrain); return prefix + "/edit"; } @@ -149,10 +149,10 @@ public class TdTrainController extends BaseController * 培训记录详情 */ @RequiresPermissions("system:train:detail") - @GetMapping("/detail/{ID}") - public String detail(@PathVariable("ID") Long ID, ModelMap mmap) + @GetMapping("/detail/{id}") + public String detail(@PathVariable("id") Long id, ModelMap mmap) { - mmap.put("tdTrain", tdTrainService.selectTdTrainByID(ID)); + mmap.put("tdTrain", tdTrainService.selectTdTrainByID(id)); SysUser user = getSysUser(); mmap.put("user", user); return prefix + "/detail"; @@ -162,10 +162,10 @@ public class TdTrainController extends BaseController * 审核涉密人员培训 */ @RequiresPermissions("system:train:examine") - @GetMapping("/examine/{ID}") - public String examine(@PathVariable("ID") Long ID, ModelMap mmap) + @GetMapping("/examine/{id}") + public String examine(@PathVariable("id") Long id, ModelMap mmap) { - TdTrain tdTrain = tdTrainService.selectTdTrainByID(ID); + TdTrain tdTrain = tdTrainService.selectTdTrainByID(id); SysUser user = getSysUser(); mmap.put("tdTrain", tdTrain); mmap.put("user", user); diff --git a/ruoyi-admin/src/main/resources/templates/system/train/add.html b/ruoyi-admin/src/main/resources/templates/system/train/add.html index 587edc7..bbd1d44 100644 --- a/ruoyi-admin/src/main/resources/templates/system/train/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/train/add.html @@ -14,7 +14,7 @@
-