From 6ee55849eac9cd9d9183d155e80ebd454115a0c3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 17 Aug 2021 10:28:11 +0800
Subject: [PATCH] 根据userID 查詢年齡，分數計算修改，年齡大於50岁的理论30%，实操70%，小于50岁的总分按理论实操各50%计算
---
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 abbff05..e967e37 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -20,6 +20,7 @@
import org.springblade.modules.exam.vo.ExamScoreVO;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.vo.UserVO;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
@@ -102,6 +103,8 @@
public R updateExamScore(@RequestBody ExamScore examScore){
if (null!=examScore.getLearnGrade() && null!=examScore.getTheoryGrade()){
ExamScore examScore1 = examScoreService.getById(examScore.getId());
+ //查询当前保安信息
+ UserVO user = userService.getUserAgeById(Long.parseLong(examScore1.getUserId()));
if (examScore.getTheoryGrade()>=60 && examScore.getLearnGrade()>=60){
//合格
examScore.setQualified(0);
@@ -109,8 +112,6 @@
ExamPaper paper = examPaperService.getById(examScore.getExamId());
if (paper.getExamType()==1) {
//去生成保安证编号
- //查询当前保安信息
- User user = userService.getById(examScore1.getUserId());
String pre = SecurityPaperUtil.getSecurityPaper();
//查询当前年份已有的保安证编号
int count = userService.getSecurityPaperCount(pre);
@@ -131,10 +132,14 @@
examScore.setQualified(1);
}
//总成绩
- examScore.setAllGrade(Math.round((examScore.getLearnGrade()+examScore1.getTheoryGrade())/2));
+ if (user.getAge()<=50) {
+ examScore.setAllGrade(Math.round((examScore.getLearnGrade() + examScore1.getTheoryGrade()) / 2));
+ }
+ if (user.getAge()>50) {
+ examScore.setAllGrade(Integer.parseInt(String.valueOf(Math.round(examScore1.getTheoryGrade()*0.3)))
+ + Integer.parseInt(String.valueOf(Math.round(examScore1.getLearnGrade()*0.7))));
+ }
}
- //内网修改
- //arg.test01(arg.url+"/examScore/update",examScore);
//本地修改
return R.status(examScoreService.updateById(examScore));
}
--
Gitblit v1.9.3