Browse Source

修复group重置,评卷状态栏数量错误,强制标记生效判断

ting.yin 6 years ago
parent
commit
7731644cd4

+ 2 - 1
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/MarkServiceImpl.java

@@ -187,13 +187,14 @@ public class MarkServiceImpl implements MarkService {
                 question.setObjective(false);
                 question.setTotalScore(score);
                 question.setIntervalScore(1d);
-                questionDao.save(question);
+                questionDao.saveAndFlush(question);
             }
             groupDao.updateTotalScore(group.getExamId(), group.getSubjectCode(), group.getNumber(), totalScore);
             groupDao.updateScorePolicy(group.getExamId(), group.getSubjectCode(), group.getNumber(), policy);
             subjectService.updateScore(group.getExamId(), group.getSubjectCode());
             resetGroup(group);
         } catch (Exception e) {
+        	e.printStackTrace();
             throw e;
         } finally {
             lockService.unlockGroup(group.getExamId(), group.getSubjectCode(), group.getNumber());

+ 1 - 0
stmms-web/src/main/java/cn/com/qmth/stmms/mark/MarkController.java

@@ -198,6 +198,7 @@ public class MarkController extends BaseController {
         query.setMarkerId(marker.getId());
         long personCount = libraryService.countByQuery(query);
 
+        query.setMarkerId(0);
         query.addStatus(LibraryStatus.MARKED);
         query.addStatus(LibraryStatus.ARBITRATED);
         long markedCount = libraryService.countByQuery(query);

+ 1 - 1
stmms-web/src/main/webapp/WEB-INF/views/modules/mark/markNew.jsp

@@ -50,7 +50,7 @@
 				logoutUrl: '${ctx}/mark/logout',
 				clearUrl: '${ctx}/mark/clear',
 				switchTrackUrl: '${ctx}/mark/index?mode=track',
-				forceSpecialTag : '${forceSpecialTag}',
+				forceSpecialTag : eval('${forceSpecialTag}'.toLowerCase()),
 				modules : {
 					'single-image-view' : {},
 			        //'simple-image-view' : {},

+ 1 - 0
stmms-web/src/main/webapp/WEB-INF/views/modules/mark/markTrack.jsp

@@ -40,6 +40,7 @@
 				userName : '${web_user.name}',
 				logoutUrl: '${ctx}/mark/logout',
 				clearUrl: '${ctx}/mark/clear',
+				forceSpecialTag : eval('${forceSpecialTag}'.toLowerCase()),
 				modules : {
 					'single-image-view' : {},
 					'image-builder': {},