xiatian пре 1 година
родитељ
комит
b5df4c9272

+ 26 - 0
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/bean/ScoreVerifyInfo.java

@@ -0,0 +1,26 @@
+package cn.com.qmth.stmms.biz.exam.bean;
+
+import cn.com.qmth.stmms.biz.mark.model.Task;
+
+public class ScoreVerifyInfo {
+
+	private Task task;
+	private Boolean flagged;
+
+	public Boolean getFlagged() {
+		return flagged;
+	}
+
+	public void setFlagged(Boolean flagged) {
+		this.flagged = flagged;
+	}
+
+	public Task getTask() {
+		return task;
+	}
+
+	public void setTask(Task task) {
+		this.task = task;
+	}
+
+}

+ 4 - 0
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/ScoreVerifyDetailService.java

@@ -1,7 +1,11 @@
 package cn.com.qmth.stmms.biz.exam.service;
 
+import cn.com.qmth.stmms.biz.exam.model.ScoreVerifyDetail;
+
 public interface ScoreVerifyDetailService {
 
 	void tag(Integer userId,Integer scoreVerifyId, Integer studentId, boolean isTag);
 
+	ScoreVerifyDetail findByScoreVerifyIdAndStudentId(Integer scoreVerifyId, Integer studentId);
+
 }

+ 5 - 0
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/ScoreVerifyDetailServiceImpl.java

@@ -28,5 +28,10 @@ public class ScoreVerifyDetailServiceImpl extends BaseQueryService<ScoreVerifyDe
 		scoreVerifyDetailDao.save(sd);
 		studentService.scoreVerifyTag(userId, studentId, isTag);
 	}
+	
+	@Override
+	public ScoreVerifyDetail findByScoreVerifyIdAndStudentId(Integer scoreVerifyId, Integer studentId) {
+		return scoreVerifyDetailDao.findByScoreVerifyIdAndStudentId(scoreVerifyId,studentId);
+	}
 
 }

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

@@ -18,10 +18,12 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import cn.com.qmth.stmms.biz.exam.bean.ScoreVerifyInfo;
 import cn.com.qmth.stmms.biz.exam.bean.ScoreVerifyVo;
 import cn.com.qmth.stmms.biz.exam.model.Exam;
 import cn.com.qmth.stmms.biz.exam.model.ExamStudent;
 import cn.com.qmth.stmms.biz.exam.model.ScoreVerify;
+import cn.com.qmth.stmms.biz.exam.model.ScoreVerifyDetail;
 import cn.com.qmth.stmms.biz.exam.query.ScoreVerifyQuery;
 import cn.com.qmth.stmms.biz.exam.service.ExamService;
 import cn.com.qmth.stmms.biz.exam.service.ExamStudentService;
@@ -212,17 +214,20 @@ public class ScoreVerifyController extends BaseExamController {
     
     @RequestMapping("info")
     @ResponseBody
-    public Task info(HttpServletRequest request, @RequestParam Integer studentId) {
+    public ScoreVerifyInfo info(HttpServletRequest request, @RequestParam Integer studentId) {
         ExamStudent student = studentService.findById(studentId);
-        Task task = null;
+        ScoreVerifyInfo info = new ScoreVerifyInfo();
         if (student != null) {
-            task = taskService.build(student);
+            Task task = taskService.build(student);
+            info.setTask(task);
             int examId = getSessionExamId(request);
             WebUser wu = RequestUtils.getWebUser(request);
             ScoreVerify sv=scoreVerifyService.findByExamIdAndUserId(examId,wu.getId());
             scoreVerifyDetailService.tag(wu.getId(),sv.getId(),studentId,false);
+            ScoreVerifyDetail sd=scoreVerifyDetailService.findByScoreVerifyIdAndStudentId(sv.getId(), studentId);
+            info.setFlagged(sd.getFlagged());
         }
-        return task;
+        return info;
     }
     
     @RequestMapping("tag")