Merge remote-tracking branch 'origin/xjw' into xjw

src/main/java/edu/nju/controller/ExtraController.java

@@ -473,7 +473,7 @@ public class ExtraController {
 			Task task=extraService.saveTask(id);
 			if(task!=null) {
 				result.put("status", 200);
-				result.put("result",task);
+				result.put("result",new JSONObject(task));
 			}
 			else { result.put("status", 500); }
 			out.print(result);

src/main/java/edu/nju/controller/ReportController.java

@@ -40,7 +40,7 @@ public class ReportController {
 	AnalyzeService aservice;
 	
 	//获取用户的有效信息
-	@AuthRequired
+//	@AuthRequired
 	@RequestMapping(value = "/report")
 	@ResponseBody
 	public void getReport(String report_id, String case_take_id, HttpServletResponse response) {
@@ -60,6 +60,7 @@ public class ReportController {
 		}
 	}
 
+//	@AuthRequired
 	@RequestMapping(value = "/reportReview")
 	@ResponseBody
 	public void getReportReview(String report_id, String case_take_id, HttpServletResponse response) {

src/main/java/edu/nju/entities/ReviewCorrectAnswer.java

@@ -2,6 +2,7 @@ package edu.nju.entities;
 
 
 import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.PersistenceConstructor;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.util.List;
@@ -28,6 +29,7 @@ public class ReviewCorrectAnswer implements java.io.Serializable{
 
     private String grade;
 
+    @PersistenceConstructor
     public ReviewCorrectAnswer(String item_id, String report_id, List<String> correct_answer, String job_id, String paper_id, List<String> file_url, String grade) {
         this.item_id = item_id;
         this.report_id = report_id;
@@ -38,6 +40,7 @@ public class ReviewCorrectAnswer implements java.io.Serializable{
         this.grade = grade;
     }
 
+    @PersistenceConstructor
     public ReviewCorrectAnswer(String item_id, String report_id, String job_id, String paper_id) {
         this.item_id = item_id;
         this.report_id = report_id;