From 8d43111bd0e598bc0b2014cbfa69a32e74959dff Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 15 Dec 2021 19:24:05 +0800
Subject: [PATCH] ftp sql 同步封装
---
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 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 f3a1e4b..6791a9b 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -1,7 +1,6 @@
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;
@@ -9,11 +8,11 @@
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;
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.FTP.FtpUtil;
import org.springblade.modules.exam.entity.ExamPaper;
@@ -26,9 +25,7 @@
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;
@@ -38,7 +35,6 @@
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;
import java.util.*;
@@ -110,8 +106,17 @@
*/
@PostMapping("/saveExamScore")
public R saveExamScore(@RequestBody ExamScoreVO examScore) {
-
return R.status(examScoreService.saveExamScore(examScore));
+ }
+
+
+ /**
+ * 点击了开始考试后超过60分钟后再考试的，计算之前的考试成绩
+ * @param examScore 考试成绩信息对象
+ */
+ @GetMapping("/getExamScore")
+ public R getExamScore(ExamScoreVO examScore) {
+ return R.status(examScoreService.getExamScore(examScore));
}
@@ -161,11 +166,13 @@
if (examScore.getTheoryGrade() >= 60 && examScore.getLearnGrade() >= 60) {
//合格
examScore.setQualified(0);
+ //设置为未制证的状态
+ user1.setUserType(7);
//正式考试通过生成保安证编号
ExamPaper paper = examPaperService.getById(examScore.getExamId());
// if (paper.getExamType() == 1) {
//如果已有保安证编号，不更新用户信息
- if (null==user1.getSecuritynumber() || user1.getSecuritynumber()=="") {
+ if (null==user1.getSecuritynumber() || user1.getSecuritynumber().equals("")) {
//去生成保安证编号
String pre = SecurityPaperUtil.getSecurityPaper();
//查询当前年份已有的保安证编号
@@ -181,7 +188,7 @@
}
user1.setSecuritynumber(result);
//发证日期
- user1.setPaperTime(new Date());
+// user1.setPaperTime(new Date());
//修改为持证保安
user1.setHold("1");
//分配保安角色
@@ -195,7 +202,7 @@
String s1 =
"update blade_user set hold = " + "'" + user1.getHold() + "'" +
",securitynumber = " + "'" + user1.getSecuritynumber() + "'" +
- ",paper_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(user1.getPaperTime()) + "'" +
+ ",user_type = " + "'" + user1.getUserType() + "'" +
" " + "where id = " + "'" + user1.getId() + "'";
FtpUtil.sqlFileUpload(s1);
}
@@ -313,7 +320,7 @@
examScoreExcel.setExamName("2021年10月**日保安员证培训考试");
examScoreExcel.setName("张三");
examScoreExcel.setIdCardNo("360XXX19XXXXXX****");
- examScoreExcel.setCandidateNo("2110**m0001");
+// examScoreExcel.setCandidateNo("2110**m0001");
examScoreExcel.setLearnGrade(80);
list.add(examScoreExcel);
@@ -321,7 +328,7 @@
examScoreExcel1.setExamName("2021年10月**日保安员证培训考试");
examScoreExcel1.setName("李四");
examScoreExcel1.setIdCardNo("360XXX19XXXXXX****");
- examScoreExcel1.setCandidateNo("2110**m0002");
+// examScoreExcel1.setCandidateNo("2110**m0002");
examScoreExcel1.setLearnGrade(88);
list.add(examScoreExcel1);
// ExcelUtil.export(response, "实操成绩数据模板", "实操成绩数据表", list, ExamScoreExcel.class);
@@ -329,7 +336,7 @@
try {
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding(org.apache.commons.codec.Charsets.UTF_8.name());
- fileName = URLEncoder.encode("实操成绩数据模板", Charsets.UTF_8.name());
+ fileName = URLEncoder.encode("实操成绩数据模板"+ DateUtil.time(), Charsets.UTF_8.name());
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
//修改单元格格式为文本格式
EasyExcel.write(response.getOutputStream(), ExamScoreExcel.class).sheet("实操成绩数据表").registerWriteHandler(new RowWriteHandler()).doWrite(list);
@@ -423,9 +430,8 @@
//按条件查询成绩数据
List<ExportExamScoreExcel> examScoreExcels = examScoreService.exportExamScoreList(examScoreVO);
//导出成绩集合数据
- ExcelUtil.export(response, "成绩数据", "成绩数据表", examScoreExcels, ExportExamScoreExcel.class);
+ ExcelUtil.export(response, "成绩数据"+DateUtil.time(), "成绩数据表", examScoreExcels, ExportExamScoreExcel.class);
}
-
/**
* 考试成绩恢复状态重置（重考）
--
Gitblit v1.9.3