From 08363052cecb30230a2c8b3eba791ca8d1be00a5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 15:32:38 +0800
Subject: [PATCH] 二维码生成地址修改，保安证编码生成修改
---
src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java | 100 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 87 insertions(+), 13 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 4eb7edc..7338d8e 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;
@@ -53,6 +58,8 @@
private final TrainingRegistrationService trainingRegistrationService;
+ private final IRoleService roleService;
+
/**
* 自定义分页数据
* @param page 分页条件
@@ -61,6 +68,14 @@
*/
@Override
public IPage<ExamScoreVO> selectExamScorePage(IPage<ExamScoreVO> page, ExamScoreVO examScore) {
+ if (null!=examScore.getExamType()){
+ if (examScore.getExamType()==1){
+ return page.setRecords(baseMapper.selectExamScorePage(page, examScore));
+ }
+ if (examScore.getExamType()==2){
+ return page.setRecords(baseMapper.selectTrainExamScorePage(page, examScore));
+ }
+ }
return page.setRecords(baseMapper.selectExamScorePage(page, examScore));
}
@@ -128,16 +143,29 @@
//获取考试信息
ExamPaper paper = examPaperService.getById(examScore.getPapersId());
int age = 0;
+ UserVO user = new UserVO();
//使用准考证号查询报名信息，修改考试状态为已考试
if(paper.getExamType()==1){
Apply apply = new Apply();
apply.setCandidateNo(examScore.getCandidateNo());
Apply apply1 = applyService.getOne(Condition.getQueryWrapper(apply));
//查询用户年龄，根据年龄计算总分
- age = userService.getUserAgeById(apply1.getUserId()).getAge();
+ user = userService.getUserAgeById(apply1.getUserId());
+ //修改用户的考试状态,理论考试结束
+ user.setIsApply(3);
+ userService.updateById(user);
+ age = user.getAge();
//修改为已考试
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){
@@ -145,12 +173,21 @@
trainingRegistration.setCandidateNo(examScore.getCandidateNo());
TrainingRegistration trainingRegistration1 = trainingRegistrationService.getOne(Condition.getQueryWrapper(trainingRegistration));
//查询用户年龄，根据年龄计算总分
- age = userService.getUserAgeById(Long.parseLong(trainingRegistration1.getUserId())).getAge();
+ user = userService.getUserAgeById(Long.parseLong(trainingRegistration1.getUserId()));
+ //修改用户的培训状态,理论考试结束
+ user.setIsTrain(3);
+ age = user.getAge();
+ userService.updateById(user);
//修改为已考试
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
examScore.setExamId(examScore.getPapersId().toString());
@@ -161,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){
@@ -169,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){
//返回结果
@@ -206,7 +251,6 @@
//正式考试通过生成保安证编号
if (examPaper.getExamType()==1) {
//去生成保安证编号
-
String pre = SecurityPaperUtil.getSecurityPaper();
//查询当前年份已有的保安证编号
int count = userService.getSecurityPaperCount(pre);
@@ -216,11 +260,29 @@
} else {
//格式化
DecimalFormat decimalFormat = new DecimalFormat("00000");
- result = pre + (decimalFormat.format(count++));
+ count++;
+ System.out.println("count = " + count);
+ 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 hold = " + "'" + user.getHold() + "'" +
+ ",securitynumber = " + "'" + user.getSecuritynumber() + "'" +
+ ",paper_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime()) + "'" +
+ " " +"where id = " + "'" + user.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
}
} else {
//不合格
@@ -231,9 +293,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);
}
@@ -243,7 +313,11 @@
}
@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);
+ }
+ @Override
+ public List<Map<String, Object>> scoreStatisticssc(String deptid,String jurisdiction) {
+ return baseMapper.scoreStatisticssc(deptid,jurisdiction);
}
}
--
Gitblit v1.9.3