考试相关

src/main/java/com/peanut/modules/common/controller/ClassController.java

@@ -12,7 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
 import java.util.List;
 import java.util.Map;
 
@@ -155,6 +154,20 @@ public class ClassController {
         return R.ok();
     }
 
+    //删除任务
+    @RequestMapping("/delClassTask")
+    public R delClassTask(@RequestBody Map<String,Object> params){
+        classEntityService.delClassTask(params);
+        return R.ok();
+    }
+
+    //生成班级任务
+    @RequestMapping("/generateClassTask")
+    public R generateClassTask(@RequestBody Map<String,Object> params){
+        classEntityService.generateClassTask(params);
+        return R.ok();
+    }
+
     //获取班级任务列表
     @RequestMapping("/getClassTaskList")
     public R getClassTaskList(@RequestBody Map<String,Object> params){
@@ -224,13 +237,6 @@ public class ClassController {
         return R.ok();
     }
 
-    //生成成绩
-    @RequestMapping("/generateScore")
-    public R generateScore(@RequestBody Map<String,Object> params){
-        classEntityService.generateScore(params);
-        return R.ok();
-    }
-
     //编辑作业
     @RequestMapping("/editClassTaskAndQuesReply")
     public R editClassTaskAndQuesReply(@RequestBody ClassTaskAndQuesReply classTaskAndQuesReply){

src/main/java/com/peanut/modules/common/controller/ClassExamController.java

@@ -24,7 +24,7 @@ public class ClassExamController {
 
     //导入考试题
     @RequestMapping("/importSubject")
-    public R importSubject(@RequestParam("file") MultipartFile file, @RequestParam("courseId") String courseId) {
+    public R importSubject(@RequestParam("file") MultipartFile file, @RequestParam("courseId") int courseId) {
         String res = classExamService.importSubject(file,courseId);
         if (res==null){
             return R.ok();
@@ -62,61 +62,49 @@ public class ClassExamController {
     //添加题目
     @RequestMapping("/addClassExamSubject")
     public R addClassExamSubject(@RequestBody ClassExamSubject classExamSubject){
-        if (classExamService.addClassExamSubject(classExamSubject)>0){
-            return R.ok();
-        }else {
-            return R.error();
-        }
+        classExamService.addClassExamSubject(classExamSubject);
+        return R.ok();
     }
 
     //添加选项
     @RequestMapping("/addClassExamOption")
     public R addClassExamOption(@RequestBody ClassExamOption classExamOption){
-        if (classExamService.addClassExamOption(classExamOption)>0){
-            return R.ok();
-        }else {
-            return R.error();
-        }
+        classExamService.addClassExamOption(classExamOption);
+        return R.ok();
+    }
+
+    //题目详情
+    @RequestMapping("/classExamSubjectInfo")
+    public R classExamSubjectInfo(@RequestBody Map<String,Object> params){
+        return R.ok().put("classExamSubjectInfo",classExamService.classExamSubjectInfo(params));
     }
 
     //修改题目
     @RequestMapping("/updateClassExamSubject")
     public R updateClassExamSubject(@RequestBody ClassExamSubject classExamSubject){
-        if (classExamService.updateClassExamSubject(classExamSubject)>0){
-            return R.ok();
-        }else {
-            return R.error();
-        }
+        classExamService.updateClassExamSubject(classExamSubject);
+        return R.ok();
     }
 
     //修改选项
     @RequestMapping("/updateClassExamOption")
     public R updateClassExamOption(@RequestBody ClassExamOption classExamOption){
-        if (classExamService.updateClassExamOption(classExamOption)>0){
-            return R.ok();
-        }else {
-            return R.error();
-        }
+        classExamService.updateClassExamOption(classExamOption);
+        return R.ok();
     }
 
     //删除题目
     @RequestMapping("/delClassExamSubject")
     public R delClassExamSubject(@RequestBody Map<String,Object> params){
-        if (classExamService.delClassExamSubject(params)>0){
-            return R.ok();
-        }else {
-            return R.error();
-        }
+        classExamService.delClassExamSubject(params);
+        return R.ok();
     }
 
     //删除选项
     @RequestMapping("/delClassExamOption")
     public R delClassExamOption(@RequestBody Map<String,Object> params){
-        if (classExamService.delClassExamOption(params)>0){
-            return R.ok();
-        }else {
-            return R.error();
-        }
+        classExamService.delClassExamOption(params);
+        return R.ok();
     }
 
 }