From 5cceb01ea15fa807ebe0011c5b38780cb3e3e2c3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 12 Nov 2021 23:50:26 +0800
Subject: [PATCH] 部门数菜单修改，考试审核修改
---
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 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 beab64e..bcaf81c 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,7 +8,6 @@
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;
@@ -26,9 +24,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 +34,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.*;
@@ -155,12 +150,19 @@
ExamScore examScore1 = examScoreService.getById(examScore.getId());
//查询当前保安信息
UserVO user = userService.getUserAgeById(Long.parseLong(examScore1.getUserId()));
+ //再根据身份证号查询用户,方式用户考了试，被删除，又新建的情况,修改最新用户的状态信息
+ User user1 = userService.getUserInfoByIdCardNo(user.getCardid());
+ //考试合格
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().equals("")) {
//去生成保安证编号
String pre = SecurityPaperUtil.getSecurityPaper();
//查询当前年份已有的保安证编号
@@ -174,37 +176,45 @@
max++;
result = pre + (decimalFormat.format(max));
}
- user.setSecuritynumber(result);
+ user1.setSecuritynumber(result);
//发证日期
- user.setPaperTime(new Date());
+// user1.setPaperTime(new Date());
//修改为持证保安
- user.setHold("1");
+ user1.setHold("1");
//分配保安角色
// Role role = new Role();
// role.setRoleAlias("保安");
// Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
// user.setRoleId(oneRole.getId().toString());
//更新保安数据
- userService.updateById(user);
+ userService.updateById(user1);
String s1 =
- "update blade_user set hold = " + "'" + user.getHold() + "'" +
- ",securitynumber = " + "'" + user.getSecuritynumber() + "'" +
- ",paper_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime()) + "'" +
- " " + "where id = " + "'" + user.getId() + "'";
+ "update blade_user set hold = " + "'" + user1.getHold() + "'" +
+ ",securitynumber = " + "'" + user1.getSecuritynumber() + "'" +
+ ",user_type = " + "'" + user1.getUserType() + "'" +
+ " " + "where id = " + "'" + user1.getId() + "'";
FtpUtil.sqlFileUpload(s1);
-// }
+ }
} else {
//不合格
examScore.setQualified(1);
}
//总成绩
if (user.getAge() <= 50) {
- examScore.setAllGrade(Math.round((examScore.getLearnGrade() + examScore1.getTheoryGrade()) / 2));
+ if (null!=examScore1.getTheoryGrade()) {
+ examScore.setAllGrade(Math.round((examScore.getLearnGrade() + examScore1.getTheoryGrade()) / 2));
+ }else {
+ examScore.setAllGrade(Math.round(examScore.getLearnGrade()/2));
+ }
}
if (user.getAge() > 50) {
- examScore.setAllGrade(Integer.parseInt(String.valueOf(Math.round(examScore1.getTheoryGrade() * 0.5)))
- + Integer.parseInt(String.valueOf(Math.round(examScore1.getLearnGrade() * 0.5))));
+ if (null!=examScore1.getTheoryGrade()) {
+ examScore.setAllGrade(Integer.parseInt(String.valueOf(Math.round(examScore1.getTheoryGrade() * 0.5)))
+ + Integer.parseInt(String.valueOf(Math.round(examScore.getLearnGrade() * 0.5))));
+ }else {
+ examScore.setAllGrade(Math.round(examScore.getLearnGrade()/2));
+ }
}
}
//内网同步
@@ -214,7 +224,6 @@
",qualified = " + "'" + examScore.getQualified() + "'" +
" " + "where id = " + "'" + examScore.getId() + "'";
FtpUtil.sqlFileUpload(s1);
-
//本地修改
return R.status(examScoreService.updateById(examScore));
@@ -413,7 +422,6 @@
//导出成绩集合数据
ExcelUtil.export(response, "成绩数据", "成绩数据表", examScoreExcels, ExportExamScoreExcel.class);
}
-
/**
* 考试成绩恢复状态重置（重考）
--
Gitblit v1.9.3