From f63fff71fcd7a62ad73b0b9eda614f3b1fa3badf Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Fri, 22 Oct 2021 22:51:09 +0800
Subject: [PATCH] 考试成绩修改状态重置
---
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 89 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 84 insertions(+), 5 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 95d9a81..beab64e 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -1,9 +1,14 @@
package org.springblade.modules.exam.controller;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import org.apache.commons.codec.Charsets;
+import org.springblade.common.excel.RowWriteHandler;
import org.springblade.common.utils.arg;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
@@ -15,12 +20,15 @@
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.excel.ExportExamScoreExcel;
import org.springblade.modules.exam.service.ExamPaperService;
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.exam.vo.UpdateParamVo;
import org.springblade.modules.system.entity.Role;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.service.IRoleService;
import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.system.vo.UserVO;
@@ -28,6 +36,8 @@
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
import java.sql.Array;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
@@ -150,14 +160,14 @@
examScore.setQualified(0);
//正式考试通过生成保安证编号
ExamPaper paper = examPaperService.getById(examScore.getExamId());
- if (paper.getExamType() == 1) {
+// if (paper.getExamType() == 1) {
//去生成保安证编号
String pre = SecurityPaperUtil.getSecurityPaper();
//查询当前年份已有的保安证编号
int max = userService.getSecurityPaperCount(pre);
String result = null;
if (max == 0) {
- result = pre + "00000";
+ result = pre + "00001";
} else {
//格式化
DecimalFormat decimalFormat = new DecimalFormat("00000");
@@ -183,7 +193,7 @@
",paper_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime()) + "'" +
" " + "where id = " + "'" + user.getId() + "'";
FtpUtil.sqlFileUpload(s1);
- }
+// }
} else {
//不合格
examScore.setQualified(1);
@@ -285,9 +295,35 @@
*/
@GetMapping("export-template")
@ApiOperation(value = "导出模板")
- public void exportUser(HttpServletResponse response) {
+ public void exportExamScore(HttpServletResponse response)throws IOException {
List<ExamScoreExcel> list = new ArrayList<>();
- ExcelUtil.export(response, "实操成绩数据模板", "实操成绩数据表", list, ExamScoreExcel.class);
+ ExamScoreExcel examScoreExcel = new ExamScoreExcel();
+ examScoreExcel.setExamName("2021年10月**日保安员证培训考试");
+ examScoreExcel.setName("张三");
+ examScoreExcel.setIdCardNo("360XXX19XXXXXX****");
+ examScoreExcel.setCandidateNo("2110**m0001");
+ examScoreExcel.setLearnGrade(80);
+ list.add(examScoreExcel);
+
+ ExamScoreExcel examScoreExcel1 = new ExamScoreExcel();
+ examScoreExcel1.setExamName("2021年10月**日保安员证培训考试");
+ examScoreExcel1.setName("李四");
+ examScoreExcel1.setIdCardNo("360XXX19XXXXXX****");
+ examScoreExcel1.setCandidateNo("2110**m0002");
+ examScoreExcel1.setLearnGrade(88);
+ list.add(examScoreExcel1);
+// ExcelUtil.export(response, "实操成绩数据模板", "实操成绩数据表", list, ExamScoreExcel.class);
+ String fileName = null;
+ try {
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding(org.apache.commons.codec.Charsets.UTF_8.name());
+ fileName = URLEncoder.encode("实操成绩数据模板", Charsets.UTF_8.name());
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+ //修改单元格格式为文本格式
+ EasyExcel.write(response.getOutputStream(), ExamScoreExcel.class).sheet("实操成绩数据表").registerWriteHandler(new RowWriteHandler()).doWrite(list);
+ } catch (Throwable var6) {
+ throw var6;
+ }
}
/**
@@ -344,4 +380,47 @@
IPage<ExamScoreVO> pages = examScoreService.scorePage(Condition.getPage(query),deptid,jurisdiction);
return R.data(pages);
}
+
+
+ /**
+ * 考试成绩及状态修改
+ * @param updateParamVo
+ */
+ @GetMapping("/update-exam-score")
+ public R updateExamScores(UpdateParamVo updateParamVo) {
+ boolean status = examScoreService.updateExamScore(updateParamVo);
+ return R.status(status);
+ }
+
+ /**
+ * 考试重置（重考）
+ * @param updateParamVo
+ */
+ @PostMapping("/refreshTrainExamInfo")
+ public R refreshTrainExamInfo(@RequestBody UpdateParamVo updateParamVo) {
+ return R.status(examScoreService.refreshTrainExamInfo(updateParamVo));
+ }
+
+ /**
+ * 导出成绩
+ */
+ @GetMapping("export-examScore")
+ @ApiOperationSupport(order = 14)
+ @ApiOperation(value = "导出成绩")
+ public void exportExamScore(HttpServletResponse response,ExamScoreVO examScoreVO) {
+ //按条件查询成绩数据
+ List<ExportExamScoreExcel> examScoreExcels = examScoreService.exportExamScoreList(examScoreVO);
+ //导出成绩集合数据
+ ExcelUtil.export(response, "成绩数据", "成绩数据表", examScoreExcels, ExportExamScoreExcel.class);
+ }
+
+
+ /**
+ * 考试成绩恢复状态重置（重考）
+ * @param
+ */
+ @GetMapping("/refreshTrainExamScore")
+ public R refreshTrainExamScore() {
+ return R.status(examScoreService.refreshTrainExamScore());
+ }
}
--
Gitblit v1.9.3