Merge remote-tracking branch 'origin/stmms_ft_dev' into test_20181225

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

@@ -59,8 +59,8 @@ public interface MarkLibraryDao extends JpaRepository<MarkLibrary, Integer>, Jpa
             LibraryStatus status);
 
     @Modifying(clearAutomatically = true)
-    @Query("update MarkLibrary m set m.status=?2, m.tags=null, m.markerId=null, m.markerTime=null, m.markerScore=null, m.markerScoreList=null where m.markerId=?1 and m.headerId=null ")
-    void resetByMarkerId(Integer markerId, LibraryStatus status);
+    @Query("update MarkLibrary m set m.status=?2, m.tags=null, m.markerId=null, m.markerTime=null, m.markerScore=null, m.markerScoreList=null where m.markerId=?1 and m.status!=?3 and m.status!=?4 ")
+    void resetByMarkerId(Integer markerId, LibraryStatus status,LibraryStatus libraryStatus1,LibraryStatus libraryStatus2);
 
     @Modifying(clearAutomatically = true)
     @Query("update MarkLibrary m set m.status=?2, m.tags=null, m.markerId=null, m.markerTime=null, m.markerScore=null, m.markerScoreList=null , m.headerId=null , m.headerTime=null , m.headerScore=null , m.headerScoreList=null where m.id=?1")

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

@@ -250,8 +250,8 @@ public class MarkServiceImpl implements MarkService {
         try {
             lockService.waitUnlockGroup(marker.getExamId(), marker.getSubjectCode(), marker.getGroupNumber());
             lockService.lockMarker(marker.getId());
-
-            libraryDao.resetByMarkerId(marker.getId(), LibraryStatus.WAITING);
+            //仲裁和等待仲裁的任务不被重置
+            libraryDao.resetByMarkerId(marker.getId(), LibraryStatus.WAITING,LibraryStatus.ARBITRATED,LibraryStatus.WAIT_ARBITRATE);
             trackDao.deleteByMarkerId(marker.getId());
             specialTagDao.deleteByMarkerId(marker.getId());
             updateLibraryCount(marker.getExamId(), marker.getSubjectCode(), marker.getGroupNumber());

stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/SubjectiveQuestionDTO.java

@@ -71,7 +71,7 @@ public class SubjectiveQuestionDTO implements QuestionDTO {
         question.setObjective(false);
         question.setMainTitle(StringUtils.trimToNull(title));
         question.setTotalScore(totalScore);
-        question.setIntervalScore(intervalScore != null ? intervalScore : 1d);
+        question.setIntervalScore(intervalScore != null && intervalScore > 0 ? intervalScore : 1d);
         question.setTotalCount(0);
         question.setZeroCount(0);
         question.setFullCount(0);