From b0625931bc528429d592f642bdd759e7dbdfb1c3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 19 Oct 2021 22:21:07 +0800
Subject: [PATCH] 1.保安员新增接口修改，单个新增保安员默认密码为身份证号后6位，账号为身份证号， 2.考试成绩可以按天导出 3.个人图片批量导入接口修改 4.保安员批量导入修改，如有重复的账号导入的跳过，导入完成后返回提示信息
---
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 70 ++++++++++++++++++++++++++++++++++-
1 files changed, 68 insertions(+), 2 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 90210f8..dab0127 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -1,6 +1,7 @@
package org.springblade.modules.exam.controller;
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;
@@ -15,12 +16,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;
@@ -115,6 +119,25 @@
return R.status(examScoreService.updateById(examScore));
}
+
+ /**
+ * 缺考标记修改
+ *
+ * @param examScore 考试成绩信息对象
+ */
+ @PostMapping("/updateAbsent")
+ public R updateAbsent(@RequestBody ExamScore examScore) {
+ examScore.setQualified(3);
+ boolean status = examScoreService.updateByIdAndQualifiee(examScore);
+
+ //内网数据推送
+ String s1 =
+ "update exam_score set qualified = " + "'" + examScore.getQualified() + "'" +
+ " " + "where id = " + "'" + examScore.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ return R.status(status);
+ }
+
/**
* 修改总成绩
*
@@ -138,12 +161,11 @@
int max = userService.getSecurityPaperCount(pre);
String result = null;
if (max == 0) {
- result = pre + "00000";
+ result = pre + "00001";
} else {
//格式化
DecimalFormat decimalFormat = new DecimalFormat("00000");
max++;
- System.out.println("max = " + max);
result = pre + (decimalFormat.format(max));
}
user.setSecuritynumber(result);
@@ -316,4 +338,48 @@
cjhz.put("sccj",sccj);
return R.data(cjhz);
}
+ /**
+ * 自定义分页
+ *
+ * @param query page,size
+ */
+ @GetMapping("/score-page")
+ public R<IPage<ExamScoreVO>> scorePage(Query query, String deptid, String jurisdiction) {
+ 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) {
+ System.out.println("examScoreVO = " + examScoreVO);
+ //按条件查询成绩数据
+ List<ExportExamScoreExcel> examScoreExcels = examScoreService.exportExamScoreList(examScoreVO);
+ //导出成绩集合数据
+ ExcelUtil.export(response, "成绩数据", "成绩数据表", examScoreExcels, ExportExamScoreExcel.class);
+ }
}
--
Gitblit v1.9.3