From 30ec3bd40d36ed424dfda162752e08fae074f375 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 11 Aug 2021 17:08:17 +0800
Subject: [PATCH] 报名考试，成绩计算接口修改
---
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 80 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 76 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
index 0b1db56..1c5c904 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -4,17 +4,27 @@
import io.swagger.annotations.ApiOperation;
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.Func;
import org.springblade.modules.exam.entity.ExamScore;
+import org.springblade.modules.exam.excel.ExamScoreExcel;
+import org.springblade.modules.exam.excel.ExamScoreImporter;
import org.springblade.modules.exam.service.ExamScoreService;
+import org.springblade.modules.exam.util.SecurityPaperUtil;
import org.springblade.modules.exam.vo.ExamScoreVO;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IUserService;
import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Random;
/**
* @author zhongrj
@@ -27,6 +37,8 @@
public class ExamScoreController {
private final ExamScoreService examScoreService;
+
+ private final IUserService userService;
/**
* 自定义分页
@@ -83,10 +95,39 @@
* @param examScore 考试成绩信息对象
*/
@PostMapping("/updateExamScore")
- public R updateExamScore(@RequestBody ExamScore examScore) {
+ public R updateExamScore(@RequestBody ExamScore examScore) throws Exception {
if (null!=examScore.getLearnGrade() && null!=examScore.getTheoryGrade()){
- examScore.setAllGrade(examScore.getLearnGrade()+examScore.getTheoryGrade());
+ ExamScore examScore1 = examScoreService.getById(examScore.getId());
+ if (examScore.getTheoryGrade()>=60 && examScore.getLearnGrade()>=60){
+ //合格
+ examScore.setQualified(0);
+ //去生成保安证编号
+ //查询当前保安信息
+ User user = userService.getById(examScore1.getUserId());
+ String pre = SecurityPaperUtil.getSecurityPaper();
+ //查询当前年份已有的保安证编号
+ int count = userService.getSecurityPaperCount(pre);
+ String result = null;
+ if (count==0){
+ result = pre + "00000";
+ }else {
+ //格式化
+ DecimalFormat decimalFormat = new DecimalFormat("00000");
+ result = pre + (decimalFormat.format(count++));
+ }
+ user.setSecuritynumber(result);
+ //更新保安数据
+ userService.updateById(user);
+ }else {
+ //不合格
+ examScore.setQualified(1);
+ }
+ //总成绩
+ examScore.setAllGrade(Math.round((examScore.getLearnGrade()+examScore1.getTheoryGrade())/2));
}
+ //内网修改
+ //arg.test01(arg.url+"/examScore/update",examScore);
+ //本地修改
return R.status(examScoreService.updateById(examScore));
}
@@ -121,4 +162,35 @@
return R.data(detail);
}
+ /**
+ * 导入实操成绩
+ * @param isCovered 1 覆盖 0不覆盖
+ * @return
+ */
+ @PostMapping("import-examScore")
+ @ApiOperation(value = "导入实操成绩", notes = "传入excel")
+ public R importExamScore(MultipartFile file, Integer isCovered) {
+ ExamScoreImporter examScoreImporter = new ExamScoreImporter(examScoreService, false);
+ ExcelUtil.save(file, examScoreImporter, ExamScoreExcel.class);
+ return R.success("操作成功");
+ }
+
+ /**
+ * 导出模板
+ */
+ @GetMapping("export-template")
+ @ApiOperation(value = "导出模板")
+ public void exportUser(HttpServletResponse response) {
+ List<ExamScoreExcel> list = new ArrayList<>();
+ ExcelUtil.export(response, "实操成绩数据模板", "实操成绩数据表", list, ExamScoreExcel.class);
+ }
+
+ /**
+ * 分数统计
+ */
+ @GetMapping("score-statistics")
+ @ApiOperation(value = "分数统计")
+ public R<List> scoreStatistics(HttpServletResponse response) {
+ return R.data(examScoreService.scoreStatistics());
+ }
}
--
Gitblit v1.9.3