From 372ec8892f5ed3d11736e75abdd7f33ea34e0d2d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 03 Aug 2021 10:40:09 +0800
Subject: [PATCH] 个人考试信息查询接口修改
---
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 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 4f738cc..68ab10b 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -5,16 +5,22 @@
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.common.utils.arg;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.apply.entity.Apply;
+import org.springblade.modules.apply.excel.ApplyInfoExcel;
import org.springblade.modules.training.entity.TrainingRegistration;
import org.springblade.modules.training.service.TrainingRegistrationService;
import org.springblade.modules.training.vo.TrainingRegistrationVo;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import java.util.Date;
+import java.util.List;
/**
* @author zhongrj
@@ -46,7 +52,6 @@
@PostMapping("/save")
@ApiOperation(value = "新增", notes = "传入trainingRegistration")
public R save(@RequestBody TrainingRegistration trainingRegistration) throws Exception {
- arg.test01(arg.url+"/trainingRegistration/save",trainingRegistration);
return R.status(trainingRegistrationService.save(trainingRegistration));
}
@@ -66,6 +71,12 @@
*/
@PostMapping("/submit")
public R submit(@RequestBody TrainingRegistration trainingRegistration) throws Exception {
+ if (null!=trainingRegistration.getId()){
+ trainingRegistration.setTrainingTime(new Date());
+ trainingRegistration.setCancel(1);
+ //默认报名未考试状态
+ trainingRegistration.setIsExam(1);
+ }
arg.test01(arg.url+"/trainingRegistration/submit",trainingRegistration);
return R.status(trainingRegistrationService.saveOrUpdate(trainingRegistration));
}
@@ -91,4 +102,15 @@
return R.data(detail);
}
+ /**
+ * 导出报名数数据
+ * @param response
+ * @param trainingRegistration 培训报名对象
+ */
+ @GetMapping("export-apply")
+ @ApiOperation(value = "导出报名清册")
+ public void exportApply(HttpServletResponse response,TrainingRegistrationVo trainingRegistration) {
+ List<ApplyInfoExcel> list = trainingRegistrationService.getTrainingRegistrationExcelList(trainingRegistration);
+ ExcelUtil.export(response, "考试报名清册数据"+ DateUtil.time(), "考试报名清册数据表", list, ApplyInfoExcel.class);
+ }
}
--
Gitblit v1.9.3