From 084df211271b476c5d285e704e4b32f0ffb5fbe7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 27 Aug 2021 23:52:58 +0800
Subject: [PATCH] 辖区接口修改，成绩计算修改，导入密码取身份证后6位
---
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 067fc26..6f7db62 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -167,8 +167,8 @@
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))));
+ examScore.setAllGrade(Integer.parseInt(String.valueOf(Math.round(examScore1.getTheoryGrade()*0.5)))
+ + Integer.parseInt(String.valueOf(Math.round(examScore1.getLearnGrade()*0.5))));
}
}
//内网同步
@@ -265,7 +265,7 @@
*/
@GetMapping("score-statistics")
@ApiOperation(value = "分数统计")
- public R<List> scoreStatistics(HttpServletResponse response) {
- return R.data(examScoreService.scoreStatistics());
+ public R<List> scoreStatistics(HttpServletResponse response,String deptid,String jurisdiction) {
+ return R.data(examScoreService.scoreStatistics(deptid,jurisdiction));
}
}
--
Gitblit v1.9.3