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/controller/ExamScoreController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 8d3baad..6f7db62 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -81,8 +81,8 @@
Long sid = examScore.getId();
String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examScore.getExamTime());
String s = "insert into exam_score(id,exam_time) " +
- "values(" + "'" + sid + "'" + "," + "'" +
- format + "'" + "," + "'" + ")";
+ "values(" + "'" + sid + "'" +
+ "," + "'" +format + "'" + ")";
FtpUtil.sqlFileUpload(s);
//返回
return R.status(save);
@@ -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