From 2b5ca6cea92ff6a67582c3331a0704480e63b9b4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 02 Sep 2021 11:28:17 +0800
Subject: [PATCH] 1.正式考试，模拟考试考试申请接口修改 2.用户头像批量上传（压缩zip 包上传） 3.通知公告接口修改
---
src/main/java/org/springblade/modules/apply/controller/ApplyController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
index 1e93222..3055948 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -603,13 +603,14 @@
/**
- * 生成试卷,报名
+ * 生成考试,报名
* @param ids 报名ids
*/
@PostMapping("/batchExam")
public R batchExam(@RequestParam String ids,
String examTime,
@RequestParam Date startTime,
+ @RequestParam Integer number,
Date endTime){
if (!ids.equals("")){
List<String> list = Arrays.asList(ids.split(","));
@@ -653,7 +654,7 @@
}else {
//查询已报名未关联试卷的人员
- List<Long> applyIds = applyService.getApplyIds();
+ List<Long> applyIds = applyService.getApplyIds(number);
if (applyIds.size()>0){
//生成考试
ExamPaper examPaper = new ExamPaper();
@@ -738,13 +739,13 @@
//内网同步
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,user_id,exam_id,apply_id) " +
- "values(" + "'" + sid + "'" + "," + "'" +
- format + "'" + "," + "'" +
- examScore.getUserId() +"'" + "," +"'" +
- examScore.getExamId() +"'" + "," +"'" +
- examScore.getApplyId() + "'" + ")";
- FtpUtil.sqlFileUpload(s);
+// String s = "insert into exam_score(id,exam_time,user_id,exam_id,apply_id) " +
+// "values(" + "'" + sid + "'" + "," + "'" +
+// format + "'" + "," + "'" +
+// examScore.getUserId() +"'" + "," +"'" +
+// examScore.getExamId() +"'" + "," +"'" +
+// examScore.getApplyId() + "'" + ")";
+// FtpUtil.sqlFileUpload(s);
return examScore;
}
--
Gitblit v1.9.3