From 839cd39a9cfc49e5eaf73739549cf3f9e2725666 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 26 Oct 2021 21:56:24 +0800
Subject: [PATCH] 1.现场检查接口修改 2.车辆位置新增接口 3.成绩导出接口修改 4.公司信息接口修改，新增创建时间和创建人
---
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 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..f3a1e4b 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -155,12 +155,17 @@
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);
//正式考试通过生成保安证编号
ExamPaper paper = examPaperService.getById(examScore.getExamId());
// if (paper.getExamType() == 1) {
+ //如果已有保安证编号，不更新用户信息
+ if (null==user1.getSecuritynumber() || user1.getSecuritynumber()=="") {
//去生成保安证编号
String pre = SecurityPaperUtil.getSecurityPaper();
//查询当前年份已有的保安证编号
@@ -174,37 +179,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() + "'" +
+ ",paper_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(user1.getPaperTime()) + "'" +
+ " " + "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 +227,6 @@
",qualified = " + "'" + examScore.getQualified() + "'" +
" " + "where id = " + "'" + examScore.getId() + "'";
FtpUtil.sqlFileUpload(s1);
-
//本地修改
return R.status(examScoreService.updateById(examScore));
--
Gitblit v1.9.3