From 6af66f6ee55cd5763385a23da7a60dcb0a9df138 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 29 Apr 2022 10:03:53 +0800
Subject: [PATCH] 保安员报名修改
---
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
index 3614e63..ac2cd9e 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -86,7 +86,7 @@
@ApiOperation(value = "新增", notes = "传入trainingRegistration")
public R save(@RequestBody TrainingRegistration trainingRegistration){
//查询人员是否已报名
- User user = userService.getById(trainingRegistration.getUserId());
+ User user = userService.getUserById(trainingRegistration.getUserId());
if (null==user.getIsTrain()){
//已报名
trainingRegistration.setCancel(1);
@@ -181,7 +181,8 @@
@PostMapping("/cancelTrain")
public R cancelApply(@RequestBody TrainingRegistration trainingRegistration){
//查询人员是否已报名
- User user = userService.getById(trainingRegistration.getUserId());
+ User user = userService.getUserById(trainingRegistration.getUserId());
+
if(null==user.getIsTrain()){
trainingRegistration.setCancel(2);
boolean status = trainingRegistrationService.updateById(trainingRegistration);
@@ -224,7 +225,7 @@
@PostMapping("/auditSucess")
public R auditSucess(@RequestBody TrainingRegistration trainingRegistration){
//查询人员信息
- User user = userService.getById(trainingRegistration.getUserId());
+ User user = userService.getUserById(trainingRegistration.getUserId());
boolean status = false;
if (null!=user){
//修改为已报名状态
@@ -249,7 +250,7 @@
@PostMapping("/cancelTrainAudit")
public R cancelApplyAudit(@RequestBody TrainingRegistration trainingRegistration){
//查询人员是否已报名
- User user = userService.getById(trainingRegistration.getUserId());
+ User user = userService.getUserById(trainingRegistration.getUserId());
if(null==user.getIsTrain()){
trainingRegistration.setCancel(2);
trainingRegistration.setAuditStatus(2);
@@ -315,7 +316,7 @@
// AtomicReference<StringBuilder> builder = new AtomicReference<>(new StringBuilder());
//遍历
list.forEach(userId ->{
- User user = userService.getById(userId);
+ User user = userService.getUserById(userId);
UserVO userVO = userService.getUserAgeById(Long.parseLong(userId));
//判断年龄
if (userVO.getAge()>=18 && userVO.getAge()<=60) {
@@ -434,8 +435,8 @@
*/
@PostMapping("import-trainingRegistration")
@ApiOperation(value = "导入培训报名数据", notes = "传入excel")
- public R importUser(MultipartFile file, Integer isCovered,Long examId) {
- TrainingRegistrationImporter trainingRegistrationImporter = new TrainingRegistrationImporter(trainingRegistrationService, false,examId);
+ public R importUser(MultipartFile file, Integer isCovered,String deptId) {
+ TrainingRegistrationImporter trainingRegistrationImporter = new TrainingRegistrationImporter(trainingRegistrationService, false,deptId);
ExcelUtil.save(file, trainingRegistrationImporter, TrainingRegistrationExcel.class);
return R.success("操作成功");
}
@@ -447,7 +448,13 @@
@ApiOperation(value = "导出模板")
public void exportUser(HttpServletResponse response) {
List<TrainingRegistrationExcel> list = new ArrayList<>();
- ExcelUtil.export(response, "培训报名数据模板", "培训报名数据表", list, TrainingRegistrationExcel.class);
+ //创建示例
+ TrainingRegistrationExcel excel = new TrainingRegistrationExcel();
+ excel.setDeptName("****保安公司");
+ excel.setRealName("张三");
+ excel.setDeptName("360110202201010001");
+ list.add(excel);
+ ExcelUtil.export(response, "培训报名数据模板" + DateUtil.time(), "培训报名数据表", list, TrainingRegistrationExcel.class);
}
--
Gitblit v1.9.3