修改全卷复核打回逻辑；双评分组打回时，删除仲裁任务，整组打回回待评池，小题打回回评卷员

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

@@ -1985,27 +1985,26 @@ public class MarkServiceImpl implements MarkService {
                 history.setUserId(userId);
                 history.setReason(reason);
 
-                if (library.getStatus().equals(LibraryStatus.ARBITRATED) || qList.size() == questions.size()) {
-                    // 仲裁任务直接重置 或者该分组下所有分数被打回也重置
+                if (library.getStatus().equals(LibraryStatus.ARBITRATED)) {
+                    // 仲裁任务直接重置
                     headerTagDao.deleteByStudentIdAndGroupNumber(library.getStudentId(), groupNumber);
                     headerTrackDao.deleteByPkStudentIdAndGroupNumber(library.getStudentId(), groupNumber);
                     arbitrateDao.deleteByStudentIdAndGroupNumber(student.getId(), groupNumber);
-                    if(!ArbitrateType.QUESTION.equals(group.getArbitrateType())){
-                        // 仲裁任务直接重置 或者该分组下所有分数被打回也重置
-                        markerService.updateRejectCountById(library.getMarkerId());
-                        libraryDao.resetById(library.getId(), null, reason, userId, now, LibraryStatus.REJECTED,
-                                LibraryStatus.MARKED, LibraryStatus.PROBLEM, LibraryStatus.INSPECTED,
-                                LibraryStatus.ARBITRATED);
-                        rejectHistoryDao.save(history);
-                        trackDao.deleteByLibraryId(library.getId());
-                        specialTagDao.deleteByLibraryId(library.getId());
-                        count++;
-                        continue;
-                    }
+                }
+                if(qList.size() == questions.size()){
+                    //该分组下所有分数被打回时回到待评池
+                    markerService.updateRejectCountById(library.getMarkerId());
+                    libraryDao.resetById(library.getId(), null, reason, userId, now, LibraryStatus.REJECTED,
+                            LibraryStatus.MARKED, LibraryStatus.PROBLEM, LibraryStatus.INSPECTED,
+                            LibraryStatus.ARBITRATED);
+                    rejectHistoryDao.save(history);
+                    trackDao.deleteByLibraryId(library.getId());
+                    specialTagDao.deleteByLibraryId(library.getId());
+                    count++;
+                    continue;
                 }
                 if (library.getStatus().equals(LibraryStatus.MARKED)
-                        || library.getStatus().equals(LibraryStatus.INSPECTED)
-                        || (library.getStatus().equals(LibraryStatus.ARBITRATED)&&ArbitrateType.QUESTION.equals(group.getArbitrateType()))) {
+                        || library.getStatus().equals(LibraryStatus.INSPECTED)) {
                     List<ScoreItem> sList = library.getMarkerScoreItem();
                     for (MarkStepDTO markStepDTO : qList) {
                         trackDao.deleteByLibraryIdAndQuestionNumber(library.getId(),

stmms-common/src/main/java/cn/com/qmth/stmms/common/utils/VersionInfo.java

@@ -7,5 +7,5 @@ public class VersionInfo {
 
     public static final String NAME = "1.6.0";
 
-    public static final String DATE = "20250520";
+    public static final String DATE = "20250620";
 }