修复评卷任务轨迹查看

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/dao/MarkTrackDao.java

@@ -40,4 +40,6 @@ public interface MarkTrackDao extends JpaRepository<MarkTrack, MarkTrackPK>, Jpa
 
     List<MarkTrack> findByPkStudentIdAndGroupNumber(Integer studentId, Integer number);
 
+	List<MarkTrack> findByPkStudentIdAndGroupNumberAndMarkerId(Integer studentId,Integer number, Integer markerId);
+
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/MarkTrackServiceImpl.java

@@ -62,4 +62,10 @@ public class MarkTrackServiceImpl extends BaseQueryService<MarkTrack> implements
     public List<MarkTrack> findByStudentIdAndGroupNumber(Integer studentId, Integer number) {
         return markTrackDao.findByPkStudentIdAndGroupNumber(studentId, number);
     }
+
+	@Override
+	public List<MarkTrack> findByStudentIdAndGroupNumberAndMarkerId(
+			Integer studentId, Integer number, Integer markerId) {
+		return markTrackDao.findByPkStudentIdAndGroupNumberAndMarkerId(studentId, number,markerId);
+	}
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/MarkTrackService.java

@@ -22,4 +22,6 @@ public interface MarkTrackService {
 
     void deleteByExamAndSubjectAndGroup(Integer examId, String subjectCode, Integer number);
 
+	List<MarkTrack> findByStudentIdAndGroupNumberAndMarkerId(Integer studentId,Integer number, Integer markerId);
+
 }

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/MarkTrackController.java

@@ -63,34 +63,52 @@ public class MarkTrackController extends BaseExamController {
     @ResponseBody
     @RequestMapping
     public HashMap<String, Object> list(Integer studentId) {
+    	ExamStudent examStudent = studentService.findById(studentId);
+    	Campus campus = campusService.findBySchoolAndName(examStudent.getSchoolId(), examStudent.getCampusName());
+    	List<Object> list = new ArrayList<Object>();
+    	HashMap<String, Object> map = new HashMap<String, Object>();
         List<MarkLibrary> librarys = libraryService.findByStudentId(studentId);
-        ExamStudent examStudent = studentService.findById(studentId);
-        Campus campus = campusService.findBySchoolAndName(examStudent.getSchoolId(), examStudent.getCampusName());
-        List<Object> list = new ArrayList<Object>();
-        HashMap<String, Object> map = new HashMap<String, Object>();
         for (MarkLibrary library : librarys) {
         	if(null!=library.getTaskNumber() && library.getTaskNumber()==2){
         		continue;
         	}
-	            MarkGroup group = groupService.findOne(examStudent.getExamId(), examStudent.getSubjectCode(),
-	                    library.getGroupNumber());
-	            List<String> picUrls = PictureUrlBuilder.getSliceUrls(examStudent.getExamId(), campus.getId(),
-	                    examStudent.getSubjectCode(), examStudent.getExamNumber(), examStudent.getSliceCount());
-	            List<MarkTrack> markTracks = markTrackService.findByStudentIdAndGroupNumber(library.getStudentId(),
-	                    group.getNumber());
-	            HashMap<String, Object> groups = new HashMap<String, Object>();
-	            List<MarkSpecialTag> markSpecialTagList = markSpecialTagService.findByLibraryId(library.getId());
-	            groups.put("picUrls", picUrls);
-	            groups.put("pictureConfig", group.getPictureConfigList());
-	            groups.put("markTracks", markTracks);
-	            groups.put("groupTitle", group.getTitle());
-	            groups.put("groupNumber", group.getNumber());
-	            groups.put("markSpecialTagList", markSpecialTagList);
-	            list.add(groups);
+        	putAttr(examStudent, campus, list, library);
         }
         map.put("list", list);
         map.put("imageServer", imageServer);
         return map;
     }
+    
+    @ResponseBody
+    @RequestMapping("/byLibrary")
+    public HashMap<String, Object> byLibrary(Integer libraryId) {
+    	MarkLibrary library = libraryService.findById(libraryId);
+    	ExamStudent examStudent = studentService.findById(library.getStudentId());
+    	Campus campus = campusService.findBySchoolAndName(examStudent.getSchoolId(), examStudent.getCampusName());
+    	List<Object> list = new ArrayList<Object>();
+    	HashMap<String, Object> map = new HashMap<String, Object>();
+        putAttr(examStudent, campus, list, library);
+        map.put("list", list);
+        map.put("imageServer", imageServer);
+        return map;
+    }
 
+	private void putAttr(ExamStudent examStudent, Campus campus,
+			List<Object> list, MarkLibrary library) {
+		MarkGroup group = groupService.findOne(examStudent.getExamId(), examStudent.getSubjectCode(),
+				library.getGroupNumber());
+		List<String> picUrls = PictureUrlBuilder.getSliceUrls(examStudent.getExamId(), campus.getId(),
+				examStudent.getSubjectCode(), examStudent.getExamNumber(), examStudent.getSliceCount());
+		List<MarkTrack> markTracks = markTrackService.findByStudentIdAndGroupNumberAndMarkerId(library.getStudentId(),
+				group.getNumber(),library.getMarkerId());
+		HashMap<String, Object> groups = new HashMap<String, Object>();
+		List<MarkSpecialTag> markSpecialTagList = markSpecialTagService.findByLibraryId(library.getId());
+		groups.put("picUrls", picUrls);
+		groups.put("pictureConfig", group.getPictureConfigList());
+		groups.put("markTracks", markTracks);
+		groups.put("groupTitle", group.getTitle());
+		groups.put("groupNumber", group.getNumber());
+		groups.put("markSpecialTagList", markSpecialTagList);
+		list.add(groups);
+	}
 }

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/libraryList.jsp

@@ -107,7 +107,7 @@
 				</td>
 				<td>
 				    <c:if test="${result.status.value==1}">
-				    <a class="track-link" href="##" data-image-url="${ctx}/admin/exam/track?studentId=${result.studentId}" data-title="${result.examNumber}">阅卷轨迹</a>
+				    <a class="track-link" href="##" data-image-url="${ctx}/admin/exam/track/byLibrary?libraryId=${result.id}" data-title="${result.examNumber}">阅卷轨迹</a>
                     &nbsp;
                     <a href="##" data-id="${result.id}" class="back-link">打回</a>
 					</c:if>