update

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

@@ -268,7 +268,7 @@ public class TaskServiceImpl implements TaskService {
                 group.getSubjectCode(), false, group.getNumber());
         List<MarkTrack> tracks = new ArrayList<MarkTrack>();
         List<ScoreItem> sItems = new ArrayList<ScoreItem>();
-        List<ScoreItem> rItems = new ArrayList<ScoreItem>();
+        List<ScoreItem> rItems = null;
         if (library != null) {
             tracks = trackService.findByLibraryId(library.getId());
             sItems = library.getScoreList();
@@ -283,7 +283,14 @@ public class TaskServiceImpl implements TaskService {
                 if (!sItems.isEmpty() && sItems.size() == sList.size()) {
                     step.setScore(sItems.get(i).getScore());
                 }
-                if (!rItems.isEmpty() && rItems.size() == sList.size()) {
+                if (rItems == null) {
+                    // 无打回记录
+                    step.setRejected(false);
+                } else if (rItems != null && rItems.isEmpty()) {
+                    // 全打回
+                    step.setRejected(true);
+                } else if (rItems != null && !rItems.isEmpty() && rItems.size() == sList.size()) {
+                    // 部分打回
                     step.setRejected(rItems.get(i).getScore() == null);
                 }
                 // 未选做