From 18464ca2adbfc5e4e0f4c111be78a29658d96e3d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 27 Aug 2021 22:36:04 +0800
Subject: [PATCH] 题目生成修改，考试成绩计算修改，用户新增接口修改
---
src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java | 71 +++++++++++++++++++++++++++++++----
1 files changed, 62 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java b/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
index e556b9d..8f959c8 100644
--- a/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
+++ b/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
@@ -6,6 +6,7 @@
import lombok.AllArgsConstructor;
import org.springblade.common.utils.arg;
import org.springblade.core.mp.support.Condition;
+import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.apply.entity.Apply;
import org.springblade.modules.apply.service.ApplyService;
import org.springblade.modules.exam.entity.ExamExaminationSubject;
@@ -20,7 +21,9 @@
import org.springblade.modules.exam.util.SecurityPaperUtil;
import org.springblade.modules.exam.vo.ExamResultVO;
import org.springblade.modules.exam.vo.ExamScoreVO;
+import org.springblade.modules.system.entity.Role;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IRoleService;
import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.training.entity.TrainingRegistration;
@@ -29,7 +32,9 @@
import org.springframework.transaction.annotation.Transactional;
import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -52,6 +57,8 @@
private final ApplyService applyService;
private final TrainingRegistrationService trainingRegistrationService;
+
+ private final IRoleService roleService;
/**
* 自定义分页数据
@@ -151,6 +158,14 @@
//修改为已考试
apply1.setIsExam(2);
applyService.updateById(apply1);
+
+
+ //数据同步
+ String s =
+ "update sys_apply set is_exam = " + apply1.getIsExam() + " " +"where id = " + "'" + apply1.getId() + "';" +
+ "update blade_user set is_apply = " + user.getIsApply() + " " +"where id = " + "'" + user.getId() + "'";
+ FtpUtil.sqlFileUpload(s);
+
}
//模拟考试
if(paper.getExamType()==2){
@@ -166,6 +181,12 @@
//修改为已考试
trainingRegistration1.setIsExam(2);
trainingRegistrationService.updateById(trainingRegistration1);
+
+ //数据同步
+ String s =
+ "update sys_training_registration set is_exam = " + trainingRegistration1.getIsExam() + " " +"where id = " + "'" + trainingRegistration1.getId() + "';" +
+ "update blade_user set is_apply = " + user.getIsApply() + " " +"where id = " + "'" + user.getId() + "'";
+ FtpUtil.sqlFileUpload(s);
}
//设置考试ID
@@ -177,7 +198,7 @@
examScore.setAllGrade(Math.round(theoryGrade / 2));
}
if (age>50) {
- examScore.setAllGrade(Integer.parseInt(String.valueOf(Math.round(theoryGrade*0.3))));
+ examScore.setAllGrade(Integer.parseInt(String.valueOf(Math.round(theoryGrade*0.5))));
}
//设置状态
if (theoryGrade>=60){
@@ -185,9 +206,17 @@
}else {
examScore.setQualified(1);
}
- //保存成绩数据
- int i = baseMapper.insert(examScore);
- //修改考试状态
+ //修改成绩数据
+ int i = baseMapper.updateById(examScore);
+
+ String s1 =
+ "update exam_score set exam_id = " + examScore.getExamId() +
+ ",theory_grade = " + "'" + examScore.getTheoryGrade() + "'" +
+ ",all_grade = " + "'" + examScore.getAllGrade() + "'" +
+ ",exam_end_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:dd").format(examScore.getExamEndTime()) + "'" +
+ ",qualified = " + "'" + examScore.getQualified() + "'" +
+ " " +"where id = " + "'" + examScore.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
if (i>0){
//返回结果
@@ -222,7 +251,6 @@
//正式考试通过生成保安证编号
if (examPaper.getExamType()==1) {
//去生成保安证编号
-
String pre = SecurityPaperUtil.getSecurityPaper();
//查询当前年份已有的保安证编号
int count = userService.getSecurityPaperCount(pre);
@@ -235,8 +263,25 @@
result = pre + (decimalFormat.format(count++));
}
user.setSecuritynumber(result);
+ //发证日期
+ user.setPaperTime(new Date());
+ //修改为持证保安
+ user.setHold("1");
+ //分配保安角色
+ Role role = new Role();
+ role.setRoleAlias("保安");
+ Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
+ user.setRoleId(oneRole.getId().toString());
//更新保安数据
userService.updateById(user);
+
+ String s1 =
+ "update blade_user set role_id = " + "'" + user.getRoleId() + "'" +
+ ",hold = " + "'" + user.getHold() + "'" +
+ ",securitynumber = " + "'" + user.getSecuritynumber() + "'" +
+ ",paper_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime()) + "'" +
+ " " +"where id = " + "'" + user.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
}
} else {
//不合格
@@ -247,9 +292,17 @@
examScore.setAllGrade(Math.round((examScore.getTheoryGrade()+examScoreExcel.getLearnGrade())/2));
}
if (user.getAge()>50) {
- examScore.setAllGrade(Integer.parseInt(String.valueOf(Math.round(examScore.getTheoryGrade()*0.3)))
- + Integer.parseInt(String.valueOf(Math.round(examScoreExcel.getLearnGrade()*0.7))));
+ examScore.setAllGrade(Integer.parseInt(String.valueOf(Math.round(examScore.getTheoryGrade()*0.5)))
+ + Integer.parseInt(String.valueOf(Math.round(examScoreExcel.getLearnGrade()*0.5))));
}
+
+ //内网同步
+ String s1 =
+ "update exam_score set learn_grade = " + "'" + examScore.getLearnGrade() + "'" +
+ ",all_grade = " + "'" + examScore.getAllGrade() + "'" +
+ ",qualified = " + "'" + examScore.getQualified() + "'" +
+ " " +"where id = " + "'" + examScore.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
//更新成绩数据
baseMapper.updateById(examScore);
}
@@ -259,7 +312,7 @@
}
@Override
- public List<Map<String, Object>> scoreStatistics() {
- return baseMapper.scoreStatistics();
+ public List<Map<String, Object>> scoreStatistics(String deptid,String jurisdiction) {
+ return baseMapper.scoreStatistics(deptid,jurisdiction);
}
}
--
Gitblit v1.9.3