fix bugs

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

@@ -17,7 +17,7 @@ public interface MarkTrackDao extends JpaRepository<MarkTrack, MarkTrackPK>, Jpa
 
     List<MarkTrack> findByStudentId(Integer studentId);
 
-    @Modifying
+    @Modifying(clearAutomatically = true)
     @Query("delete from MarkTrack t where t.pk.libraryId=?1")
     void deleteByLibraryId(Integer libraryId);
 

stmms-web/src/main/java/cn/com/qmth/stmms/common/controller/LoginController.java

@@ -92,15 +92,16 @@ public class LoginController {
             }
         } else if ("mark-login".equals(showType) || "mark-login".equals(loginType)) {
             if (u.getLastLoginTime() == null) {
-                u.setLastLoginTime(new Date());
+                u.refreshAccessToken();
                 userService.save(u);
+                session.saveWebUser(new WebUser(u));
+                sessionService.put(request, response, session);
                 return new ModelAndView("redirect:/mark/reset");
             }
             u.setLastLoginTime(new Date());
             u.setLastLoginIp(request.getRemoteAddr());
             u.refreshAccessToken();
             u = userService.save(u);
-
             session.saveWebUser(new WebUser(u));
             sessionService.put(request, response, session);
             return new ModelAndView("redirect:/mark/subject-select");

stmms-web/src/main/java/cn/com/qmth/stmms/mark/interceptor/MarkInterceptor.java

@@ -29,9 +29,9 @@ public class MarkInterceptor extends SessionInterceptor {
             throws Exception {
         WebUser wu = buildUser(request);
         if (wu != null) {
-            if (wu.getUser().getLastLoginTime() == null) {
+            if (wu.getUser().getLastLoginTime() == null&& request.getServletPath().startsWith("/mark/reset")) {
                 // 首次登录，强制重置密码及姓名
-                return redirect(request, response, "/mark/reset");
+                return true;
             } else if (wu.getMarkerId() == null && !request.getServletPath().startsWith("/mark/subject")) {
                 // 通用帐号未选择科目，首先选择强制选择评卷科目
                 return redirect(request, response, "/mark/subject-select");

stmms-web/src/main/webapp/WEB-INF/views/include/trialDetail.jsp

@@ -48,25 +48,29 @@
             url: '${ctx}/admin/exam/trial/detail?libraryId=' + libraryId,
             dataType: "json",
             success: function (data) {
-                if (data.success == true) {
+            	if (data.success == true) {
                     for (var i = 0; i < data.historyList.length; i++) {
                         var history = data.historyList[i];
                         $('#trial-history').append('<tr><td>' + history.loginName + '</td><td>' + history.name + '</td><td>' + history.score + '</td><td>' + history.time + '</td></tr>');
                     }
+                    var pane = $('<canvas id="trial-left-canvas"></canvas></div>').appendTo($('#trial-left-div'));
+                    var canvas = document.getElementById('trial-left-canvas');
                     if (data.fileServer != undefined && data.pictureConfig != undefined) {
-                        new ImageLoader({
+                    	new ImageLoader({
                             server: data.fileServer,
                             flush: true,
                             strict: false,
                             split: [${properties['slice.split.config']}]
-                        }).merge(data.urls, data.pictureConfig, function (image) {
+                        }).merge(data.urls,canvas,data.pictureConfig, function (image) {
                             trialDetailModal.setContent($('#trial-detail-content'));
                             $(image).width($('#trial-left-div').width() * 0.95);
                             $(image).appendTo('#trial-left-div');
                         }, function (error) {
                             trialDetailModal.setTitle('加载失败');
-                        });
-                    } else if (data.fileServer != undefined && data.questionNumbers != undefined) {
+                        })
+                    } 
+                    //以下为多媒体
+                    else if (data.fileServer != undefined && data.questionNumbers != undefined) {
                         var url = data.fileServer + data.urls;
                         var paperUrl = data.fileServer + data.paperUrl;
                         var questionNumbers = data.questionNumbers.split(",");
@@ -145,12 +149,14 @@
                                         trialDetailModal.setContent($('#trial-detail-content'));
                                     }
                                 }
-                            }).error(function () {
-                            trialDetailModal.setTitle('加载失败')
+                            }
+                        }).error(function () {
+                            trialDetailModal.setTitle('加载失败');
                         });
+                            
                     }
-                } else {
-                    trialDetailModal.setTitle('加载失败')
+            	} else {
+                    trialDetailModal.setTitle('加载失败');
                 }
             }
         });

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

@@ -81,7 +81,6 @@
         }
 
         $('#save-button').click(save);
-        $('.back-button').click(back);
 
         if (ids.length == 0) {
             $(".cont cl").css("display", "none");
@@ -147,7 +146,7 @@
 
             $('<table id="table_' + group.groupNumber + '" cellpadding="0" cellspacing="0" width="100%"></table>').appendTo("#div_" + group.groupNumber);
 
-            $("<thead><tr><td>分组" + group.groupNumber + "</td><td>给分</td><td class='td'><a href='#' data-id='" + group.groupNumber + "' class='back-button'>打回</a></td></tr></thead>").appendTo("#table_" + group.groupNumber);
+            $("<thead><tr><td>分组" + group.groupNumber + "</td><td>给分</td><td class='td'><a href='#' onclick='back("+group.groupNumber+")'>打回</a></td></tr></thead>").appendTo("#table_" + group.groupNumber);
             $('<tbody id="tbody_' + group.groupNumber + '"></tbody>').appendTo("#table_" + group.groupNumber);
             for (var j = 0; j < group.questions.length; j++) {
                 var question = group.questions[j];
@@ -179,7 +178,7 @@
         });
     }
 
-    function back() {
+    function back(groupNumber) {
         if (student == undefined) {
             return;
         }
@@ -187,8 +186,8 @@
             return;
         }
         $.post('${ctx}/admin/exam/inspected/back', {
-            id: student.id,
-            groupNumber: $(this).attr('data-id')
+        	studentId: student.id,
+            groupNumber: groupNumber
         }, function (result) {
             if (result.success == true) {
                 $('#progress').html(ids.length - current);