xiatian 1 anno fa
parent
commit
b5286e92b8

+ 9 - 16
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/ScoreVerifyController.java

@@ -184,32 +184,25 @@ public class ScoreVerifyController extends BaseExamController {
     
     @ResponseBody
     @RequestMapping(value = "needverify", method = RequestMethod.POST)
-    public List<Integer> needVerify(HttpServletRequest request) {
+    public JSONObject needVerify(HttpServletRequest request) {
     	Integer examId = getSessionExamId(request);
 		WebUser wu = RequestUtils.getWebUser(request);
-		List<Integer> ret=new ArrayList<>();
+		JSONObject ret = new JSONObject();
+        Exam exam = examService.findById(examId);
+        ret.accumulate("examType", exam.getType());
+        ret.accumulate("fileServer", fileService.getFileServer());
 		if(!scoreVerifyService.existByExamIdAndUserId(examId,wu.getId())) {
     		return ret;
     	}
-		List<ScoreVerifyVo> list = scoreVerifyService.needVerify(examId,wu.getId());
-		if(list==null||list.size()==0) {
+		List<ScoreVerifyVo> temlist = scoreVerifyService.needVerify(examId,wu.getId());
+		if(temlist==null||temlist.size()==0) {
 			return ret;
 		}
-		ret=list.stream().map(e->e.getStudentId()).collect(Collectors.toList());
+		List<Integer> list=temlist.stream().map(e->e.getStudentId()).collect(Collectors.toList());
+		ret.accumulate("studentIds", list);
 		return ret;
     }
     
-    @RequestMapping("settings")
-    @ResponseBody
-    public JSONObject settings(HttpServletRequest request) {
-        int examId = getSessionExamId(request);
-        JSONObject setting = new JSONObject();
-        Exam exam = examService.findById(examId);
-        setting.accumulate("examType", exam.getType());
-        setting.accumulate("fileServer", fileService.getFileServer());
-        return setting;
-    }
-    
     @RequestMapping("info")
     @ResponseBody
     public ScoreVerifyInfo info(HttpServletRequest request, @RequestParam Integer studentId) {