From 8c28e0e9d71b84eb18a3b40a9afc46ab50269aa2 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 27 Aug 2021 21:08:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 8d3baad..388224e 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);
@@ -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