xiatian 1 yıl önce
ebeveyn
işleme
cb1bd17647

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

@@ -6,6 +6,7 @@ public class ScoreVerifyInfo {
 
 	private Task task;
 	private Boolean flagged;
+	private String paperUrl;
 
 	public Boolean getFlagged() {
 		return flagged;
@@ -23,4 +24,12 @@ public class ScoreVerifyInfo {
 		this.task = task;
 	}
 
+	public String getPaperUrl() {
+		return paperUrl;
+	}
+
+	public void setPaperUrl(String paperUrl) {
+		this.paperUrl = paperUrl;
+	}
+
 }

+ 3 - 3
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/bean/ScoreVerifyVo.java

@@ -40,7 +40,7 @@ public class ScoreVerifyVo {
 	private String answerUrl;
 	private String examNumber;
 	private Integer sheetCount;
-	private boolean breach;
+	private Boolean breach;
     private Double subjectScore;
 
 	public String getSheetUrlString() {
@@ -236,11 +236,11 @@ public class ScoreVerifyVo {
 		this.sheetCount = sheetCount;
 	}
 
-	public boolean isBreach() {
+	public Boolean getBreach() {
 		return breach;
 	}
 
-	public void setBreach(boolean breach) {
+	public void setBreach(Boolean breach) {
 		this.breach = breach;
 	}
 

+ 6 - 6
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/ScoreVerifyServiceImpl.java

@@ -60,7 +60,7 @@ public class ScoreVerifyServiceImpl extends BaseQueryService<ScoreVerify> implem
 		sql.append(
 				" t.is_upload upload,t.is_breach breach,t.is_absent absent,t.subjective_score subjectiveScore,t.subjective_score_list subjectiveScoreList,t.objective_score objectiveScore, ");
 		sql.append(" u.name scoreVerifyUserName,t.score_verify_time scoreVerifyTime,sub.total_score subjectScore");
-		sql.append(" from eb_score_verify r left join eb_exam_student t on r.student_id=t.id ");
+		sql.append(" from eb_score_verify r inner join eb_exam_student t on r.student_id=t.id ");
 		sql.append(" left join eb_exam_subject sub on t.exam_id=sub.exam_id and t.subject_code=sub.code");
 		sql.append(" left join b_user u on t.score_verify_user=u.id where r.exam_id=" + req.getExamId()+" and r.user_id="+req.getUserId());
 		sql.append(" order by t.student_code,t.subject_code ");
@@ -81,7 +81,7 @@ public class ScoreVerifyServiceImpl extends BaseQueryService<ScoreVerify> implem
 		StringBuilder sql = new StringBuilder();
 		sql.append("select count(1) ");
 		sql.append(
-				"from eb_score_verify t where t.exam_id=" + examId+" and t.user_id="+userId + " and t.viewed =0 ");
+				"from eb_score_verify t inner join eb_exam_student s on t.student_id=s.id  where t.exam_id=" + examId+" and t.user_id="+userId + " and t.viewed =0 ");
 		Query query = entityManager.createNativeQuery(sql.toString());
 		return Integer.valueOf(query.getResultList().get(0).toString());
 	}
@@ -90,7 +90,7 @@ public class ScoreVerifyServiceImpl extends BaseQueryService<ScoreVerify> implem
 	public Integer countByQuery(Integer examId, Integer userId) {
 		StringBuilder sql = new StringBuilder();
 		sql.append("select count(1) ");
-		sql.append("from eb_score_verify t where t.exam_id=" + examId+" and t.user_id="+userId);
+		sql.append("from eb_score_verify t inner join eb_exam_student s on t.student_id=s.id where t.exam_id=" + examId+" and t.user_id="+userId);
 		Query query = entityManager.createNativeQuery(sql.toString());
 		return Integer.valueOf(query.getResultList().get(0).toString());
 	}
@@ -99,7 +99,7 @@ public class ScoreVerifyServiceImpl extends BaseQueryService<ScoreVerify> implem
 	@Override
 	public Boolean existByExamIdAndUserId(Integer examId, Integer userId) {
 		StringBuilder sql = new StringBuilder();
-		sql.append(" select r.id from eb_score_verify r where r.exam_id=" + examId+" and r.user_id="+userId);
+		sql.append(" select r.id from eb_score_verify r inner join eb_exam_student s on r.student_id=s.id where r.exam_id=" + examId+" and r.user_id="+userId);
 		sql.append(" limit 1");
 		Query query = entityManager.createNativeQuery(sql.toString());
 		List<ScoreVerify> ret = query.getResultList();
@@ -274,7 +274,7 @@ public class ScoreVerifyServiceImpl extends BaseQueryService<ScoreVerify> implem
 		sql.append(
 				" t.is_upload upload,t.is_absent absent,t.subjective_score subjectiveScore,t.subjective_score_list subjectiveScoreList,t.objective_score objectiveScore, ");
 		sql.append(" u.name scoreVerifyUserName,t.score_verify_time scoreVerifyTime ");
-		sql.append(" from eb_score_verify r left join eb_exam_student t on r.student_id=t.id ");
+		sql.append(" from eb_score_verify r inner join eb_exam_student t on r.student_id=t.id ");
 		sql.append(" left join b_user u on t.score_verify_user=u.id where  r.exam_id=" + examId+" and r.user_id="+userId
 				+ " and t.score_verify_flagged =1 ");
 		sql.append(" order by t.student_code,t.subject_code ");
@@ -298,7 +298,7 @@ public class ScoreVerifyServiceImpl extends BaseQueryService<ScoreVerify> implem
 		sql.append(
 				" t.is_upload upload,t.is_absent absent,t.subjective_score subjectiveScore,t.subjective_score_list subjectiveScoreList,t.objective_score objectiveScore, ");
 		sql.append(" u.name scoreVerifyUserName,t.score_verify_time scoreVerifyTime ");
-		sql.append(" from eb_score_verify r left join eb_exam_student t on r.student_id=t.id ");
+		sql.append(" from eb_score_verify r inner join eb_exam_student t on r.student_id=t.id ");
 		sql.append(" left join b_user u on t.score_verify_user=u.id where  r.exam_id=" + examId+" and r.user_id="+userId
 				+ " and r.viewed =0 ");
 		sql.append(" order by t.student_code,t.subject_code ");

+ 8 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/ScoreVerifyController.java

@@ -23,9 +23,11 @@ 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.ExamSubject;
 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;
+import cn.com.qmth.stmms.biz.exam.service.ExamSubjectService;
 import cn.com.qmth.stmms.biz.exam.service.ScoreVerifyService;
 import cn.com.qmth.stmms.biz.exception.StatusException;
 import cn.com.qmth.stmms.biz.file.service.FileService;
@@ -61,7 +63,9 @@ public class ScoreVerifyController extends BaseExamController {
     private SystemCache systemCache;
     @Autowired
     private SchoolService schoolService;
-	
+
+    @Autowired
+    private ExamSubjectService subjectService;
 	@RequestMapping(value = "reset")
 	public String reset(Model model, HttpServletRequest request) {
 		Integer examId = getSessionExamId(request);
@@ -222,6 +226,9 @@ public class ScoreVerifyController extends BaseExamController {
             info.setTask(task);
             info.setFlagged(student.getScoreVerifyFlagged());
             int examId = getSessionExamId(request);
+            ExamSubject examSubject = subjectService.find(examId, student.getSubjectCode());
+            examSubject.setPaperAnswerUrl(fileService);
+            info.setPaperUrl( examSubject.getPaperUrl() == null ? "" : examSubject.getPaperUrl());
             WebUser wu = RequestUtils.getWebUser(request);
             scoreVerifyService.view(examId,wu.getId(),studentId);
         }